diff --git a/app/.htaccess b/app/.htaccess
old mode 100644
new mode 100755
diff --git a/app/AppService.php b/app/AppService.php
old mode 100644
new mode 100755
diff --git a/app/ExceptionHandle.php b/app/ExceptionHandle.php
old mode 100644
new mode 100755
diff --git a/app/Request.php b/app/Request.php
old mode 100644
new mode 100755
diff --git a/app/admin/command/Hello.php b/app/admin/command/Hello.php
old mode 100644
new mode 100755
diff --git a/app/admin/config/project.php b/app/admin/config/project.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/Admin.php b/app/admin/controller/Admin.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/Auth.php b/app/admin/controller/Auth.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/Dispatch.php b/app/admin/controller/Dispatch.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/Express.php b/app/admin/controller/Express.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/File.php b/app/admin/controller/File.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/Footprint.php b/app/admin/controller/Footprint.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/Freight.php b/app/admin/controller/Freight.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/HotList.php b/app/admin/controller/HotList.php
old mode 100644
new mode 100755
index 8ce4859b..9c548b93
--- a/app/admin/controller/HotList.php
+++ b/app/admin/controller/HotList.php
@@ -7,7 +7,6 @@ use app\admin\logic\HotListLogic;
 use app\common\basics\AdminBase;
 use app\common\server\JsonServer;
 use think\facade\Db;
-use app\common\enum\GoodsEnum;
 
 class HotList extends AdminBase
 {
diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php
old mode 100644
new mode 100755
index f806d2d0..f424a84c
--- a/app/admin/controller/Index.php
+++ b/app/admin/controller/Index.php
@@ -31,6 +31,7 @@ use think\facade\Config;
 use app\admin\logic\shop\LocalStoreLogic;
 use app\admin\logic\distribution\ApplyLogic;
 
+
 class Index extends AdminBase
 {
     /**
@@ -79,7 +80,7 @@ class Index extends AdminBase
             return JsonServer::success('', StatLogic::shopLists($get));
         }
     }
-
+    
     // 获取消息通知
     public function notify()
     {
@@ -89,8 +90,7 @@ class Index extends AdminBase
     private static function get_unaudited()
     {
         $data['localStoreCount'] = LocalStoreLogic::get_unaudited_data();
-//        $data['distributionMemberCount'] = ApplyLogic::get_unaudited_data();
-        $data['distributionMemberCount'] = 0;
+        $data['distributionMemberCount'] = ApplyLogic::get_unaudited_data();
         return $data;
     }
 }
\ No newline at end of file
diff --git a/app/admin/controller/Login.php b/app/admin/controller/Login.php
old mode 100644
new mode 100755
index e3e7c011..8cf7ee2d
--- a/app/admin/controller/Login.php
+++ b/app/admin/controller/Login.php
@@ -24,16 +24,7 @@ namespace app\admin\controller;
 use app\admin\logic\LoginLogic;
 use app\admin\validate\LoginValidate;
 use app\common\basics\AdminBase;
-use app\common\enum\NoticeEnum;
-use app\common\enum\PayEnum;
-use app\common\logic\AccountLogLogic;
-use app\common\model\AccountLog;
-use app\common\model\billions\Billions;
-use app\common\model\user\User;
 use app\common\server\JsonServer;
-use app\common\server\WeChatServer;
-use EasyWeChat\Factory;
-use app\common\model\RechargeOrder;
 
 class Login extends AdminBase
 {
diff --git a/app/admin/controller/MallNews.php b/app/admin/controller/MallNews.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/NewGoods.php b/app/admin/controller/NewGoods.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/Recharge.php b/app/admin/controller/Recharge.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/Role.php b/app/admin/controller/Role.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/Seckill.php b/app/admin/controller/Seckill.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/Statistics.php b/app/admin/controller/Statistics.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/Upload.php b/app/admin/controller/Upload.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/account_log/AccountLog.php b/app/admin/controller/account_log/AccountLog.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/activity_area/Area.php b/app/admin/controller/activity_area/Area.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/activity_area/Goods.php b/app/admin/controller/activity_area/Goods.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/after_sale/AfterSale.php b/app/admin/controller/after_sale/AfterSale.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/bargain/Bargain.php b/app/admin/controller/bargain/Bargain.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/common/Goods.php b/app/admin/controller/common/Goods.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/community/CommunityArticle.php b/app/admin/controller/community/CommunityArticle.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/community/CommunityCategory.php b/app/admin/controller/community/CommunityCategory.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/community/CommunityComment.php b/app/admin/controller/community/CommunityComment.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/community/CommunitySetting.php b/app/admin/controller/community/CommunitySetting.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/community/CommunityTopic.php b/app/admin/controller/community/CommunityTopic.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/content/Article.php b/app/admin/controller/content/Article.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/content/ArticleCategory.php b/app/admin/controller/content/ArticleCategory.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/content/Help.php b/app/admin/controller/content/Help.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/content/HelpCategory.php b/app/admin/controller/content/HelpCategory.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/coupon/ShopCoupon.php b/app/admin/controller/coupon/ShopCoupon.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/decoration/Ad.php b/app/admin/controller/decoration/Ad.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/decoration/AdPosition.php b/app/admin/controller/decoration/AdPosition.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/decoration/BottomNav.php b/app/admin/controller/decoration/BottomNav.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/decoration/MenuDecorate.php b/app/admin/controller/decoration/MenuDecorate.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/director/Director.php b/app/admin/controller/director/Director.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/distribution/Apply.php b/app/admin/controller/distribution/Apply.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/distribution/Center.php b/app/admin/controller/distribution/Center.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/distribution/DistributionGoods.php b/app/admin/controller/distribution/DistributionGoods.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/distribution/DistributionLevel.php b/app/admin/controller/distribution/DistributionLevel.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/distribution/DistributionMember.php b/app/admin/controller/distribution/DistributionMember.php
old mode 100644
new mode 100755
index c50b6a7e..caf8bcc9
--- a/app/admin/controller/distribution/DistributionMember.php
+++ b/app/admin/controller/distribution/DistributionMember.php
@@ -4,7 +4,6 @@ namespace app\admin\controller\distribution;
 use app\admin\logic\distribution\DistributionLevelLogic;
 use app\admin\logic\distribution\DistributionMemberLogic;
 use app\common\basics\AdminBase;
-use app\common\model\distribution\DistributionMemberApply;
 use app\common\server\JsonServer;
 
 /**
@@ -110,7 +109,7 @@ class DistributionMember extends AdminBase
         }
         return JsonServer::error(DistributionMemberLogic::getError());
     }
-
+    
     /**
      * @notes 查看会员资料
      */
@@ -118,6 +117,7 @@ class DistributionMember extends AdminBase
     {
         $params = $this->request->get();
         $user = DistributionMemberLogic::getMemberApply($params);
+
         return view('', [
             'user' => $user
         ]);
diff --git a/app/admin/controller/distribution/DistributionOrder.php b/app/admin/controller/distribution/DistributionOrder.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/distribution/DistributionSetting.php b/app/admin/controller/distribution/DistributionSetting.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/distribution/Member.php b/app/admin/controller/distribution/Member.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/distribution/Record.php b/app/admin/controller/distribution/Record.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/distribution/Setting.php b/app/admin/controller/distribution/Setting.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/finance/Card.php b/app/admin/controller/finance/Card.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/finance/Finance.php b/app/admin/controller/finance/Finance.php
old mode 100644
new mode 100755
index 6ec91a84..e3d201f6
--- a/app/admin/controller/finance/Finance.php
+++ b/app/admin/controller/finance/Finance.php
@@ -21,8 +21,8 @@ namespace app\admin\controller\finance;
 
 use app\common\basics\AdminBase;
 use app\admin\logic\finance\FinanceLogic;
-use app\common\server\JsonServer;
 use think\facade\View;
+use app\common\server\JsonServer;
 
 /**
  * 财务中心
@@ -38,6 +38,7 @@ class Finance extends AdminBase
             $result = FinanceLogic::shop($post);
             return JsonServer::success('', $result);
         }
+        
         View::assign('shop', FinanceLogic::shop());
         return view();
     }
diff --git a/app/admin/controller/finance/Integral.php b/app/admin/controller/finance/Integral.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/finance/Shop.php b/app/admin/controller/finance/Shop.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/finance/User.php b/app/admin/controller/finance/User.php
old mode 100644
new mode 100755
index 0642d7fc..b168a1ed
--- a/app/admin/controller/finance/User.php
+++ b/app/admin/controller/finance/User.php
@@ -72,6 +72,7 @@ class User extends AdminBase
             date('Y-m-d 23:59:59', time())
         ];
         $summary = WithdrawLogic::summary();
+     
         return view('', [
             'today' => $today,
             'yesterday' => $yesterday,
diff --git a/app/admin/controller/goods/Brand.php b/app/admin/controller/goods/Brand.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/goods/Category.php b/app/admin/controller/goods/Category.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/goods/Column.php b/app/admin/controller/goods/Column.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/goods/Comment.php b/app/admin/controller/goods/Comment.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/goods/Goods.php b/app/admin/controller/goods/Goods.php
old mode 100644
new mode 100755
index 873f3f9f..049d1f67
--- a/app/admin/controller/goods/Goods.php
+++ b/app/admin/controller/goods/Goods.php
@@ -23,15 +23,11 @@ namespace app\admin\controller\goods;
 use app\common\basics\AdminBase;
 use app\common\enum\GoodsEnum;
 use app\common\model\goods\GoodsBrand;
-use app\common\model\goods\Goodscontact;
 use app\common\model\goods\GoodsItem;
 use app\common\model\goods\GoodsUnit;
 use app\common\model\Freight;
 use app\common\model\goods\Supplier;
 use app\common\model\goods\Goods as GoodsModel;
-use app\common\model\order\Order;
-use app\common\model\order\OrderGoods;
-use app\common\model\user\UserAddress;
 use app\common\server\JsonServer;
 use app\admin\logic\goods\CategoryLogic as MallCategoryLogic;
 use app\admin\logic\goods\GoodsLogic;
@@ -39,8 +35,12 @@ use app\admin\logic\goods\ColumnLogic;
 use app\shop\logic\goods\CategoryLogic as ShopCategoryLogic;
 use think\exception\ValidateException;
 use app\admin\validate\goods\GoodsValidate;
-use EasyWeChat\Factory;
 use weixin\Getgzopenid;
+use app\common\model\order\Order;
+use app\common\model\order\OrderGoods;
+use app\common\model\user\UserAddress;
+use app\common\model\goods\Goodscontact;
+
 /**
  * 商品管理
  * Class Goods
@@ -85,7 +85,7 @@ class Goods extends AdminBase
             'info' => json_encode(GoodsLogic::info($goods_id), JSON_UNESCAPED_UNICODE)
         ]);
     }
-    function curlPost($url,$data)
+  function curlPost($url,$data)
     {
         $ch = curl_init();
         $params[CURLOPT_URL] = $url;    //请求url地址
@@ -156,41 +156,6 @@ class Goods extends AdminBase
             }
             return JsonServer::error('设置失败');
         }
-//        $a = \app\common\model\goods\Goods::where("del",0)->select();
-//        foreach($a as $k=>$v){
-//            $d = array();
-//            $gi = GoodsItem::where("goods_id",$v['id'])->select();
-//            foreach($gi as $key=>$value){
-//                $da = array();
-//                if($key==0){
-//                    if($v['wholesale_percent'] >0){
-//                        $d['wholesale_price'] = round($value['wh_price']*(100+$v['wholesale_percent'])/100,2);
-//                    }
-//                    if($v['purchase_percent'] >0){
-//                        $d['purchase_price'] = round($value['pu_price']*(100+$v['purchase_percent'])/100,2);
-//                    }
-//                    if($v['issuing_percent'] >0){
-//                        $d['issuing_price'] = round($value['is_price']*(100+$v['issuing_percent'])/100,2);
-//                    }
-//                    if(!empty($d)){
-//                        $goods_msg = \app\common\model\goods\Goods::where("id",$v['id'])->update($d);
-//                    }
-//                }
-//                if($v['wholesale_percent'] >0){
-//                    $da['wholesale_pce'] = round($value['wh_price']*(100+$v['wholesale_percent'])/100,2);
-//                }
-//                if($v['purchase_percent'] >0){
-//                    $da['purchase_price'] = round($value['pu_price']*(100+$v['purchase_percent'])/100,2);
-//                }
-//                if($v['issuing_percent'] >0){
-//                    $da['issuing_price'] = round($value['is_price']*(100+$v['issuing_percent'])/100,2);
-//                }
-//                if(!empty($da)){
-//                    GoodsItem::where("id",$value['id'])->update($da);
-//                }
-//
-//            }
-//        }
         $goods_id = $this->request->get('goods_id', '', 'intval');
         $goods_detail = GoodsModel::find($goods_id);
         $goods_detail['column_ids'] = $goods_detail['column_ids'] ? explode(',', $goods_detail['column_ids']) : [];
diff --git a/app/admin/controller/goods/Price.php b/app/admin/controller/goods/Price.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/goods/Unit.php b/app/admin/controller/goods/Unit.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/integral/IntegralGoods.php b/app/admin/controller/integral/IntegralGoods.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/integral/IntegralOrder.php b/app/admin/controller/integral/IntegralOrder.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/kefu/Kefu.php b/app/admin/controller/kefu/Kefu.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/kefu/KefuLang.php b/app/admin/controller/kefu/KefuLang.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/live/LiveGoods.php b/app/admin/controller/live/LiveGoods.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/live/LiveRoom.php b/app/admin/controller/live/LiveRoom.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/order/Invoice.php b/app/admin/controller/order/Invoice.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/order/Jicai.php b/app/admin/controller/order/Jicai.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/order/Order.php b/app/admin/controller/order/Order.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/procurement/Level.php b/app/admin/controller/procurement/Level.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/procurement/Procurement.php b/app/admin/controller/procurement/Procurement.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/procurement/Treaty.php b/app/admin/controller/procurement/Treaty.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/seckill/SeckillGoods.php b/app/admin/controller/seckill/SeckillGoods.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/seckill/SeckillTime.php b/app/admin/controller/seckill/SeckillTime.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/setting/Basic.php b/app/admin/controller/setting/Basic.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/setting/CustomerService.php b/app/admin/controller/setting/CustomerService.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/setting/HotSearch.php b/app/admin/controller/setting/HotSearch.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/setting/Map.php b/app/admin/controller/setting/Map.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/setting/MarketingConfig.php b/app/admin/controller/setting/MarketingConfig.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/setting/NoticeSetting.php b/app/admin/controller/setting/NoticeSetting.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/setting/PayConfig.php b/app/admin/controller/setting/PayConfig.php
old mode 100644
new mode 100755
index 33874a9a..fd0eeec7
--- a/app/admin/controller/setting/PayConfig.php
+++ b/app/admin/controller/setting/PayConfig.php
@@ -131,7 +131,7 @@ class PayConfig extends AdminBase
         }
         return view('', ['info' => PayConfigLogic::info('alipay')]);
     }
-
+    
     public function editXinypay()
     {
 
@@ -145,4 +145,5 @@ class PayConfig extends AdminBase
         }
         return view('', ['info' => PayConfigLogic::info('xiny')]);
     }
+
 }
\ No newline at end of file
diff --git a/app/admin/controller/setting/Register.php b/app/admin/controller/setting/Register.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/setting/ShopWithdrawal.php b/app/admin/controller/setting/ShopWithdrawal.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/setting/Sms.php b/app/admin/controller/setting/Sms.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/setting/StorageConfig.php b/app/admin/controller/setting/StorageConfig.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/setting/Transaction.php b/app/admin/controller/setting/Transaction.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/setting/User.php b/app/admin/controller/setting/User.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/shop/Apply.php b/app/admin/controller/shop/Apply.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/shop/Auth.php b/app/admin/controller/shop/Auth.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/shop/Category.php b/app/admin/controller/shop/Category.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/shop/LocalStore.php b/app/admin/controller/shop/LocalStore.php
old mode 100644
new mode 100755
index 086b5cb3..b1184429
--- a/app/admin/controller/shop/LocalStore.php
+++ b/app/admin/controller/shop/LocalStore.php
@@ -46,6 +46,18 @@ class LocalStore extends AdminBase
             'id' => $id
         ]);
     }
+    
+    
+    public function del() {
+        if ($this->request->isAjax()) {
+            $post = $this->request->post();
+            if (LocalStoreLogic::del($post['id'])) {
+                return JsonServer::success('删除成功');
+            }
+        }
+        
+        return JsonServer::success('删除成功');
+    }
 
     /**
      * @notes 审核操作
@@ -94,8 +106,9 @@ class LocalStore extends AdminBase
     {
         if ($this->request->isAjax()) {
             $post = $this->request->post();
+ 
             if ($post['lstore_id'] > 0){
-                $result = LocalStoreLogic::getPayImage($post['lstore_id']);
+                $result = LocalStoreLogic::getPayImage($post['user_id'], $post['lstore_id']);
                 if ($result['pay_image']) {
                     $path = parse_url($result['pay_image'])['path'];
                     $url = (string)url("index/download/downloadLocalStoreErcodeImage", ['url' => $path], false, true);
diff --git a/app/admin/controller/shop/Store.php b/app/admin/controller/shop/Store.php
old mode 100644
new mode 100755
index 7140cc34..a7be5f34
--- a/app/admin/controller/shop/Store.php
+++ b/app/admin/controller/shop/Store.php
@@ -160,7 +160,7 @@ class Store extends AdminBase
             return JsonServer::success('操作成功');
         }
     }
-    public function adjustFirstLeader()
+   public function adjustFirstLeader()
     {
         if($this->request->isPost()) {
             $params = $this->request->post();
diff --git a/app/admin/controller/shop/Treaty.php b/app/admin/controller/shop/Treaty.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/sign_daily/SignDaily.php b/app/admin/controller/sign_daily/SignDaily.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/system/Cache.php b/app/admin/controller/system/Cache.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/system/Crontab.php b/app/admin/controller/system/Crontab.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/system/Log.php b/app/admin/controller/system/Log.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/system/Upgrade.php b/app/admin/controller/system/Upgrade.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/team/Activity.php b/app/admin/controller/team/Activity.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/team/Found.php b/app/admin/controller/team/Found.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/team/Setting.php b/app/admin/controller/team/Setting.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/user/Gzuser.php b/app/admin/controller/user/Gzuser.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/user/Level.php b/app/admin/controller/user/Level.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/user/Tag.php b/app/admin/controller/user/Tag.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/user/User.php b/app/admin/controller/user/User.php
old mode 100644
new mode 100755
index 2c7a2f43..7bce7440
--- a/app/admin/controller/user/User.php
+++ b/app/admin/controller/user/User.php
@@ -136,7 +136,7 @@ class User extends  AdminBase
         $firstLeader = \app\common\model\user\User::getUserInfo($user['first_leader']);
         return view('', [
             'user_id' => $id,
-            'procurement' => $user,
+            'user' => $user,
             'first_leader' => $firstLeader
         ]);
     }
diff --git a/app/admin/controller/wechat/Hfive.php b/app/admin/controller/wechat/Hfive.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/wechat/Mnp.php b/app/admin/controller/wechat/Mnp.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/wechat/Oa.php b/app/admin/controller/wechat/Oa.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/wechat/Op.php b/app/admin/controller/wechat/Op.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/wechat/Pc.php b/app/admin/controller/wechat/Pc.php
old mode 100644
new mode 100755
diff --git a/app/admin/controller/wechat/Reply.php b/app/admin/controller/wechat/Reply.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/AdminLogic.php b/app/admin/logic/AdminLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/AuthLogic.php b/app/admin/logic/AuthLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/FileLogic.php b/app/admin/logic/FileLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/FootprintLogic.php b/app/admin/logic/FootprintLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/HotListLogic.php b/app/admin/logic/HotListLogic.php
old mode 100644
new mode 100755
index 6fb33c4a..34e87a1e
--- a/app/admin/logic/HotListLogic.php
+++ b/app/admin/logic/HotListLogic.php
@@ -10,12 +10,14 @@ class HotListLogic extends Logic
     public static function lists($get)
     {
         $where = [];
-        if (!empty($get['name']) and $get['name']) {
-            $where[] = ['g.name', 'like', '%' . $get['name'] . '%'];
+        if (!empty($get['title']) and $get['title']) {
+            $where[] = ['title', 'like', '%' . $get['title'] . '%'];
         }
 
         $model = new HotList();
-        $lists = $model->with(['goods'])
+        $lists = $model->with(['goods' => function ($query) use ($where) {
+            $query->where($where);
+        }])
         ->where('delete_time', 0)
         ->paginate([
             'page'      => $get['page'],
diff --git a/app/admin/logic/LoginLogic.php b/app/admin/logic/LoginLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/MallNewsLogic.php b/app/admin/logic/MallNewsLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/NewGoodsLogic.php b/app/admin/logic/NewGoodsLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/NoticeSettingLogic.php b/app/admin/logic/NoticeSettingLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/PayConfigLogic.php b/app/admin/logic/PayConfigLogic.php
old mode 100644
new mode 100755
index 6c7c507f..aff4ade2
--- a/app/admin/logic/PayConfigLogic.php
+++ b/app/admin/logic/PayConfigLogic.php
@@ -127,7 +127,8 @@ class PayConfigLogic extends Logic
         ];
         return Pay::where('code', 'alipay')->update($data);
     }
-
+    
+    /*信用支付*/
     public static function editXinypay($post)
     {
         $data = [
diff --git a/app/admin/logic/RechargeLogic.php b/app/admin/logic/RechargeLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/RoleLogic.php b/app/admin/logic/RoleLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/StatisticsLogic.php b/app/admin/logic/StatisticsLogic.php
old mode 100644
new mode 100755
index dc729726..aeaddb46
--- a/app/admin/logic/StatisticsLogic.php
+++ b/app/admin/logic/StatisticsLogic.php
@@ -101,10 +101,10 @@ class StatisticsLogic extends Logic
             $start_time = strtotime($post['start_time']);
             $end_time   = strtotime($post['end_time']);
         }
-        $user_num = Db::name('procurement')
+        $user_num = Db::name('user')
             ->count('id');
 
-        $user_add = Db::name('procurement')
+        $user_add = Db::name('user')
             ->where([['create_time', 'between', [$start_time, $end_time]]])
             ->count('id');
 
@@ -119,7 +119,7 @@ class StatisticsLogic extends Logic
             $dates[] = date('m-d', $where_start);
             $start_now = strtotime(date('Y-m-d', $where_start));
             $end_now = strtotime(date('Y-m-d 23:59:59', $where_start));
-            $add = Db::name('procurement')
+            $add = Db::name('user')
                 ->where([['create_time', 'between', [$start_now, $end_now]]])
                 ->count('id');
             $echarts_count[] = 0;
diff --git a/app/admin/logic/WechatCorporatePaymentLogic.php b/app/admin/logic/WechatCorporatePaymentLogic.php
old mode 100644
new mode 100755
index 5a76a3ea..fb1f9492
--- a/app/admin/logic/WechatCorporatePaymentLogic.php
+++ b/app/admin/logic/WechatCorporatePaymentLogic.php
@@ -41,7 +41,7 @@ class WechatCorporatePaymentLogic
         'msg' => '扣除手续费后提现金额不能小于1元'
       ];
     }
-      if($withdraw['left_money'] > 500) {
+     if($withdraw['left_money'] > 500) {
           return [
               'code' => 0,
               'msg' => '提现金额不能大于500'
diff --git a/app/admin/logic/WechatMerchantTransferLogic.php b/app/admin/logic/WechatMerchantTransferLogic.php
old mode 100644
new mode 100755
index 0c9f2028..1551a908
--- a/app/admin/logic/WechatMerchantTransferLogic.php
+++ b/app/admin/logic/WechatMerchantTransferLogic.php
@@ -21,10 +21,9 @@ namespace app\admin\logic;
 
 
 use app\common\model\Pay;
-use app\common\model\user\User;
 use app\common\server\WeChatServer;
 use think\facade\Db;
-
+use app\common\model\user\User;
 /**
  * 功能: 商家转账到零钱
  * 用途：商户可以通过该接口同时向多个用户微信零钱进行转账操作。
@@ -53,7 +52,7 @@ class WechatMerchantTransferLogic
                 'msg' => '扣除手续费后提现金额不能小于1元'
             ];
         }
-        if($withdrawApply['left_money'] > 500) {
+         if($withdrawApply['left_money'] > 500) {
             return [
                 'code' => 0,
                 'msg' => '提现金额不能大于500'
@@ -98,14 +97,13 @@ class WechatMerchantTransferLogic
         $nickname = User::where("id",$withdrawApply['user_id'])->find();
         //获取配置信息
         $config = WeChatServer::getPayConfigBySource($userAuth['client'])['config'];
-
-
+        //移除表情
+       $nickname['nickname'] = self::removeEmojiChar($nickname['nickname']);
         //请求URL
         $url = 'https://api.mch.weixin.qq.com/v3/transfer/batches';
         //请求方式
         $http_method = 'POST';
         //请求参数
-        $nickname['nickname'] = mb_convert_encoding($nickname['nickname'], "UTF-8", "auto");
         $data = [
             'appid' => $config['app_id'],//申请商户号的appid或商户号绑定的appid（企业号corpid即为此appid）
             'out_batch_no' => $withdrawApply['batch_no'],//商户系统内部的商家批次单号，要求此参数只能由数字、大小写字母组成，在商户系统内部唯一
@@ -127,14 +125,16 @@ class WechatMerchantTransferLogic
             }
             $data['transfer_detail_list'][0]['user_name'] = self::getEncrypt($withdrawApply['real_name'],$config);
         }
-
+        // print_r("<pre>");
+        // var_dump($data);
         $token  = self::token($url,$http_method,$data,$config);//获取token
         $result = self::https_request($url,json_encode($data),$token);//发送请求
         $result_arr = json_decode($result,true);
+        // var_dump($result_arr);
         $result_arr['d'] = 1;
         if(!isset($result_arr['create_time'])) {//批次受理失败
             $result_arr['d'] = 0;
-            return $result_arr;
+             return $result_arr;
             // throw new \Exception($result_arr['message']);
         }
 
@@ -148,11 +148,26 @@ class WechatMerchantTransferLogic
             ]);
 
         return [
+            
             'code' => 1,
             'msg' => '零钱提现中'
         ];
     }
-
+        public static function removeEmojiChar($str){
+            $mbLen = mb_strlen($str); 
+            $strArr = []; 
+            for ($i = 0; $i < $mbLen; $i++) { 
+                $mbSubstr = mb_substr($str, $i, 1, 'utf-8'); 
+                if (strlen($mbSubstr) >= 4) { 
+                    continue; 
+                    
+                } 
+                $strArr[] = $mbSubstr; 
+                
+            } 
+            return implode('', $strArr);
+            
+        }
     /**
      * @notes 签名生成
      * @param $url
diff --git a/app/admin/logic/account_log/AccountLogLogic.php b/app/admin/logic/account_log/AccountLogLogic.php
old mode 100644
new mode 100755
index 93a41a3b..0cba0330
--- a/app/admin/logic/account_log/AccountLogLogic.php
+++ b/app/admin/logic/account_log/AccountLogLogic.php
@@ -91,12 +91,12 @@ class AccountLogLogic{
         }
 
         $count = AccountLog::alias('al')
-            ->leftJoin('procurement u', 'u.id=al.user_id')
+            ->leftJoin('user u', 'u.id=al.user_id')
             ->where($where)
             ->count();
         $lists = AccountLog::alias('al')
             ->field('al.*, u.nickname,u.sn,u.mobile')
-            ->leftJoin('procurement u', 'u.id=al.user_id')
+            ->leftJoin('user u', 'u.id=al.user_id')
             ->where($where)
             ->order('create_time', 'desc')
             ->page($get['page'], $get['limit'])
diff --git a/app/admin/logic/activity_area/AreaLogic.php b/app/admin/logic/activity_area/AreaLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/activity_area/GoodsLogic.php b/app/admin/logic/activity_area/GoodsLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/after_sale/AfterSaleLogic.php b/app/admin/logic/after_sale/AfterSaleLogic.php
old mode 100644
new mode 100755
index 397b26f7..42a9658a
--- a/app/admin/logic/after_sale/AfterSaleLogic.php
+++ b/app/admin/logic/after_sale/AfterSaleLogic.php
@@ -122,10 +122,10 @@ class AfterSaleLogic extends Logic
         $count = $after_sale
             ->alias('a')
             ->join('order o', 'o.id = a.order_id')
-            ->join('procurement u', 'u.id = a.user_id')
+            ->join('user u', 'u.id = a.user_id')
             ->join('order_goods g', 'g.id = a.order_goods_id')
             ->join('shop s', 's.id = o.shop_id')
-            ->with(['order_goods', 'procurement', 'order', 'shop'])
+            ->with(['order_goods', 'user', 'order', 'shop'])
             ->where($where)
             ->group('a.id')
             ->count();
@@ -134,14 +134,14 @@ class AfterSaleLogic extends Logic
             ->alias('a')
             ->field($field)
             ->join('order o', 'o.id = a.order_id')
-            ->join('procurement u', 'u.id = a.user_id')
+            ->join('user u', 'u.id = a.user_id')
             ->join('order_goods g', 'g.id = a.order_goods_id')
             ->join('shop s', 's.id = o.shop_id')
-            ->with(['order_goods', 'procurement', 'order', 'shop'])
+            ->with(['order_goods', 'user', 'order', 'shop'])
             ->where($where)
             ->page($page, $limit)
             ->order('a.id desc')
-            ->append(['procurement.base_avatar', 'order_goods.base_image'])
+            ->append(['user.base_avatar', 'order_goods.base_image'])
             ->group('a.id')
             ->select()->toArray();
 
@@ -151,7 +151,7 @@ class AfterSaleLogic extends Logic
             $list['refund_type'] = AfterSale::getRefundTypeDesc($list['refund_type']);
 //            $list['create_time'] = date('Y-m-d H:i:s', $list['create_time']);
             $list['status'] = AfterSale::getStatusDesc($list['status']);
-            $list['procurement']['avatar'] = UrlServer::getFileUrl($list['procurement']['avatar']);
+            $list['user']['avatar'] = UrlServer::getFileUrl($list['user']['avatar']);
             $list['shop']['logo'] = UrlServer::getFileUrl($list['shop']['logo']);
             foreach ($list['order_goods'] as &$good) {
                 $good['image'] = empty($good['spec_image']) ?
@@ -176,7 +176,7 @@ class AfterSaleLogic extends Logic
 
         $after_sale = new AfterSale();
         $result = $after_sale
-            ->with(['order_goods', 'procurement', 'order', 'logs'])
+            ->with(['order_goods', 'user', 'order', 'logs'])
             ->where('id', $id)
             ->find()->toArray();
         $result['refund_type_text'] = AfterSale::getRefundTypeDesc($result['refund_type']);
@@ -303,10 +303,10 @@ class AfterSaleLogic extends Logic
                 ->alias('a')
                 ->field($field)
                 ->join('order o', 'o.id = a.order_id')
-                ->join('procurement u', 'u.id = a.user_id')
+                ->join('user u', 'u.id = a.user_id')
                 ->join('order_goods g', 'g.id = a.order_goods_id')
                 ->join('shop s', 's.id = o.shop_id')
-                ->with(['order_goods', 'procurement', 'order'])
+                ->with(['order_goods', 'user', 'order'])
                 ->where($condition)
                 ->order('a.id desc')
                 ->group('a.id')
diff --git a/app/admin/logic/bargain/BargainLogic.php b/app/admin/logic/bargain/BargainLogic.php
old mode 100644
new mode 100755
index c9e5be85..7b964d13
--- a/app/admin/logic/bargain/BargainLogic.php
+++ b/app/admin/logic/bargain/BargainLogic.php
@@ -241,14 +241,14 @@ class BargainLogic extends Logic
         $count = $model->where($where)->count('id');
         $lists = $model->field(true)
             ->where($where)
-            ->with(['procurement.level'])
+            ->with(['user.level'])
             ->order('id', 'desc')
             ->page($get['page'], $get['limit'])
             ->select()->toArray();
 
         foreach ($lists as &$item) {
             // 解决用户被删除及Indirect modification of overloaded element报错
-            if (empty($item['procurement'])) {
+            if (empty($item['user'])) {
                 $user = [
                     'avatar' => '',
                     'sn' => '-',
@@ -258,10 +258,10 @@ class BargainLogic extends Logic
                     ]
                 ];
             } else {
-                $user = $item['procurement'];
+                $user = $item['user'];
             }
             $user['avatar'] = UrlServer::getFileUrl($user['avatar']);
-            $item['procurement'] = $user;
+            $item['user'] = $user;
             $item['launch_start_time'] = date('Y-m-d H:i:s', $item['launch_start_time']);
             $item['launch_end_time'] = date('Y-m-d H:i:s', $item['launch_end_time']);
             $item['status'] = BargainLaunch::getStatusDesc($item['status']);
@@ -287,7 +287,7 @@ class BargainLogic extends Logic
         $model = new BargainLaunch();
         $detail = $model->field(true)
             ->where(['id' => (int)$id])
-            ->with(['procurement.level'])
+            ->with(['user.level'])
             ->find()->toArray();
 
         $detail['domain'] = UrlServer::getFileUrl();
@@ -318,12 +318,12 @@ class BargainLogic extends Logic
         $lists = $model->field(true)
             ->where(['id' => (int)$launch_id])
             ->where('order_id', '>', 0)
-            ->with(['procurement.level', 'order'])
+            ->with(['user.level', 'order'])
             ->page($get['page'], $get['limit'])
             ->select();
 
         foreach ($lists as &$item) {
-            $item['procurement']['avatar'] = UrlServer::getFileUrl($item['procurement']['avatar']);
+            $item['user']['avatar'] = UrlServer::getFileUrl($item['user']['avatar']);
             $item['order_status'] = Order::getOrderStatus($item['order']['order_status']);
         }
 
@@ -349,12 +349,12 @@ class BargainLogic extends Logic
         $count = $model->where(['launch_id' => (int)$launch_id])->count();
         $lists = $model->field(true)
             ->where(['launch_id' => (int)$launch_id])
-            ->with(['procurement.level'])
+            ->with(['user.level'])
             ->page($get['page'], $get['limit'])
             ->select();
 
         foreach ($lists as &$item) {
-            $item['procurement']['avatar'] = UrlServer::getFileUrl($item['procurement']['avatar']);
+            $item['user']['avatar'] = UrlServer::getFileUrl($item['user']['avatar']);
             $item['help_time'] = date('Y-m-d H:i:s', $item['help_time']);
             $item['help_price'] = '￥' . $item['help_price'];
             $item['surplus_price'] = '￥' . $item['surplus_price'];
diff --git a/app/admin/logic/common/GoodsLogic.php b/app/admin/logic/common/GoodsLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/community/CommunityArticleLogic.php b/app/admin/logic/community/CommunityArticleLogic.php
old mode 100644
new mode 100755
index f789aab5..cc07ec9a
--- a/app/admin/logic/community/CommunityArticleLogic.php
+++ b/app/admin/logic/community/CommunityArticleLogic.php
@@ -60,7 +60,7 @@ class CommunityArticleLogic extends Logic
         $model = new CommunityArticle();
         $lists = $model->with(['images'])->alias('a')
             ->field('a.*,u.nickname,u.avatar,u.sn')
-            ->join('procurement u', 'u.id = a.user_id')
+            ->join('user u', 'u.id = a.user_id')
             ->where($where)
             ->order(['id' => 'desc'])
             ->append(['status_desc'])
@@ -88,7 +88,7 @@ class CommunityArticleLogic extends Logic
      */
     public static function detail($id)
     {
-        $detail = CommunityArticle::with(['images', 'topic', 'procurement' => function ($query) {
+        $detail = CommunityArticle::with(['images', 'topic', 'user' => function ($query) {
             $query->field(['id', 'nickname', 'sn']);
         }])
             ->append(['shop_data', 'goods_data', 'status_desc'])
@@ -173,7 +173,7 @@ class CommunityArticleLogic extends Logic
     {
         $type = $get['type'] ?? 'comment';
         if ($type == 'comment') {
-            $lists = CommunityComment::with(['procurement'])
+            $lists = CommunityComment::with(['user'])
                 ->where([
                     'del' => 0,
                     'article_id' => $get['id'],
@@ -184,7 +184,7 @@ class CommunityArticleLogic extends Logic
                 ])
                 ->toArray();
         } else {
-            $lists = CommunityLike::with(['procurement'])
+            $lists = CommunityLike::with(['user'])
                 ->where([
                     'relation_id' => $get['id'],
                     'type' => CommunityLikeEnum::TYPE_ARTICLE
diff --git a/app/admin/logic/community/CommunityCategoryLogic.php b/app/admin/logic/community/CommunityCategoryLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/community/CommunityCommentLogic.php b/app/admin/logic/community/CommunityCommentLogic.php
old mode 100644
new mode 100755
index 5cd6e57b..8a90e947
--- a/app/admin/logic/community/CommunityCommentLogic.php
+++ b/app/admin/logic/community/CommunityCommentLogic.php
@@ -50,7 +50,7 @@ class CommunityCommentLogic extends Logic
                 $query->field('id,content,topic_id');
             }])
             ->field('c.*,u.nickname,u.avatar,u.sn')
-            ->join('procurement u', 'u.id = c.user_id')
+            ->join('user u', 'u.id = c.user_id')
             ->where($where)
             ->order(['id' => 'desc'])
             ->append(['status_desc'])
diff --git a/app/admin/logic/community/CommunitySettingLogic.php b/app/admin/logic/community/CommunitySettingLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/community/CommunityTopicLogic.php b/app/admin/logic/community/CommunityTopicLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/content/ArticleCategoryLogic.php b/app/admin/logic/content/ArticleCategoryLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/content/ArticleLogic.php b/app/admin/logic/content/ArticleLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/content/HelpCategoryLogic.php b/app/admin/logic/content/HelpCategoryLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/content/HelpLogic.php b/app/admin/logic/content/HelpLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/coupon/ShopCouponLogic.php b/app/admin/logic/coupon/ShopCouponLogic.php
old mode 100644
new mode 100755
index a5a49fe5..46596d30
--- a/app/admin/logic/coupon/ShopCouponLogic.php
+++ b/app/admin/logic/coupon/ShopCouponLogic.php
@@ -145,12 +145,12 @@ class ShopCouponLogic extends Logic{
         }
 
         $log_count = CouponList::alias('cl')
-            ->join('procurement u','cl.user_id = u.id')
+            ->join('user u','cl.user_id = u.id')
             ->where($where)
             ->count();
 
         $log_list = CouponList::alias('cl')
-            ->join('procurement u','cl.user_id = u.id')
+            ->join('user u','cl.user_id = u.id')
             ->where($where)
             ->field('cl.coupon_id,cl.status as cl_status,coupon_code,cl.create_time as cl_create_time,cl.use_time,u.nickname,u.avatar,u.mobile,u.sn,u.level')
             ->page($get['page'], $get['limit'])
diff --git a/app/admin/logic/decoration/AdLogic.php b/app/admin/logic/decoration/AdLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/decoration/AdPositionLogic.php b/app/admin/logic/decoration/AdPositionLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/decoration/BottomNavLogic.php b/app/admin/logic/decoration/BottomNavLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/decoration/MenuDecorateLogic.php b/app/admin/logic/decoration/MenuDecorateLogic.php
old mode 100644
new mode 100755
index 1dde203d..e24ab371
--- a/app/admin/logic/decoration/MenuDecorateLogic.php
+++ b/app/admin/logic/decoration/MenuDecorateLogic.php
@@ -376,6 +376,7 @@ class MenuDecorateLogic extends Logic {
             'is_show'       => $post['is_show'],
             'create_time'   => time(),
         ];
+
         return Db::name('menu_tools')->where(['id'=>$post['id']])->update($data);
     }
 
diff --git a/app/admin/logic/director/DirectorLogic.php b/app/admin/logic/director/DirectorLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/distribution/ApplyLogic.php b/app/admin/logic/distribution/ApplyLogic.php
old mode 100644
new mode 100755
index da63645f..1f382c17
--- a/app/admin/logic/distribution/ApplyLogic.php
+++ b/app/admin/logic/distribution/ApplyLogic.php
@@ -42,8 +42,8 @@ class ApplyLogic extends Logic
             $model = new DistributionMemberApply();
             $lists = $model->field(['DMA.*'])->alias('DMA')
                 ->where($where)
-                ->with(['procurement.level'])
-                ->join('procurement U', 'U.id = DMA.user_id')
+                ->with(['user.level'])
+                ->join('user U', 'U.id = DMA.user_id')
                 ->paginate([
                     'page'      => $get['page'],
                     'list_rows' => $get['limit'],
@@ -51,8 +51,8 @@ class ApplyLogic extends Logic
                 ])->toArray();
 
             foreach ($lists['data'] as &$item) {
-                if ($item['procurement']) {
-                    $item['procurement']['avatar'] = UrlServer::getFileUrl($item['procurement']['avatar']);
+                if ($item['user']) {
+                    $item['user']['avatar'] = UrlServer::getFileUrl($item['user']['avatar']);
                 }
                 $item['region'] = AreaServer::getAddress([
                     $item['province'],
@@ -77,7 +77,7 @@ class ApplyLogic extends Logic
     {
         $model = new DistributionMemberApply();
         $detail = $model->field(true)
-            ->with(['procurement.level'])
+            ->with(['user.level'])
             ->findOrEmpty($id)
             ->toArray();
 
@@ -139,11 +139,11 @@ class ApplyLogic extends Logic
             return false;
         }
     }
-
+    
     public static function get_unaudited_data()
     {
-        $model = new DistributionMemberApply();
-        return $model->field(['DMA.*'])->alias('DMA')
+         $model = new DistributionMemberApply();
+         return $model->field(['DMA.*'])->alias('DMA')
             ->where(['status' => 0])
             ->with(['user.level'])
             ->join('user U', 'U.id = DMA.user_id')
diff --git a/app/admin/logic/distribution/CenterLogic.php b/app/admin/logic/distribution/CenterLogic.php
old mode 100644
new mode 100755
index a5c7d68f..4e0c0afb
--- a/app/admin/logic/distribution/CenterLogic.php
+++ b/app/admin/logic/distribution/CenterLogic.php
@@ -125,7 +125,7 @@ class CenterLogic extends Logic
             'dog.status' => 2, // 已入账
         ];
         $topMembers = DistributionOrderGoods::alias('dog')
-            ->leftJoin('procurement u', 'u.id = dog.user_id')
+            ->leftJoin('user u', 'u.id = dog.user_id')
             ->field($field)
             ->where($where)
             ->group('dog.money,u.avatar,u.nickname')
diff --git a/app/admin/logic/distribution/DistributionGoodsLogic.php b/app/admin/logic/distribution/DistributionGoodsLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/distribution/DistributionLevelLogic.php b/app/admin/logic/distribution/DistributionLevelLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/distribution/DistributionMemberLogic.php b/app/admin/logic/distribution/DistributionMemberLogic.php
old mode 100644
new mode 100755
index 5bc63d32..226d7f59
--- a/app/admin/logic/distribution/DistributionMemberLogic.php
+++ b/app/admin/logic/distribution/DistributionMemberLogic.php
@@ -8,6 +8,7 @@ use app\common\model\distribution\DistributionOrderGoods;
 use app\common\model\distribution\DistributionMemberApply;
 use app\common\model\user\User;
 use app\common\server\UrlServer;
+use app\common\server\AreaServer;
 
 /**
  * 分销会员逻辑层
@@ -217,12 +218,18 @@ class DistributionMemberLogic extends Logic
             return false;
         }
     }
-
+    
     /**
      * @notes 获取分销会员申请内容
      */
     public static function getMemberApply($params)
     {
-        return DistributionMemberApply::where(['user_id' => $params['id']])->find();
+        $result = DistributionMemberApply::where(['user_id' => $params['id']])->find()->toArray();
+
+        $result['province'] = AreaServer::getAddress($result['province']);
+        $result['city'] = AreaServer::getAddress($result['city']);
+        $result['district'] = AreaServer::getAddress($result['district']);
+
+        return $result;
     }
 }
\ No newline at end of file
diff --git a/app/admin/logic/distribution/DistributionOrderLogic.php b/app/admin/logic/distribution/DistributionOrderLogic.php
old mode 100644
new mode 100755
index fa491bb3..a2b75602
--- a/app/admin/logic/distribution/DistributionOrderLogic.php
+++ b/app/admin/logic/distribution/DistributionOrderLogic.php
@@ -63,7 +63,7 @@ class DistributionOrderLogic extends Logic
 
         $lists = DistributionOrderGoods::alias('dog')
             ->leftJoin('order o', 'o.id = dog.order_id')
-            ->leftJoin('procurement u', 'u.id = dog.user_id')
+            ->leftJoin('user u', 'u.id = dog.user_id')
             ->leftJoin('order_goods og', 'og.id = dog.order_goods_id')
             ->leftJoin('distribution_level dl', 'dl.id = dog.level_id')
             ->leftJoin('shop s', 's.id = dog.shop_id')
@@ -76,7 +76,7 @@ class DistributionOrderLogic extends Logic
 
         $count = DistributionOrderGoods::alias('dog')
             ->leftJoin('order o', 'o.id = dog.order_id')
-            ->leftJoin('procurement u', 'u.id = dog.user_id')
+            ->leftJoin('user u', 'u.id = dog.user_id')
             ->leftJoin('order_goods og', 'og.id = dog.order_goods_id')
             ->leftJoin('distribution_level dl', 'dl.id = dog.level_id')
             ->leftJoin('shop s', 's.id = dog.shop_id')
diff --git a/app/admin/logic/distribution/DistributionSettingLogic.php b/app/admin/logic/distribution/DistributionSettingLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/distribution/MemberLogic.php b/app/admin/logic/distribution/MemberLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/distribution/RecordLogic.php b/app/admin/logic/distribution/RecordLogic.php
old mode 100644
new mode 100755
index 6e718cc8..a7e3294d
--- a/app/admin/logic/distribution/RecordLogic.php
+++ b/app/admin/logic/distribution/RecordLogic.php
@@ -59,7 +59,7 @@ class RecordLogic extends Logic
         }
         $lists = DistributionOrderGoods::alias('dog')
             ->field('dog.money, dog.status as status_desc,dog.create_time as distribution_create_time,u.nickname as user_nickname,u.sn as user_sn,u.mobile as user_mobile,og.total_pay_price,o.order_sn')
-            ->leftJoin('procurement u', 'u.id=dog.user_id')
+            ->leftJoin('user u', 'u.id=dog.user_id')
             ->leftJoin('order_goods og', 'og.id=dog.order_goods_id')
             ->leftJoin('order o', 'o.id=og.order_id')
             ->where($where)
@@ -70,7 +70,7 @@ class RecordLogic extends Logic
 
         $count = DistributionOrderGoods::alias('dog')
             ->field('dog.money, dog.status as status_desc,dog.create_time as distribution_create_time,u.nickname as user_nickname,u.sn as user_sn,u.mobile as user_mobile,og.total_pay_price,o.order_sn')
-            ->leftJoin('procurement u', 'u.id=dog.user_id')
+            ->leftJoin('user u', 'u.id=dog.user_id')
             ->leftJoin('order_goods og', 'og.id=dog.order_goods_id')
             ->leftJoin('order o', 'o.id=og.order_id')
             ->where($where)
diff --git a/app/admin/logic/finance/CardLogic.php b/app/admin/logic/finance/CardLogic.php
old mode 100644
new mode 100755
index f557ba0d..730c457c
--- a/app/admin/logic/finance/CardLogic.php
+++ b/app/admin/logic/finance/CardLogic.php
@@ -69,15 +69,15 @@ class CardLogic extends Logic
             ->count();
 
         foreach ($lists as &$item) {
-//            if (empty($item['procurement'])) {
+//            if (empty($item['user'])) {
 //                // 用户不存在
-//                $procurement = [
+//                $user = [
 //                    'avatar' => '',
 //                    'sn' => '-',
 //                    'nickname' => '-',
 //                ];
 //            } else {
-//                $procurement  = $item['procurement'];
+//                $user  = $item['user'];
 //            }
 //            $item['type_text'] = WithdrawEnum::getTypeDesc($item['type']);
             $item['status_text'] = CardEnum::getStatusDesc($item['status']);
diff --git a/app/admin/logic/finance/FinanceLogic.php b/app/admin/logic/finance/FinanceLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/finance/IntegralLogic.php b/app/admin/logic/finance/IntegralLogic.php
old mode 100644
new mode 100755
index ea06941f..d7128aab
--- a/app/admin/logic/finance/IntegralLogic.php
+++ b/app/admin/logic/finance/IntegralLogic.php
@@ -55,7 +55,7 @@ class IntegralLogic extends Logic
         }
 
         $lists = AccountLog::alias('al')
-            ->join('procurement u', 'al.user_id = u.id')
+            ->join('user u', 'al.user_id = u.id')
             ->field('al.id,al.user_id,al.source_type,al.change_amount,al.left_amount,al.remark,al.change_type,al.create_time,u.sn as user_sn,u.nickname')
             ->where($where)
             ->page($get['page'], $get['limit'])
@@ -69,7 +69,7 @@ class IntegralLogic extends Logic
 
 
         $count = AccountLog::alias('al')
-            ->join('procurement u', 'al.user_id = u.id')
+            ->join('user u', 'al.user_id = u.id')
             ->where($where)
             ->count();
 
@@ -88,7 +88,7 @@ class IntegralLogic extends Logic
     {
         try {
             $lists = AccountLog::alias('al')
-                ->join('procurement u', 'al.user_id = u.id')
+                ->join('user u', 'al.user_id = u.id')
                 ->field('al.id,al.user_id,al.source_type,al.change_amount,al.left_amount,al.remark,al.change_type,al.create_time,u.sn as user_sn,u.nickname')
                 ->where($where)
                 ->order('id','desc')
diff --git a/app/admin/logic/finance/ShopSettlementLogic.php b/app/admin/logic/finance/ShopSettlementLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/finance/ShopWithdrawalLogic.php b/app/admin/logic/finance/ShopWithdrawalLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/finance/WithdrawLogic.php b/app/admin/logic/finance/WithdrawLogic.php
old mode 100644
new mode 100755
index e3330831..cb78a9ff
--- a/app/admin/logic/finance/WithdrawLogic.php
+++ b/app/admin/logic/finance/WithdrawLogic.php
@@ -63,7 +63,7 @@ class WithdrawLogic extends Logic
             $where[] = ['status', '=', $get['status']];
         }
 
-        if (empty($get['start_time']) && empty($get['end_time'])) {
+         if (empty($get['start_time']) && empty($get['end_time'])) {
 //            create_time
             $where[] = ['w.create_time', '>=', strtotime(date("Y-m-d", time()))];
             $where[] = ['w.create_time', '<=', strtotime(date("Y-m-d", time())) + 86399];
@@ -91,7 +91,7 @@ class WithdrawLogic extends Logic
             ->page($get['page'], $get['limit'])
             ->order('w.id desc')
             ->select();
-
+             
         $count = WithdrawApply::alias('w')
             ->field('w.*, u.nickname,u.avatar, u.sn as user_sn, u.mobile, ul.name as user_level_name')
             ->leftJoin('user u', 'u.id = w.user_id')
@@ -123,7 +123,7 @@ class WithdrawLogic extends Logic
         }
         return ['count' => $count, 'lists' => $lists];
     }
-
+    
     /**
      * @notes 会员佣金提现列表
      * @param $get
@@ -237,9 +237,9 @@ class WithdrawLogic extends Logic
         $countWaitWithdraw = $model->where(['status' => WithdrawEnum::STATUS_WAIT])->count();
         $totalEarnings = (new User())->where(['del' => 0])->sum('earnings');
 
-            return ['successWithdraw' => $successWithdraw, 'handleWithdraw' => $handleWithdraw, 'totalEarnings' => $totalEarnings, 'countWaitWithdraw' => $countWaitWithdraw];
+        return ['successWithdraw' => $successWithdraw, 'handleWithdraw' => $handleWithdraw, 'totalEarnings' => $totalEarnings,'countWaitWithdraw' => $countWaitWithdraw];
     }
-
+    
     /**
      * @notes 数据汇总
      * @return array
@@ -252,9 +252,10 @@ class WithdrawLogic extends Logic
         $model = new BalanceWithdrawApply();
         $successWithdraw = $model->where(['status' => WithdrawEnum::STATUS_SUCCESS])->sum('money');
         $handleWithdraw = $model->where(['status' => WithdrawEnum::STATUS_ING])->sum('money');
+        $countWaitWithdraw = $model->where(['status' => WithdrawEnum::STATUS_WAIT])->count();
         $totalEarnings = (new User())->where(['del' => 0])->sum('earnings');
 
-        return ['successWithdraw' => $successWithdraw, 'handleWithdraw' => $handleWithdraw, 'totalEarnings' => $totalEarnings];
+        return ['successWithdraw' => $successWithdraw, 'handleWithdraw' => $handleWithdraw, 'totalEarnings' => $totalEarnings, 'countWaitWithdraw' => $countWaitWithdraw];
     }
 
     /**
@@ -517,8 +518,8 @@ class WithdrawLogic extends Logic
                 $list['pay_time'] = date('Y-m-d H:i:s', $list['pay_time']);
             }
         }
-
-        //var_dump($lists);
+		
+		//var_dump($lists);
 
         $count = RechargeOrder::alias('r')
             ->field('r.*,u.id,u.nickname,u.mobile')
@@ -554,7 +555,7 @@ class WithdrawLogic extends Logic
         $detail['payment_time'] = $detail['payment_time'] ? date('Y-m-d H:i:s', $detail['payment_time']) : '';
         return $detail;
     }
-
+    
     /**
      * @notes 会员余额提现详情
      * @param $id
@@ -656,7 +657,7 @@ class WithdrawLogic extends Logic
             ];
         }
     }
-
+    
     /**
      * @notes 余额提现审核通过
      * @param $post
@@ -710,12 +711,12 @@ class WithdrawLogic extends Logic
         if ($withdraw['type'] == WithdrawEnum::TYPE_WECHAT_CHANGE) {
             //微信零钱接口:1-企业付款到零钱;2-商家转账到零钱
             $transfer_way = ConfigServer::get('withdraw', 'transfer_way',1);
-            if ($transfer_way == 1) {
+              if ($transfer_way == 1) {
                 $result = WechatCorporatePaymentLogic::pay($withdraw);
                 if($result){
                     BalanceWithdrawApply::where('id', $id)
                         ->update(['status' => WithdrawEnum::STATUS_SUCCESS,'update_time' => time(), 'description' => $post['description']]);
-                    return $result;
+                     return $result;
                 }else{
                     return [
                         'code' => 0,
@@ -793,7 +794,7 @@ class WithdrawLogic extends Logic
             Db::rollback();
         }
     }
-
+    
     /**
      * @notes 余额提现审核拒绝
      * @param $post
diff --git a/app/admin/logic/goods/BrandLogic.php b/app/admin/logic/goods/BrandLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/goods/CategoryLogic.php b/app/admin/logic/goods/CategoryLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/goods/ColumnLogic.php b/app/admin/logic/goods/ColumnLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/goods/CommentLogic.php b/app/admin/logic/goods/CommentLogic.php
old mode 100644
new mode 100755
index 7485ede8..8abe8855
--- a/app/admin/logic/goods/CommentLogic.php
+++ b/app/admin/logic/goods/CommentLogic.php
@@ -79,7 +79,7 @@ class CommentLogic extends Logic
         $lists = GoodsComment::alias('gc')
             ->with(['goods_comment_image'])
             ->field('gc.id,gc.goods_comment,gc.goods_comment as goods_comment_desc,gc.comment,gc.reply,gc.status,gc.status as status_desc,gc.create_time,u.sn,u.nickname,u.avatar,u.level,g.name as goods_name,g.image as goods_image,gi.image as item_image,gi.spec_value_str,s.id as shop_id,s.name as shop_name,s.type as shop_type,s.logo as shop_logo')
-            ->leftJoin('procurement u', 'u.id=gc.user_id')
+            ->leftJoin('user u', 'u.id=gc.user_id')
             ->leftJoin('goods g', 'g.id=gc.goods_id')
             ->leftJoin('goods_item gi', 'gi.id=gc.item_id')
             ->leftJoin('shop s', 's.id=gc.shop_id')
@@ -91,7 +91,7 @@ class CommentLogic extends Logic
 
         $count = GoodsComment::alias('gc')
             ->field('gc.id,gc.goods_comment,gc.goods_comment as goods_comment_desc,gc.comment,gc.reply,gc.status,gc.status as status_desc,gc.create_time,u.sn,u.nickname,u.avatar,u.level,g.name as goods_name,g.image as goods_image,gi.image as item_image,gi.spec_value_str')
-            ->leftJoin('procurement u', 'u.id=gc.user_id')
+            ->leftJoin('user u', 'u.id=gc.user_id')
             ->leftJoin('goods g', 'g.id=gc.goods_id')
             ->leftJoin('goods_item gi', 'gi.id=gc.item_id')
             ->leftJoin('shop s', 's.id=gc.shop_id')
diff --git a/app/admin/logic/goods/GoodsLogic.php b/app/admin/logic/goods/GoodsLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/goods/PriceLogic.php b/app/admin/logic/goods/PriceLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/goods/UnitLogic.php b/app/admin/logic/goods/UnitLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/index/StatLogic.php b/app/admin/logic/index/StatLogic.php
old mode 100644
new mode 100755
index 8e165b5f..2593aa8a
--- a/app/admin/logic/index/StatLogic.php
+++ b/app/admin/logic/index/StatLogic.php
@@ -77,12 +77,12 @@ class StatLogic extends Logic
         }
 
         //新增会员
-        $add_user_all       = Db::name('procurement')
+        $add_user_all       = Db::name('user')
                                 ->count('id');
-        $add_user_yesterday = Db::name('procurement')
+        $add_user_yesterday = Db::name('user')
                                 ->whereTime('create_time', 'yesterday')
                                 ->count('id');
-        $add_user_today     = Db::name('procurement')
+        $add_user_today     = Db::name('user')
                                 ->whereTime('create_time', 'today')
                                 ->count('id');
         $add_user_change_red = 0;
diff --git a/app/admin/logic/integral/IntegralGoodsLogic.php b/app/admin/logic/integral/IntegralGoodsLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/integral/IntegralOrderLogic.php b/app/admin/logic/integral/IntegralOrderLogic.php
old mode 100644
new mode 100755
index 924bd104..6ec1d77c
--- a/app/admin/logic/integral/IntegralOrderLogic.php
+++ b/app/admin/logic/integral/IntegralOrderLogic.php
@@ -86,7 +86,7 @@ class IntegralOrderLogic extends Logic
 
         $lists = $order
             ->field('*')
-            ->with(['procurement'])
+            ->with(['user'])
             ->where($where)
             ->append(['pay_status_text', 'delivery_address', 'order_status_desc', 'type_desc'])
             ->page($get['page'], $get['limit'])
@@ -96,7 +96,7 @@ class IntegralOrderLogic extends Logic
 
         foreach ($lists as $key=>&$list) {
             $list['pay_time'] = $list['pay_time'] == '0' ? '未支付' : date('Y-m-d H:i:s', $list['pay_time']);
-            $list['procurement']['avatar'] = UrlServer::getFileUrl($list['procurement']['avatar']);
+            $list['user']['avatar'] = UrlServer::getFileUrl($list['user']['avatar']);
             $list['goods_snap']['image'] = UrlServer::getFileUrl($list['goods_snap']['image']);
         }
         return ['count' => $count, 'lists' => $lists];
@@ -112,7 +112,7 @@ class IntegralOrderLogic extends Logic
     public static function detail($id)
     {
         $result = (new IntegralOrder())
-            ->with(['procurement'])
+            ->with(['user'])
             ->where('id', $id)
             ->append(['delivery_address', 'pay_status_desc', 'order_status_desc','type_desc','pay_way_desc'])
             ->findOrEmpty()
@@ -120,7 +120,7 @@ class IntegralOrderLogic extends Logic
 
         $result['pay_time'] = $result['pay_time'] == '0' ? '未支付' : date('Y-m-d H:i:s', $result['pay_time']);
         $result['confirm_time'] = empty($result['confirm_time']) ? '-' : date('Y-m-d H:i:s', $result['confirm_time']);
-        $result['procurement']['avatar'] = UrlServer::getFileUrl($result['procurement']['avatar']);
+        $result['user']['avatar'] = UrlServer::getFileUrl($result['user']['avatar']);
         $result['goods_snap']['image'] = UrlServer::getFileUrl($result['goods_snap']['image']);
 
         return $result;
diff --git a/app/admin/logic/kefu/KefuLangLogic.php b/app/admin/logic/kefu/KefuLangLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/kefu/KefuLogic.php b/app/admin/logic/kefu/KefuLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/live/LiveGoodsLogic.php b/app/admin/logic/live/LiveGoodsLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/live/LiveRoomLogic.php b/app/admin/logic/live/LiveRoomLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/order/InvoiceLogic.php b/app/admin/logic/order/InvoiceLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/order/JicaiLogic.php b/app/admin/logic/order/JicaiLogic.php
old mode 100644
new mode 100755
index 92cdaa9d..1fb284d1
--- a/app/admin/logic/order/JicaiLogic.php
+++ b/app/admin/logic/order/JicaiLogic.php
@@ -157,14 +157,14 @@ class JicaiLogic extends Logic
         $count = $jicai
             ->alias('j')
             ->field($field)
-            ->join('procurement u', 'u.id = j.user_id')
+            ->join('user u', 'u.id = j.user_id')
             ->where($where)
             ->count();
 
         $lists = $jicai
             ->alias('j')
             ->field($field)
-            ->join('procurement u', 'u.id = j.user_id')
+            ->join('user u', 'u.id = j.user_id')
             ->where($where)
             ->page($page, $limit)
             ->order('j.id desc')
@@ -174,7 +174,7 @@ class JicaiLogic extends Logic
 
         foreach ($lists as $list) {
             //$list['pay_time'] = $list['pay_time'] == '0' ? '未支付' : date('Y-m-d H:i:s', $list['pay_time']);
-            //$list['procurement']['avatar'] = UrlServer::getFileUrl($list['procurement']['avatar']);
+            //$list['user']['avatar'] = UrlServer::getFileUrl($list['user']['avatar']);
             //$list['shop']['logo'] = UrlServer::getFileUrl($list['shop']['logo']);
 			$list["status_text"] = Jicai::getOrderStatus($list["status"]);
 			$list['get_time'] = date('Y-m-d', $list['get_time']);
@@ -198,12 +198,12 @@ class JicaiLogic extends Logic
     {
         $order = new Order();
         $result = $order
-            ->with(['procurement', 'order_goods', 'invoice'])
+            ->with(['user', 'order_goods', 'invoice'])
             ->where('id', $id)
             ->append(['delivery_address', 'pay_status_text', 'order_status_text', 'pay_way_text', 'order_type_text'])
             ->find();
         $result['pay_time'] = $result['pay_time'] == '0' ? '未支付' : date('Y-m-d H:i:s', $result['pay_time']);
-        $result['procurement']['avatar'] = UrlServer::getFileUrl($result['procurement']['avatar']);
+        $result['user']['avatar'] = UrlServer::getFileUrl($result['user']['avatar']);
         foreach ($result['order_goods'] as &$order_goods) {
             $order_goods['goods_image'] = empty($order_goods['spec_image']) ?
                 UrlServer::getFileUrl($order_goods['image']) : UrlServer::getFileUrl($order_goods['spec_image']);
@@ -399,7 +399,7 @@ class JicaiLogic extends Logic
 
             $lists = Order::alias('o')
                 ->leftjoin('shop s', 's.id = o.shop_id')
-                ->leftjoin('procurement u', 'u.id = o.user_id')
+                ->leftjoin('user u', 'u.id = o.user_id')
                 ->join('order_goods g', 'g.order_id = o.id')
                 ->with(['order_goods'])
                 ->field($field)
diff --git a/app/admin/logic/order/OrderLogic.php b/app/admin/logic/order/OrderLogic.php
old mode 100644
new mode 100755
index a8d01816..51f37634
--- a/app/admin/logic/order/OrderLogic.php
+++ b/app/admin/logic/order/OrderLogic.php
@@ -278,16 +278,16 @@ class OrderLogic extends Logic
             ->join('delivery d', 'd.order_id = o.id')
             ->where(['o.id' => $order_id])
             ->find();
-
+            
         $express = ConfigServer::get('express', 'way');
         $key = ConfigServer::get($express, 'appkey');
         $app = ConfigServer::get($express, 'appsecret');
         if (empty($express) || $order['shipping_status'] != 1 || empty($app) || empty($key)) {
             return $traces[] = ['暂无物流信息'];
         }
-
+        
         $result = Kd100Logic::detail($order_id);
-
+        
         // 如果当前时间大于了api接口限制的时间，则调用api接口
         if (!isset($result) || (time() > $result['sel_time'])) {
             //快递配置设置为快递鸟时
diff --git a/app/admin/logic/procurement/ProcurementLogic.php b/app/admin/logic/procurement/ProcurementLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/procurement/TreatyLogic.php b/app/admin/logic/procurement/TreatyLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/seckill/SeckillGoodsLogic.php b/app/admin/logic/seckill/SeckillGoodsLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/seckill/SeckillTimeLogic.php b/app/admin/logic/seckill/SeckillTimeLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/setting/BasicLogic.php b/app/admin/logic/setting/BasicLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/setting/HotSearchLogic.php b/app/admin/logic/setting/HotSearchLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/setting/MapLogic.php b/app/admin/logic/setting/MapLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/setting/MarketingConfigLogic.php b/app/admin/logic/setting/MarketingConfigLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/setting/SmsLogic.php b/app/admin/logic/setting/SmsLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/setting/UserLogic.php b/app/admin/logic/setting/UserLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/shop/ApplyLogic.php b/app/admin/logic/shop/ApplyLogic.php
old mode 100644
new mode 100755
index a39606fc..45256e35
--- a/app/admin/logic/shop/ApplyLogic.php
+++ b/app/admin/logic/shop/ApplyLogic.php
@@ -10,8 +10,8 @@ use app\common\enum\ShopEnum;
 use app\common\model\shop\Shop;
 use app\common\model\shop\ShopAdmin;
 use app\common\model\shop\ShopApply;
-use app\common\model\user\User;
 use app\common\server\UrlServer;
+use app\common\model\user\User;
 use Exception;
 use think\facade\Db;
 
@@ -143,6 +143,7 @@ class ApplyLogic extends Logic
             $model = new ShopApply();
             $shopApply = $model->field(true)->findOrEmpty((int)$post['id'])->toArray();
             $user_msg = User::where("id",$shopApply['user_id'])->find();
+            
             if ($post['audit_status'] == ShopEnum::AUDIT_STATUS_OK) {
                 if($user_msg['first_leader'] == null){
                     $user_msg['first_leader'] = 0;
diff --git a/app/admin/logic/shop/AuthLogic.php b/app/admin/logic/shop/AuthLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/shop/CategoryLogic.php b/app/admin/logic/shop/CategoryLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/shop/LocalStoreLogic.php b/app/admin/logic/shop/LocalStoreLogic.php
old mode 100644
new mode 100755
index 5d9f86d7..d89b923d
--- a/app/admin/logic/shop/LocalStoreLogic.php
+++ b/app/admin/logic/shop/LocalStoreLogic.php
@@ -6,6 +6,10 @@ use app\common\basics\Logic;
 use app\common\model\LocalStore;
 use app\common\model\LocalStoreOrder;
 use app\common\server\ExportExcelServer;
+use app\common\server\UrlServer;
+use app\common\server\WeChatServer;
+use EasyWeChat\Factory;
+use app\common\model\user\User;
 
 class LocalStoreLogic extends Logic
 {
@@ -17,7 +21,7 @@ class LocalStoreLogic extends Logic
     public static function lists()
     {
         return array(
-            'lists' => LocalStore::with('info')->select()->toArray()
+            'lists' => LocalStore::with('info')->where('is_delete', 0)->select()->toArray()
         );
     }
 
@@ -89,8 +93,64 @@ class LocalStoreLogic extends Logic
         }
     }
 
-    public static function getPayImage($lstore_id)
+    public static function getPayImage($user_id, $lstore_id)
     {
-        return LocalStore::where('lstore_id', $lstore_id)->field('pay_image')->find()->toArray();
+        $user_msg = User::where("id",$user_id)->where("del",0)->where("disable",0)->find();
+        if($user_msg == null){
+            return false;
+        }
+        
+        $user_local_msg = LocalStore::where("user_id",$user_id)->where("store_state",1)->find();
+        if ($user_local_msg != null) {
+            if ($user_local_msg['pay_image'] != null) {
+                $data['pay_image'] = $user_local_msg['pay_image'];
+                return $data;
+            } else {
+                $url = "bundle_b/pages/local_shop/local_pay";
+                $save_dir = ROOT_PATH .'/uploads/localpay/';
+                $scene = 'lid='.$lstore_id;
+                $a = time().$scene;
+                $qr_src = $a . '.jpg';
+            }
+        }else{
+            $url = "bundle_b/pages/local_shop/local_pay";
+            $save_dir = ROOT_PATH .'/uploads/localpay/';
+            $scene = 'lid='.$lstore_id;
+            $a = time().$scene;
+            $qr_src = $a . '.jpg';
+        }
+        try {
+            $config = WeChatServer::getMnpConfig();
+            $app = Factory::miniProgram($config);
+
+            $response = $app->app_code->getUnlimit($scene, [
+                'page'  => $url,
+                'env_version' => 'develop'
+            ]);
+ 
+            if ($response instanceof \EasyWeChat\Kernel\Http\StreamResponse) {
+                $response->saveAs($save_dir, $a);
+                $us = \think\facade\Request::instance()->domain();
+                $data['pay_image'] = $us.'/uploads/localpay/'.$qr_src;
+                $user_msg = LocalStore::where("lstore_id",$lstore_id)->update($data);
+                if($user_msg){
+                    return $data;
+                }else{
+                    return false;
+                }
+            }
+            if(isset($response['errcode']) && 41030 === $response['errcode']){
+                return '商城小程序未上线或商城小程序页面发布';
+            }
+            return $response['errmsg'];
+        } catch (\EasyWeChat\Kernel\Exceptions\Exception $e){
+            return $e->getMessage();
+        }
+    }
+    
+    public static function del($id) {
+        $result = LocalStore::where("lstore_id", $id)
+        ->update(['is_delete' => 1, 'delete_time' => date('Y-m-d H:i:s')]);
+        return $result;
     }
 }
\ No newline at end of file
diff --git a/app/admin/logic/shop/StoreLogic.php b/app/admin/logic/shop/StoreLogic.php
old mode 100644
new mode 100755
index b8241d47..fca32a80
--- a/app/admin/logic/shop/StoreLogic.php
+++ b/app/admin/logic/shop/StoreLogic.php
@@ -8,8 +8,8 @@ use app\common\basics\Logic;
 use app\common\enum\ShopEnum;
 use app\common\model\shop\Shop;
 use app\common\model\shop\ShopAdmin;
-use app\common\model\user\User;
 use app\common\server\UrlServer;
+use app\common\model\user\User;
 use Exception;
 use think\facade\Db;
 
@@ -360,7 +360,7 @@ class StoreLogic extends Logic
         }
         return true;
     }
-    public static function adjustFirstLeader($params)
+        public static function adjustFirstLeader($params)
     {
         Db::startTrans();
         try {
diff --git a/app/admin/logic/shop/TreatyLogic.php b/app/admin/logic/shop/TreatyLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/sign_daily/SignDailyLogic.php b/app/admin/logic/sign_daily/SignDailyLogic.php
old mode 100644
new mode 100755
index 81e28618..ed80a47e
--- a/app/admin/logic/sign_daily/SignDailyLogic.php
+++ b/app/admin/logic/sign_daily/SignDailyLogic.php
@@ -67,12 +67,12 @@ class SignDailyLogic extends Logic
             continuous_integral, continuous_growth,sign_time,mobile,us.sign_time';
 
         $count = UserSign::alias('us')
-            ->join('procurement u', 'u.id = us.user_id')
+            ->join('user u', 'u.id = us.user_id')
             ->where($where)
             ->count();
 
         $lists = UserSign::alias('us')
-            ->join('procurement u', 'u.id = us.user_id')
+            ->join('user u', 'u.id = us.user_id')
             ->where($where)
             ->field($field)
             ->order('us.id desc')
diff --git a/app/admin/logic/system/CrontabLogic.php b/app/admin/logic/system/CrontabLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/system/LogLogic.php b/app/admin/logic/system/LogLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/system/UpgradeLogic.php b/app/admin/logic/system/UpgradeLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/team/ActivityLogic.php b/app/admin/logic/team/ActivityLogic.php
old mode 100644
new mode 100755
index ad66dc23..c443ad10
--- a/app/admin/logic/team/ActivityLogic.php
+++ b/app/admin/logic/team/ActivityLogic.php
@@ -120,7 +120,7 @@ class ActivityLogic extends Logic
 
             $model = new TeamFound();
             $lists = $model->alias('TF')->field(['TF.*,U.nickname,U.sn,U.avatar'])
-                ->join('procurement U', 'U.id = TF.user_id')
+                ->join('user U', 'U.id = TF.user_id')
                 ->order('id desc')
                 ->where($where)
                 ->paginate([
diff --git a/app/admin/logic/team/FoundLogic.php b/app/admin/logic/team/FoundLogic.php
old mode 100644
new mode 100755
index a593d1f1..066bd288
--- a/app/admin/logic/team/FoundLogic.php
+++ b/app/admin/logic/team/FoundLogic.php
@@ -46,7 +46,7 @@ class FoundLogic extends Logic
 
             $model = new TeamFound();
             $lists = $model->alias('TF')->field(['TF.*,U.nickname,U.sn,U.avatar'])
-                ->join('procurement U', 'U.id = TF.user_id')
+                ->join('user U', 'U.id = TF.user_id')
                 ->order('id desc')
                 ->where($where)
                 ->paginate([
@@ -96,7 +96,7 @@ class FoundLogic extends Logic
     {
         $teamFound = (new TeamFound())->alias('TF')
             ->field(['TF.*,U.sn,U.nickname,U.mobile'])
-            ->join('procurement U', 'U.id = TF.user_id')
+            ->join('user U', 'U.id = TF.user_id')
             ->where('TF.id', '=', intval($id))
             ->findOrEmpty()->toArray();
         $teamFound['kaituan_time'] = date('Y-m-d H:i:s', $teamFound['kaituan_time']);
@@ -120,7 +120,7 @@ class FoundLogic extends Logic
 
             $model = new TeamJoin();
             $lists = $model->alias('TJ')->field(['TJ.*,U.sn,U.nickname,U.avatar'])
-                ->join('procurement U', 'U.id = TJ.user_id')
+                ->join('user U', 'U.id = TJ.user_id')
                 ->where($where)
                 ->paginate([
                     'page'      => $get['page'] ?? 1,
diff --git a/app/admin/logic/user/GzuserLogic.php b/app/admin/logic/user/GzuserLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/user/LevelLogic.php b/app/admin/logic/user/LevelLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/user/TagLogic.php b/app/admin/logic/user/TagLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php
old mode 100644
new mode 100755
index d463b3b4..9488e92c
--- a/app/admin/logic/user/UserLogic.php
+++ b/app/admin/logic/user/UserLogic.php
@@ -7,9 +7,8 @@ use app\common\basics\Logic;
 use app\common\enum\ClientEnum;
 use app\common\enum\OrderEnum;
 use app\common\logic\AccountLogLogic;
-use app\common\model\AccountLog;
-use app\common\model\distribution\Distribution;
 use app\common\model\distribution\DistributionOrderGoods;
+use app\common\model\AccountLog;
 use app\common\model\Session;
 use app\common\model\user\User;
 use app\common\model\user\UserLevel;
@@ -23,10 +22,12 @@ class UserLogic extends Logic
     public static function lists($get)
     {
         $where[] = ['del','=', '0'];
-
+        $w = "";
         //查询
         if(isset($get['keyword']) && $get['keyword']){
-            $where[] = [$get['keyword_type'],'like', '%'. trim($get['keyword']) . '%'];
+            $w = "mobile like '%".$get['keyword']."%' or ".$get['keyword_type']." like '%".trim($get['keyword'])."%'";
+            // $where[] = [$get['keyword_type'],'like', '%'. trim($get['keyword']) . '%'];
+            // $where[] = ["moblie",'like', '%'. trim($get['keyword']) . '%'];
         }
 
         //用户状态
@@ -69,6 +70,7 @@ class UserLogic extends Logic
 
         $user_list = User::where($where)
             ->field('id,sn,nickname,avatar,mobile,level,total_order_amount,tag_ids,client,login_time,create_time,user_growth,user_money,earnings,first_leader,disable,is_team')
+            ->where($w)
             ->page($get['page'],$get['limit'])
             ->order('id desc')
             ->select()
@@ -278,7 +280,7 @@ class UserLogic extends Logic
                     $user->save();
                     AccountLogLogic::AccountRecord($user['id'], $post['money'],1,AccountLog::admin_add_money, $post['money_remark']);
                     if($user->first_leader != 0){
-
+         
                             $jicai = round($post['money'] * 5 / 100, 2);
 //                            Order::where('id', $order_id)
 //                                ->inc('distribution_money',$jicai)->update();
@@ -315,7 +317,6 @@ class UserLogic extends Logic
                                 'settlement_time' => time()
                             ]);
                     }
-
                 }
             }
 
diff --git a/app/admin/logic/wechat/HfiveLogic.php b/app/admin/logic/wechat/HfiveLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/wechat/MnpLogic.php b/app/admin/logic/wechat/MnpLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/wechat/OaLogic.php b/app/admin/logic/wechat/OaLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/wechat/OpLogic.php b/app/admin/logic/wechat/OpLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/wechat/PcLogic.php b/app/admin/logic/wechat/PcLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/logic/wechat/ReplyLogic.php b/app/admin/logic/wechat/ReplyLogic.php
old mode 100644
new mode 100755
diff --git a/app/admin/server/AuthServer.php b/app/admin/server/AuthServer.php
old mode 100644
new mode 100755
diff --git a/app/admin/server/MenuServer.php b/app/admin/server/MenuServer.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/AdminPasswordValidate.php b/app/admin/validate/AdminPasswordValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/AdminValidate.php b/app/admin/validate/AdminValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/AuthValidate.php b/app/admin/validate/AuthValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/BargainValidate.php b/app/admin/validate/BargainValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/ExpressValidate.php b/app/admin/validate/ExpressValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/FreightValidate.php b/app/admin/validate/FreightValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/LoginValidate.php b/app/admin/validate/LoginValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/RechargeTemplateValidate.php b/app/admin/validate/RechargeTemplateValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/RoleValidate.php b/app/admin/validate/RoleValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/ShopAuthValidate.php b/app/admin/validate/ShopAuthValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/StoreValidate.php b/app/admin/validate/StoreValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/UpgradeValidate.php b/app/admin/validate/UpgradeValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/activity_area/ActivityGoods.php b/app/admin/validate/activity_area/ActivityGoods.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/activity_area/AreaValidate.php b/app/admin/validate/activity_area/AreaValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/community/CommunityArticleValidate.php b/app/admin/validate/community/CommunityArticleValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/community/CommunityCategoryValidate.php b/app/admin/validate/community/CommunityCategoryValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/community/CommunityCommentValidate.php b/app/admin/validate/community/CommunityCommentValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/community/CommunityTopicValidate.php b/app/admin/validate/community/CommunityTopicValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/content/ArticleCategoryValidate.php b/app/admin/validate/content/ArticleCategoryValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/content/ArticleValidate.php b/app/admin/validate/content/ArticleValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/content/HelpCategoryValidate.php b/app/admin/validate/content/HelpCategoryValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/content/HelpValidate.php b/app/admin/validate/content/HelpValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/decoration/AdPositionValidate.php b/app/admin/validate/decoration/AdPositionValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/decoration/AdValidate.php b/app/admin/validate/decoration/AdValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/decoration/MenuDecorateValidate.php b/app/admin/validate/decoration/MenuDecorateValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/distribution/DistributionLevelValidate.php b/app/admin/validate/distribution/DistributionLevelValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/distribution/MemberValidate.php b/app/admin/validate/distribution/MemberValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/goods/BrandValidate.php b/app/admin/validate/goods/BrandValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/goods/CategoryValidate.php b/app/admin/validate/goods/CategoryValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/goods/ColumnValidate.php b/app/admin/validate/goods/ColumnValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/goods/GoodsValidate.php b/app/admin/validate/goods/GoodsValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/goods/UnitValidate.php b/app/admin/validate/goods/UnitValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/integral/IntegralGoodsValidate.php b/app/admin/validate/integral/IntegralGoodsValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/integral/IntegralOrderValidate.php b/app/admin/validate/integral/IntegralOrderValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/kefu/KefuLangValidate.php b/app/admin/validate/kefu/KefuLangValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/kefu/KefuValidate.php b/app/admin/validate/kefu/KefuValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/kefu/LoginValidate.php b/app/admin/validate/kefu/LoginValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/live/LiveGoodsValidate.php b/app/admin/validate/live/LiveGoodsValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/live/LiveRoomValidate.php b/app/admin/validate/live/LiveRoomValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/order/OrderValidate.php b/app/admin/validate/order/OrderValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/seckill/SeckillTimeValidate.php b/app/admin/validate/seckill/SeckillTimeValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/shop/ShopApplyValidate.php b/app/admin/validate/shop/ShopApplyValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/shop/StoreLValidate.php b/app/admin/validate/shop/StoreLValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/shop/StoreStatusValidate.php b/app/admin/validate/shop/StoreStatusValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/sign_daily/SignDailyValidate.php b/app/admin/validate/sign_daily/SignDailyValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/system/CrontabValidate.php b/app/admin/validate/system/CrontabValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/user/LevelValidate.php b/app/admin/validate/user/LevelValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/user/TagValidate.php b/app/admin/validate/user/TagValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/user/UserValidate.php b/app/admin/validate/user/UserValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/validate/wechat/ReplyValidate.php b/app/admin/validate/wechat/ReplyValidate.php
old mode 100644
new mode 100755
diff --git a/app/admin/view/account_log/account_log/growth_lists.html b/app/admin/view/account_log/account_log/growth_lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/activity_area/area/add.html b/app/admin/view/activity_area/area/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/activity_area/area/edit.html b/app/admin/view/activity_area/area/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/activity_area/area/lists.html b/app/admin/view/activity_area/area/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/activity_area/goods/audit.html b/app/admin/view/activity_area/goods/audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/activity_area/goods/detail.html b/app/admin/view/activity_area/goods/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/activity_area/goods/lists.html b/app/admin/view/activity_area/goods/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/activity_area/goods/violation.html b/app/admin/view/activity_area/goods/violation.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/admin/add.html b/app/admin/view/admin/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/admin/edit.html b/app/admin/view/admin/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/admin/lists.html b/app/admin/view/admin/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/admin/password.html b/app/admin/view/admin/password.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/after_sale/after_sale/detail.html b/app/admin/view/after_sale/after_sale/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/after_sale/after_sale/lists.html b/app/admin/view/after_sale/after_sale/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/auth/add.html b/app/admin/view/auth/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/auth/edit.html b/app/admin/view/auth/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/auth/lists.html b/app/admin/view/auth/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/bargain/activity.html b/app/admin/view/bargain/activity.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/bargain/add.html b/app/admin/view/bargain/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/bargain/audit.html b/app/admin/view/bargain/audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/bargain/bargain_detail.html b/app/admin/view/bargain/bargain_detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/bargain/detail.html b/app/admin/view/bargain/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/bargain/edit.html b/app/admin/view/bargain/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/bargain/launch.html b/app/admin/view/bargain/launch.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/bargain/set.html b/app/admin/view/bargain/set.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/bargain/violation.html b/app/admin/view/bargain/violation.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/common/goods/select_goods.html b/app/admin/view/common/goods/select_goods.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/community/community_article/audit.html b/app/admin/view/community/community_article/audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/community/community_article/detail.html b/app/admin/view/community/community_article/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/community/community_article/lists.html b/app/admin/view/community/community_article/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/community/community_category/add.html b/app/admin/view/community/community_category/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/community/community_category/edit.html b/app/admin/view/community/community_category/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/community/community_category/lists.html b/app/admin/view/community/community_category/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/community/community_comment/audit.html b/app/admin/view/community/community_comment/audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/community/community_comment/lists.html b/app/admin/view/community/community_comment/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/community/community_setting/setting.html b/app/admin/view/community/community_setting/setting.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/community/community_topic/add.html b/app/admin/view/community/community_topic/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/community/community_topic/edit.html b/app/admin/view/community/community_topic/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/community/community_topic/lists.html b/app/admin/view/community/community_topic/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/content/article/add.html b/app/admin/view/content/article/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/content/article/edit.html b/app/admin/view/content/article/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/content/article/lists.html b/app/admin/view/content/article/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/content/article_category/add.html b/app/admin/view/content/article_category/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/content/article_category/edit.html b/app/admin/view/content/article_category/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/content/article_category/lists.html b/app/admin/view/content/article_category/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/content/help/add.html b/app/admin/view/content/help/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/content/help/edit.html b/app/admin/view/content/help/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/content/help/lists.html b/app/admin/view/content/help/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/content/help_category/add.html b/app/admin/view/content/help_category/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/content/help_category/edit.html b/app/admin/view/content/help_category/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/content/help_category/lists.html b/app/admin/view/content/help_category/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/coupon/shop_coupon/detail.html b/app/admin/view/coupon/shop_coupon/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/coupon/shop_coupon/lists.html b/app/admin/view/coupon/shop_coupon/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/coupon/shop_coupon/record.html b/app/admin/view/coupon/shop_coupon/record.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/ad/add.html b/app/admin/view/decoration/ad/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/ad/edit.html b/app/admin/view/decoration/ad/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/ad/lists.html b/app/admin/view/decoration/ad/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/ad_position/add.html b/app/admin/view/decoration/ad_position/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/ad_position/edit.html b/app/admin/view/decoration/ad_position/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/ad_position/lists.html b/app/admin/view/decoration/ad_position/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/bottom_nav/edit.html b/app/admin/view/decoration/bottom_nav/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/bottom_nav/lists.html b/app/admin/view/decoration/bottom_nav/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/menu_decorate/add.html b/app/admin/view/decoration/menu_decorate/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/menu_decorate/add_tools.html b/app/admin/view/decoration/menu_decorate/add_tools.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/menu_decorate/bottom_navigation.html b/app/admin/view/decoration/menu_decorate/bottom_navigation.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/menu_decorate/category_layout.html b/app/admin/view/decoration/menu_decorate/category_layout.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/menu_decorate/edit.html b/app/admin/view/decoration/menu_decorate/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/menu_decorate/edit_navigation.html b/app/admin/view/decoration/menu_decorate/edit_navigation.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/menu_decorate/edit_tools.html b/app/admin/view/decoration/menu_decorate/edit_tools.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/menu_decorate/goods.html b/app/admin/view/decoration/menu_decorate/goods.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/decoration/menu_decorate/lists.html b/app/admin/view/decoration/menu_decorate/lists.html
old mode 100644
new mode 100755
index adbb099d..5f0e26bb
--- a/app/admin/view/decoration/menu_decorate/lists.html
+++ b/app/admin/view/decoration/menu_decorate/lists.html
@@ -20,8 +20,13 @@
         <div class="layui-tab layui-tab-card" lay-filter="test">
             <ul class="layui-tab-title">
                 <li lay-id="1" class="layui-this">导航设置</li>
-                <li lay-id="2">我的工具</li>
-                <li lay-id="3">其他设置</li>
+                
+                {if (1 == $type) }
+                    <li lay-id="2">其他设置</li>
+                {else/}
+                    <li lay-id="2">我的工具</li>
+                    <li lay-id="3">其他设置</li>
+                {/if}
             </ul>
             <div class="layui-tab-content " style="padding: 0 15px;">
                 <div class="layui-tab-item layui-show">
@@ -42,24 +47,26 @@
                         <img src="{{d.image}}" style="height:80px;width: 80px" class="image-show">
                     </script>
                 </div>
-                <div class="layui-tab-item">
-                    <div style="margin-top: 10px">
-                        <button class="layui-btn layui-btn-sm layEvent {$view_theme_color}" lay-event="addTools">新增工具</button>
+                {if (2 == $type) }
+                    <div class="layui-tab-item">
+                        <div style="margin-top: 10px">
+                            <button class="layui-btn layui-btn-sm layEvent {$view_theme_color}" lay-event="addTools">新增工具</button>
+                        </div>
+                        <table id="like-tools-lists" lay-filter="like-table-lists"></table>
+                        <script type="text/html" id="tools-table-operation">
+                            <a class="layui-btn layui-btn-normal layui-btn-sm" lay-event="editTools">编辑</a>
+                            {{# if(0 == d.is_show) { }}
+                            <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="statusTools">显示</a>
+                            {{# }else{ }}
+                            <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="statusTools">隐藏</a>
+                            {{# } }}
+                            <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="delTools">删除</a>
+                        </script>
+                        <script type="text/html" id="tools-image">
+                            <img src="{{d.image}}" style="height:80px;width: 80px" class="image-show">
+                        </script>
                     </div>
-                    <table id="like-tools-lists" lay-filter="like-table-lists"></table>
-                    <script type="text/html" id="tools-table-operation">
-                        <a class="layui-btn layui-btn-normal layui-btn-sm" lay-event="editTools">编辑</a>
-                        {{# if(0 == d.is_show) { }}
-                        <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="statusTools">显示</a>
-                        {{# }else{ }}
-                        <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="statusTools">隐藏</a>
-                        {{# } }}
-                        <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="delTools">删除</a>
-                    </script>
-                    <script type="text/html" id="tools-image">
-                        <img src="{{d.image}}" style="height:80px;width: 80px" class="image-show">
-                    </script>
-                </div>
+                {/if}
                 <div class="layui-tab-item">
                     <div class="layui-form" lay-filter="">
                         {if (1 == $type) }
diff --git a/app/admin/view/decoration/menu_decorate/shop.html b/app/admin/view/decoration/menu_decorate/shop.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/director/director/add.html b/app/admin/view/director/director/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/director/director/edit.html b/app/admin/view/director/director/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/director/director/lists.html b/app/admin/view/director/director/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/dispatch/dispatch_error.html b/app/admin/view/dispatch/dispatch_error.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/apply/audit.html b/app/admin/view/distribution/apply/audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/apply/detail.html b/app/admin/view/distribution/apply/detail.html
old mode 100644
new mode 100755
index 649fcb83..f5eb194d
--- a/app/admin/view/distribution/apply/detail.html
+++ b/app/admin/view/distribution/apply/detail.html
@@ -42,10 +42,6 @@
             <label class="layui-form-label">现住区域：</label>
             <div class="layui-input-block">{$detail.region}</div>
         </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">现住区域：</label>
-            <div class="layui-input-block">{$detail.region}</div>
-        </div>
         <div class="layui-form-item">
             <label class="layui-form-label">申请状态：</label>
             <div class="layui-input-block">{$detail.status_text}</div>
diff --git a/app/admin/view/distribution/apply/lists.html b/app/admin/view/distribution/apply/lists.html
old mode 100644
new mode 100755
index 07e5f470..18840eb6
--- a/app/admin/view/distribution/apply/lists.html
+++ b/app/admin/view/distribution/apply/lists.html
@@ -63,7 +63,7 @@
                 </script>
             </div>
         </div>
-
+        
         <!--会员信息-->
         <script type="text/html" id="handIdCard">
             <img src="{{d.hand_id_card}}" style="height:80px;width: 80px" class="image-show">
@@ -96,7 +96,7 @@
             var src = $(this).attr('src');
             like.showImg(src,400);
         });
-
+        
         var active = {
             detail: function (obj) {
                 layer.open({
diff --git a/app/admin/view/distribution/center/center.html b/app/admin/view/distribution/center/center.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/center/data.html b/app/admin/view/distribution/center/data.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/distribution_goods/detail.html b/app/admin/view/distribution/distribution_goods/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/distribution_goods/index.html b/app/admin/view/distribution/distribution_goods/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/distribution_level/add.html b/app/admin/view/distribution/distribution_level/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/distribution_level/edit.html b/app/admin/view/distribution/distribution_level/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/distribution_level/edit_default.html b/app/admin/view/distribution/distribution_level/edit_default.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/distribution_level/index.html b/app/admin/view/distribution/distribution_level/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/distribution_member/adjust.html b/app/admin/view/distribution/distribution_member/adjust.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/distribution_member/index.html b/app/admin/view/distribution/distribution_member/index.html
old mode 100644
new mode 100755
index 93ab72f5..484f10b1
--- a/app/admin/view/distribution/distribution_member/index.html
+++ b/app/admin/view/distribution/distribution_member/index.html
@@ -174,7 +174,7 @@
         $(document).on('click', 'img',function(){
             like.showImg($(this).attr('src'),600);
         });
-
+        
         // 工具条事件
         table.on('tool(lists)', function(obj){
             var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
@@ -243,6 +243,7 @@
                 });
             } else if (layEvent === 'see') {
                 id = obj.data.user_id;
+
                 layer.open({
                     type: 2
                     ,title: "分销会员资料"
diff --git a/app/admin/view/distribution/distribution_member/open.html b/app/admin/view/distribution/distribution_member/open.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/distribution_member/see.html b/app/admin/view/distribution/distribution_member/see.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/distribution_member/user_lists.html b/app/admin/view/distribution/distribution_member/user_lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/distribution_order/index.html b/app/admin/view/distribution/distribution_order/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/distribution_setting/index.html b/app/admin/view/distribution/distribution_setting/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/distribution_setting/settlement.html b/app/admin/view/distribution/distribution_setting/settlement.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/member/add_member.html b/app/admin/view/distribution/member/add_member.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/member/audit_lists.html b/app/admin/view/distribution/member/audit_lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/member/earnings_detail.html b/app/admin/view/distribution/member/earnings_detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/member/fans.html b/app/admin/view/distribution/member/fans.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/member/index.html b/app/admin/view/distribution/member/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/member/info.html b/app/admin/view/distribution/member/info.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/member/member_lists.html b/app/admin/view/distribution/member/member_lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/member/update_leader.html b/app/admin/view/distribution/member/update_leader.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/record/lists.html b/app/admin/view/distribution/record/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/distribution/setting/setting.html b/app/admin/view/distribution/setting/setting.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/express/add.html b/app/admin/view/express/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/express/edit.html b/app/admin/view/express/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/file/addCate.html b/app/admin/view/file/addCate.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/file/editCate.html b/app/admin/view/file/editCate.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/file/lists.html b/app/admin/view/file/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/file/move.html b/app/admin/view/file/move.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/card/edit.html b/app/admin/view/finance/card/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/card/lists.html b/app/admin/view/finance/card/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/finance/center.html b/app/admin/view/finance/finance/center.html
old mode 100644
new mode 100755
index ea51a89a..0024456e
--- a/app/admin/view/finance/finance/center.html
+++ b/app/admin/view/finance/finance/center.html
@@ -479,7 +479,7 @@
                 layer.msg('结束时间需要大于开始时间');
                 return false
             }
-
+            
             like.ajax({
                 url: '{:url("finance.Finance/center")}'
                 , data: field
diff --git a/app/admin/view/finance/integral/integral.html b/app/admin/view/finance/integral/integral.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/shop/account.html b/app/admin/view/finance/shop/account.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/shop/settlement.html b/app/admin/view/finance/shop/settlement.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/shop/settlement_detail.html b/app/admin/view/finance/shop/settlement_detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/shop/settlement_record.html b/app/admin/view/finance/shop/settlement_record.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/shop/withdrawal.html b/app/admin/view/finance/shop/withdrawal.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/shop/withdrawal_detail.html b/app/admin/view/finance/shop/withdrawal_detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/shop/withdrawal_examine.html b/app/admin/view/finance/shop/withdrawal_examine.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/shop/withdrawal_transfer.html b/app/admin/view/finance/shop/withdrawal_transfer.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/user/account.html b/app/admin/view/finance/user/account.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/user/balancereview.html b/app/admin/view/finance/user/balancereview.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/user/balancewithdrawal.html b/app/admin/view/finance/user/balancewithdrawal.html
old mode 100644
new mode 100755
index d4ded3de..61148aac
--- a/app/admin/view/finance/user/balancewithdrawal.html
+++ b/app/admin/view/finance/user/balancewithdrawal.html
@@ -34,6 +34,11 @@
 <div class="wrapper">
     <div class="layui-card">
         <div class="layui-card-body">
+        {if ($summary.countWaitWithdraw > 0) }
+            <marquee behavior="" direction="">
+                通知: 您有{$summary.countWaitWithdraw}条佣金提现消息待审核
+            </marquee>
+        {/if}
         <div class="layui-collapse like-layui-collapse" lay-accordion="" style="bcommission:1px dashed #c4c4c4">
             <div class="layui-colla-item">
                 <h2 class="layui-colla-title like-layui-colla-title" style="background-color: #fff">操作提示</h2>
diff --git a/app/admin/view/finance/user/commission.html b/app/admin/view/finance/user/commission.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/user/detail.html b/app/admin/view/finance/user/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/user/recharge.html b/app/admin/view/finance/user/recharge.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/user/review.html b/app/admin/view/finance/user/review.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/user/transfer.html b/app/admin/view/finance/user/transfer.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/finance/user/withdrawal.html b/app/admin/view/finance/user/withdrawal.html
old mode 100644
new mode 100755
index 336ab6bb..9f8e91ea
--- a/app/admin/view/finance/user/withdrawal.html
+++ b/app/admin/view/finance/user/withdrawal.html
@@ -29,35 +29,19 @@
         white-space:normal;
         word-break: break-all;
     }
-
-    .notice-container {
-        margin: 0 auto;
-        width: 300px;
-        height: 30px;
-        line-height: 30px;
-        color: red;
-        overflow: auto;
-        white-space: nowrap;
-    }
-
-    .scroll {
-        width: auto;
-    }
-    ::-webkit-scrollbar{
-        display: none;
-    }
 </style>
 
 <div class="wrapper">
     <div class="layui-card">
         <div class="layui-card-body">
-            {if ($summary.countWaitWithdraw > 0) }
-                <marquee behavior="" direction="">
-                    通知: 您有{$summary.countWaitWithdraw}条佣金提现消息待审核
-                </marquee>
-            {/if}
+        {if ($summary.countWaitWithdraw > 0) }
+            <marquee behavior="" direction="">
+                通知: 您有{$summary.countWaitWithdraw}条佣金提现消息待审核
+            </marquee>
+        {/if}
 
-            <div class="layui-collapse like-layui-collapse" lay-accordion="" style="bcommission:1px dashed #c4c4c4">
+
+        <div class="layui-collapse like-layui-collapse" lay-accordion="" style="bcommission:1px dashed #c4c4c4">
             <div class="layui-colla-item">
                 <h2 class="layui-colla-title like-layui-colla-title" style="background-color: #fff">操作提示</h2>
                 <div class="layui-colla-content layui-show">
@@ -66,7 +50,6 @@
                 </div>
             </div>
         </div>
-
         <!-- 提现汇总-->
         <div class="layui-form-item div-flex">
             <fieldset class="layui-elem-field layui-field-title">
@@ -484,23 +467,4 @@
             }
         });
     });
-
-      var scroll = document.getElementsByClassName('notice-container')[0];
-      var scrollWidth = scroll.scrollWidth;
-      console.log(scrollWidth)
-      var scrollLeft = scroll.scrollLeft;
-      console.log(scrollLeft)
-
-      function animate () {
-          if ( scroll.scrollLeft>=scrollWidth) {
-              scroll.scrollLeft = 0;
-          } else {
-              scroll.scrollLeft += 1;
-          }
-          requestAnimationFrame(animate);
-      }
-      if(scroll.offsetWidth<scrollWidth){
-          document.getElementsByClassName('scroll')[0].style.transform='translateX(100%)'
-          requestAnimationFrame(animate);
-      }
 </script>
diff --git a/app/admin/view/footprint/edit.html b/app/admin/view/footprint/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/footprint/index.html b/app/admin/view/footprint/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/freight/config.html b/app/admin/view/freight/config.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/freight/express.html b/app/admin/view/freight/express.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/freight/index.html b/app/admin/view/freight/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/brand/add.html b/app/admin/view/goods/brand/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/brand/edit.html b/app/admin/view/goods/brand/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/brand/lists.html b/app/admin/view/goods/brand/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/category/add.html b/app/admin/view/goods/category/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/category/edit.html b/app/admin/view/goods/category/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/category/lists.html b/app/admin/view/goods/category/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/column/add.html b/app/admin/view/goods/column/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/column/edit.html b/app/admin/view/goods/column/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/column/lists.html b/app/admin/view/goods/column/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/comment/lists.html b/app/admin/view/goods/comment/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/goods/add.html b/app/admin/view/goods/goods/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/goods/audit.html b/app/admin/view/goods/goods/audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/goods/goods_base.html b/app/admin/view/goods/goods/goods_base.html
old mode 100644
new mode 100755
index 55b453db..3109422b
--- a/app/admin/view/goods/goods/goods_base.html
+++ b/app/admin/view/goods/goods/goods_base.html
@@ -35,6 +35,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label"><span class="form-label-asterisk">*</span>平台分类：</label>
                 <div class="layui-input-inline">
+                     
                     <select disabled name="first_cate_id" lay-filter="first_category" lay-verify="custom_required"
                             lay-verType="tips" switch-tab="0" verify-msg="请选择分类">
                         <option value="">请选择分类</option>
diff --git a/app/admin/view/goods/goods/goods_content.html b/app/admin/view/goods/goods/goods_content.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/goods/goods_distribution.html b/app/admin/view/goods/goods/goods_distribution.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/goods/goods_sale_setting.html b/app/admin/view/goods/goods/goods_sale_setting.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/goods/goods_spec.html b/app/admin/view/goods/goods/goods_spec.html
old mode 100644
new mode 100755
index 30c2a34e..0abe35e5
--- a/app/admin/view/goods/goods/goods_spec.html
+++ b/app/admin/view/goods/goods/goods_spec.html
@@ -38,7 +38,6 @@
                             <th><span class="form-label-asterisk">*</span>市场价(元)</th>
                             <th><span class="form-label-asterisk">*</span>价格(元)</th>
                             <th><span class="form-label-asterisk">*</span>成本价(元)</th>
-                            <th><span class="form-label-asterisk">*</span>批发价(元)</th>
                             <th><span class="form-label-asterisk">*</span>库存</th>
                             <th><span class="form-label-asterisk">*</span>重量(kg)</th>
                             <th><span class="form-label-asterisk">*</span>体积(m3)</th>
@@ -67,13 +66,6 @@
                                        lay-verType="tips"
                                        autocomplete="off" switch-tab="1" verify-msg="请输入成本价"
                                        name="one_chengben_price"></td>
-                            <td><input type="number" class="layui-input"
-                                       lay-verify="one_wholesale_price|one_wholesale_price"
-                                       lay-verType="tips"
-                                       autocomplete="off" switch-tab="1" verify-msg="请输入批发价"
-                                       name="one_chengben_price">
-                                        <input type="text" placeholder="请输入批发件数" />
-                            </td>
                             <td><input type="number" class="layui-input" lay-verify="one_spec_required|one_stock"
                                        lay-verType="tips"
                                        autocomplete="off" switch-tab="1" verify-msg="请输入库存" name="one_stock">
@@ -166,7 +158,6 @@
         <th><span class="form-label-asterisk">*</span>市场价(元)</th>
         <th><span class="form-label-asterisk">*</span>价格(元)</th>
         <th><span class="form-label-asterisk">*</span>成本价(元)</th>
-        <th><span class="form-label-asterisk">*</span>批发价(元)</th>
         <th><span class="form-label-asterisk">*</span>库存</th>
         <th><span class="form-label-asterisk">*</span>重量(kg)</th>
         <th><span class="form-label-asterisk">*</span>体积(m3)</th>
@@ -188,8 +179,6 @@
                autocomplete="off" switch-tab="1" verify-msg="请输入价格" name="price[]"></td>
     <td><input type="number" class="layui-input" lay-verify="more_spec_required|more_chengben_price" lay-verType="tips"
                autocomplete="off" switch-tab="1" verify-msg="请输入成本价" name="chengben_price[]"></td>
-    <td><input type="number" class="layui-input" lay-verify="more_spec_required|more_wholesale_price" lay-verType="tips"
-               autocomplete="off" switch-tab="1" verify-msg="请输入批发价" name="wholesale_price[]"></td>
     <td><input type="number" class="layui-input" lay-verify="more_spec_required|more_stock" lay-verType="tips"
                autocomplete="off" switch-tab="1" verify-msg="请输入库存" name="stock[]"></td>
     <td><input type="number" class="layui-input" lay-verify="more_spec_required|more_weight" lay-verType="tips"
diff --git a/app/admin/view/goods/goods/lists.html b/app/admin/view/goods/goods/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/goods/more_audit.html b/app/admin/view/goods/goods/more_audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/goods/more_lower.html b/app/admin/view/goods/goods/more_lower.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/goods/re_audit.html b/app/admin/view/goods/goods/re_audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/goods/set_info.html b/app/admin/view/goods/goods/set_info.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/price/lists.html b/app/admin/view/goods/price/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/unit/add.html b/app/admin/view/goods/unit/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/unit/edit.html b/app/admin/view/goods/unit/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/goods/unit/lists.html b/app/admin/view/goods/unit/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/hot_list/add.html b/app/admin/view/hot_list/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/hot_list/audit.html b/app/admin/view/hot_list/audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/hot_list/goods.html b/app/admin/view/hot_list/goods.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/hot_list/lists.html b/app/admin/view/hot_list/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/index/index.html b/app/admin/view/index/index.html
old mode 100644
new mode 100755
index 6915082d..1406b85a
--- a/app/admin/view/index/index.html
+++ b/app/admin/view/index/index.html
@@ -12,143 +12,143 @@
     <script src="__PUBLIC__/static/admin/js/app.js"></script>
 </head>
 <body>
-<!-- 头部区域 -->
-<div class="layui-header">
-    <ul class="layui-nav layui-layout-left">
-        <li class="layui-nav-item">
-            <a class="refresh" href="javascript:" title="刷新">
-                <i class="layui-icon layui-icon-refresh-3"></i>
-            </a>
-        </li>
-    </ul>
-    <ul class="layui-nav layui-layout-right">
-        <li class="layui-nav-item layui-hide-xs">
-            <a class="lock" href="javascript:">
-                <i class="layui-icon layui-icon-notice" title="通知"></i>
-                {if condition="$unaudited['localStoreCount'] >= 1 or $unaudited['distributionMemberCount'] >= 1"}
-                <span class="layui-badge-dot header-dot"></span>
-                {/if}
-            </a>
-            <dl class="layui-nav-child layui-anim layui-anim-upbit userinfo">
-                <dd><a href="javascript:;">您有<span class="localStoreCount">{$unaudited['localStoreCount']}</span>条本地生活商家代审核</a></dd>
-                <dd><a href="javascript:;">您有<span class="distributionMemberCount">{$unaudited['distributionMemberCount']}</span>条分销推广代审核</a></dd>
-            </dl>
-        </li>
-        <li class="layui-nav-item layui-hide-xs">
-            <a class="fullscreen" href="javascript:">
-                <i class="layui-icon layui-icon-screen-full"></i>
-            </a>
-        </li>
-        <li class="layui-nav-item">
-            <a href="javascript:">
-                <cite>{$admin_name}（{$role_name}）</cite>
+    <!-- 头部区域 -->
+    <div class="layui-header">
+        <ul class="layui-nav layui-layout-left">
+            <li class="layui-nav-item">
+                <a class="refresh" href="javascript:" title="刷新">
+                   <i class="layui-icon layui-icon-refresh-3"></i>
+                </a>
+            </li>
+        </ul>
+        <ul class="layui-nav layui-layout-right">
+            <li class="layui-nav-item layui-hide-xs">
+                <a class="lock" href="javascript:">
+                    <i class="layui-icon layui-icon-notice" title="通知"></i>
+                    {if condition="$unaudited['localStoreCount'] >= 1 or $unaudited['distributionMemberCount'] >= 1"}
+                    <span class="layui-badge-dot header-dot"></span>
+                    {/if}
+                </a>
+                <dl class="layui-nav-child layui-anim layui-anim-upbit userinfo">
+                    <dd><a href="javascript:;">您有<span class="localStoreCount">{$unaudited['localStoreCount']}</span>条本地生活商家代审核</a></dd>
+                    <dd><a href="javascript:;">您有<span class="distributionMemberCount">{$unaudited['distributionMemberCount']}</span>条分销推广代审核</a></dd>
+                </dl>
+            </li>
+            <li class="layui-nav-item layui-hide-xs">
+                <a class="fullscreen" href="javascript:">
+                    <i class="layui-icon layui-icon-screen-full"></i>
+                </a>
+            </li>
+            <li class="layui-nav-item">
+                <a href="javascript:">
+                    <cite>{$admin_name}（{$role_name}）</cite>
                 <span class="layui-nav-more"></span></a>
-            <dl class="layui-nav-child layui-anim layui-anim-upbit userinfo">
-                <!--                    <dd><a lay-id="u-1" href="javascript:" data-url="pages/member/procurement.html">个人中心<span class="layui-badge-dot"></span></a></dd>-->
-                <!--                    <dd><hr></dd>-->
-                <dd><a href="{:url('login/logout')}" id="logout">退出登录</a></dd>
-            </dl>
-        </li>
-    </ul>
-</div>
-
-<!-- 菜单区域 -->
-<div class="layui-sidebar ">
-    <div class="layui-logo">
-        <img style="height:20px;width: 77px" src="{$storageUrl}{$config.backstage_logo}">
-    </div>
-    <ul class="layui-side-menu">
-        {volist name="menu" id="vo"}
-        <li>
-            {empty name="vo.sub"}
-            <a lay-id="{$vo.id}" lay-href="{:url($vo.uri)}" class="active">
-                <i class="layui-icon {$vo.icon}"></i>
-                <cite>{$vo.name}</cite>
-            </a>
-            {else/}
-            <a href="javascript:">
-                <i class="layui-icon {$vo.icon}"></i>
-                <cite>{$vo.name}</cite>
-            </a>
-
-            <dl class="child-menu">
-                <dt><strong>{$vo.name}</strong></dt>
-                {volist name="vo.sub" id="second"}
-                <dd>
-                    {empty name="second.sub"}
-                    <a lay-id="{$second.id}" lay-href="{:url($second.uri)}">{$second.name}</a>
-                    {else /}
-                    <a class="child-menu-title">
-                        <i class="layui-icon layui-icon-triangle-d"></i>
-                        <cite>{$second.name}</cite>
-                    </a>
-                    <dl>
-                        {volist name="second.sub" id="third"}
-                        <dd><a lay-id="{$third.id}" lay-href="{:url($third.uri)}">{$third.name}</a></dd>
-                        {/volist}
-                    </dl>
-                    {/empty}
-                </dd>
-                {/volist}
-            </dl>
-            {/empty}
-        </li>
-        {/volist}
-    </ul>
-</div>
-
-<!-- 标签区域 -->
-<div class="lay-pagetabs" id="LAY_app_tabs">
-    <div class="layui-icon lay-tabs-control layui-icon-prev" lay-event="leftPage"></div>
-    <div class="layui-icon lay-tabs-control layui-icon-next" lay-event="rightPage"></div>
-    <div class="layui-icon lay-tabs-control layui-icon-down">
-        <ul class="layui-nav lay-tabs-select" lay-filter="lay-pagetabs-nav">
-            <li class="layui-nav-item" lay-unselect>
-                <a href="javascript:"><span class="layui-nav-more"></span></a>
-                <dl class="layui-nav-child layui-anim-fadein11 ">
-                    <dd lay-event="closeThisTabs"><a href="javascript:">关闭当前标签页</a></dd>
-                    <dd lay-event="closeOtherTabs"><a href="javascript:">关闭其它标签页</a></dd>
-                    <dd lay-event="closeAllTabs"><a href="javascript:">关闭全部标签页</a></dd>
+                <dl class="layui-nav-child layui-anim layui-anim-upbit userinfo">
+<!--                    <dd><a lay-id="u-1" href="javascript:" data-url="pages/member/user.html">个人中心<span class="layui-badge-dot"></span></a></dd>-->
+<!--                    <dd><hr></dd>-->
+                    <dd><a href="{:url('login/logout')}" id="logout">退出登录</a></dd>
                 </dl>
             </li>
         </ul>
     </div>
-    <div class="layui-tab" lay-unauto lay-allowclose="true" lay-filter="lay-layout-tabs" id="lay-layout-tabs ul">
-        <ul class="layui-tab-title" id="LAY_app_tabsheader">
-            <li lay-id="0" lay-attr="{:url('index/stat')}" class="layui-this">工作台<i
-                    class="layui-icon layui-tab-close">ဆ</i></li>
 
+    <!-- 菜单区域 -->
+    <div class="layui-sidebar ">
+        <div class="layui-logo">
+            <img style="height:20px;width: 77px" src="{$storageUrl}{$config.backstage_logo}">
+        </div>
+        <ul class="layui-side-menu">
+            {volist name="menu" id="vo"}
+                <li>
+                    {empty name="vo.sub"}
+                        <a lay-id="{$vo.id}" lay-href="{:url($vo.uri)}" class="active">
+                            <i class="layui-icon {$vo.icon}"></i>
+                            <cite>{$vo.name}</cite>
+                        </a>
+                    {else/}
+                        <a href="javascript:">
+                            <i class="layui-icon {$vo.icon}"></i>
+                            <cite>{$vo.name}</cite>
+                        </a>
+
+                        <dl class="child-menu">
+                            <dt><strong>{$vo.name}</strong></dt>
+                            {volist name="vo.sub" id="second"}
+                                <dd>
+                                    {empty name="second.sub"}
+                                        <a lay-id="{$second.id}" lay-href="{:url($second.uri)}">{$second.name}</a>
+                                    {else /}
+                                        <a class="child-menu-title">
+                                            <i class="layui-icon layui-icon-triangle-d"></i>
+                                            <cite>{$second.name}</cite>
+                                        </a>
+                                        <dl>
+                                            {volist name="second.sub" id="third"}
+                                            <dd><a lay-id="{$third.id}" lay-href="{:url($third.uri)}">{$third.name}</a></dd>
+                                            {/volist}
+                                        </dl>
+                                    {/empty}
+                                </dd>
+                            {/volist}
+                        </dl>
+                    {/empty}
+                </li>
+            {/volist}
         </ul>
     </div>
-</div>
 
-<!-- 主体区域 -->
-<div class="layui-body" id="LAY_app_body">
-    <div lay-id="0" class="lay-tabsbody-item layui-show">
-        <iframe src="{:url('index/stat')}" class="lay-iframe" name="view_frame"></iframe>
+    <!-- 标签区域 -->
+    <div class="lay-pagetabs" id="LAY_app_tabs">
+        <div class="layui-icon lay-tabs-control layui-icon-prev" lay-event="leftPage"></div>
+        <div class="layui-icon lay-tabs-control layui-icon-next" lay-event="rightPage"></div>
+        <div class="layui-icon lay-tabs-control layui-icon-down">
+            <ul class="layui-nav lay-tabs-select" lay-filter="lay-pagetabs-nav">
+                <li class="layui-nav-item" lay-unselect>
+                    <a href="javascript:"><span class="layui-nav-more"></span></a>
+                    <dl class="layui-nav-child layui-anim-fadein11 ">
+                        <dd lay-event="closeThisTabs"><a href="javascript:">关闭当前标签页</a></dd>
+                        <dd lay-event="closeOtherTabs"><a href="javascript:">关闭其它标签页</a></dd>
+                        <dd lay-event="closeAllTabs"><a href="javascript:">关闭全部标签页</a></dd>
+                    </dl>
+                </li>
+            </ul>
+        </div>
+        <div class="layui-tab" lay-unauto lay-allowclose="true" lay-filter="lay-layout-tabs" id="lay-layout-tabs ul">
+            <ul class="layui-tab-title" id="LAY_app_tabsheader">
+                <li lay-id="0" lay-attr="{:url('index/stat')}" class="layui-this">工作台<i class="layui-icon layui-tab-close">ဆ</i></li>
+                
+            </ul>
+        </div>
+    </div>
+
+    <!-- 主体区域 -->
+    <div class="layui-body" id="LAY_app_body">
+        <div lay-id="0" class="lay-tabsbody-item layui-show">
+            <iframe src="{:url('index/stat')}" class="lay-iframe" name="view_frame"></iframe>
+        </div>
     </div>
-</div>
 <script src="__PUBLIC__/static/admin/js/jquery.min.js"></script>
 <script>
-    function refreshHighlight(url, id) {
-        console.log(url);
+   function refreshHighlight(url,id) {
+       console.log(url);
         $ = layui.jquery;
 
         $(".layui-nav[lay-filter='lay-pagetabs-nav'] a").each(function (ind, val) {
-            if ($(this).attr('href') === url) {
+            if($(this).attr('href') === url){
                 $('.layui-nav dd').removeClass('layui-this');
 
                 $(this).parent('dd').addClass('layui-this');
-                console.log(id);
+            console.log(id);
 
-            } else {
-                var html = '<li lay-id="' + id + '" lay-attr="' + url + '" class="layui-this">工作台2<i class="layui-icon layui-tab-close">ဆ</i></li>';
+            }else{
+                var html = '<li lay-id="'+id+'" lay-attr="'+url+'" class="layui-this">工作台2<i class="layui-icon layui-tab-close">ဆ</i></li>';
                 $('.lay-layout-tabs ul').append(html);
-                console.log(html);
+            console.log(html);
             }
         })
-    }
 
+    }
+    
     let Common = {
         notify_msg() {
             $.ajax({
@@ -175,6 +175,7 @@
             Common.notify_msg()
         }, 5000)
     }
+
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/app/admin/view/index/stat.html b/app/admin/view/index/stat.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/integral/integral_goods/add.html b/app/admin/view/integral/integral_goods/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/integral/integral_goods/edit.html b/app/admin/view/integral/integral_goods/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/integral/integral_goods/lists.html b/app/admin/view/integral/integral_goods/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/integral/integral_order/delivery.html b/app/admin/view/integral/integral_order/delivery.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/integral/integral_order/detail.html b/app/admin/view/integral/integral_order/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/integral/integral_order/express.html b/app/admin/view/integral/integral_order/express.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/integral/integral_order/lists.html b/app/admin/view/integral/integral_order/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/kefu/kefu/add.html b/app/admin/view/kefu/kefu/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/kefu/kefu/admin_lists.html b/app/admin/view/kefu/kefu/admin_lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/kefu/kefu/edit.html b/app/admin/view/kefu/kefu/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/kefu/kefu/lists.html b/app/admin/view/kefu/kefu/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/kefu/kefu_lang/add.html b/app/admin/view/kefu/kefu_lang/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/kefu/kefu_lang/edit.html b/app/admin/view/kefu/kefu_lang/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/kefu/kefu_lang/lists.html b/app/admin/view/kefu/kefu_lang/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/layout1.html b/app/admin/view/layout1.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/layout2.html b/app/admin/view/layout2.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/live/live_goods/audit.html b/app/admin/view/live/live_goods/audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/live/live_goods/detail.html b/app/admin/view/live/live_goods/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/live/live_goods/lists.html b/app/admin/view/live/live_goods/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/live/live_room/audit.html b/app/admin/view/live/live_room/audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/live/live_room/detail.html b/app/admin/view/live/live_room/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/live/live_room/lists.html b/app/admin/view/live/live_room/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/live/live_room/recommend.html b/app/admin/view/live/live_room/recommend.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/login/login.html b/app/admin/view/login/login.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/mall_news/add.html b/app/admin/view/mall_news/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/mall_news/audit.html b/app/admin/view/mall_news/audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/mall_news/goods.html b/app/admin/view/mall_news/goods.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/mall_news/lists.html b/app/admin/view/mall_news/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/new_goods/add.html b/app/admin/view/new_goods/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/new_goods/audit.html b/app/admin/view/new_goods/audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/new_goods/goods.html b/app/admin/view/new_goods/goods.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/new_goods/lists.html b/app/admin/view/new_goods/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/order/invoice/detail.html b/app/admin/view/order/invoice/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/order/invoice/lists.html b/app/admin/view/order/invoice/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/order/jicai/delivery.html b/app/admin/view/order/jicai/delivery.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/order/jicai/detail.html b/app/admin/view/order/jicai/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/order/jicai/express.html b/app/admin/view/order/jicai/express.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/order/jicai/lists.html b/app/admin/view/order/jicai/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/order/order/delivery.html b/app/admin/view/order/order/delivery.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/order/order/detail.html b/app/admin/view/order/order/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/order/order/express.html b/app/admin/view/order/order/express.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/order/order/lists.html b/app/admin/view/order/order/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/procurement/procurement/info.html b/app/admin/view/procurement/procurement/info.html
old mode 100644
new mode 100755
index fd8e8ce6..01b2c83f
--- a/app/admin/view/procurement/procurement/info.html
+++ b/app/admin/view/procurement/procurement/info.html
@@ -55,12 +55,12 @@
             </label>
         </div>
     </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">现居地址：</label>
-        <div class="layui-input-inline">
-            <label class="layui-form-mid">{$detail.u_address}</label>
-        </div>
-    </div>
+    <!--<div class="layui-form-item">-->
+    <!--    <label class="layui-form-label">现居地址：</label>-->
+    <!--    <div class="layui-input-inline">-->
+    <!--        <label class="layui-form-mid">{$detail.u_address}</label>-->
+    <!--    </div>-->
+    <!--</div>-->
     <div class="layui-form-item">
         <label class="layui-form-label">所在地区：</label>
         <div class="layui-input-inline">
@@ -92,7 +92,7 @@
         let layer = layui.layer;
         $(document).on('click', '.image-show', function () {
             var src = $(this).attr('src');
-            like.showImg(src,600);
+            like.showImg(src,500);
         });
         // 查看推荐下级
         $('#showFans').click(function() {
diff --git a/app/admin/view/procurement/procurement/lists.html b/app/admin/view/procurement/procurement/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/procurement/procurement/wprice.html b/app/admin/view/procurement/procurement/wprice.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/procurement/treaty/index.html b/app/admin/view/procurement/treaty/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/recharge/add.html b/app/admin/view/recharge/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/recharge/edit.html b/app/admin/view/recharge/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/recharge/lists.html b/app/admin/view/recharge/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/role/add.html b/app/admin/view/role/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/role/edit.html b/app/admin/view/role/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/role/lists.html b/app/admin/view/role/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/seckill/seckill_goods/audit.html b/app/admin/view/seckill/seckill_goods/audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/seckill/seckill_goods/edit_goods.html b/app/admin/view/seckill/seckill_goods/edit_goods.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/seckill/seckill_goods/lists.html b/app/admin/view/seckill/seckill_goods/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/seckill/seckill_goods/re_audit.html b/app/admin/view/seckill/seckill_goods/re_audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/seckill/seckill_time/add_time.html b/app/admin/view/seckill/seckill_time/add_time.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/seckill/seckill_time/edit_time.html b/app/admin/view/seckill/seckill_time/edit_time.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/seckill/seckill_time/lists.html b/app/admin/view/seckill/seckill_time/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/basic/app.html b/app/admin/view/setting/basic/app.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/basic/copyright.html b/app/admin/view/setting/basic/copyright.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/basic/policy.html b/app/admin/view/setting/basic/policy.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/basic/share.html b/app/admin/view/setting/basic/share.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/basic/website.html b/app/admin/view/setting/basic/website.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/basic/website_base.html b/app/admin/view/setting/basic/website_base.html
old mode 100644
new mode 100755
index a008ccd8..5fc7ae83
--- a/app/admin/view/setting/basic/website_base.html
+++ b/app/admin/view/setting/basic/website_base.html
@@ -11,7 +11,7 @@
             </div>
         </div>
     </div>
-
+    
     <!--小程序版本公告-->
     <div class="layui-form-item">
         <label class="layui-form-label">小程序版本公告：</label>
diff --git a/app/admin/view/setting/basic/website_platform.html b/app/admin/view/setting/basic/website_platform.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/basic/website_shop.html b/app/admin/view/setting/basic/website_shop.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/basic/withdraw.html b/app/admin/view/setting/basic/withdraw.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/customer_service/index.html b/app/admin/view/setting/customer_service/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/hot_search/index.html b/app/admin/view/setting/hot_search/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/map/config.html b/app/admin/view/setting/map/config.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/marketing_config/order_award.html b/app/admin/view/setting/marketing_config/order_award.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/notice_setting/index.html b/app/admin/view/setting/notice_setting/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/notice_setting/record.html b/app/admin/view/setting/notice_setting/record.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/notice_setting/set_mnp.html b/app/admin/view/setting/notice_setting/set_mnp.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/notice_setting/set_oa.html b/app/admin/view/setting/notice_setting/set_oa.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/notice_setting/set_sms.html b/app/admin/view/setting/notice_setting/set_sms.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/notice_setting/set_system.html b/app/admin/view/setting/notice_setting/set_system.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/pay_config/edit_alipay.html b/app/admin/view/setting/pay_config/edit_alipay.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/pay_config/edit_balance.html b/app/admin/view/setting/pay_config/edit_balance.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/pay_config/edit_wechat.html b/app/admin/view/setting/pay_config/edit_wechat.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/pay_config/edit_xinypay.html b/app/admin/view/setting/pay_config/edit_xinypay.html
old mode 100644
new mode 100755
index 80ebbd8b..693840ae
--- a/app/admin/view/setting/pay_config/edit_xinypay.html
+++ b/app/admin/view/setting/pay_config/edit_xinypay.html
@@ -153,8 +153,8 @@
                     //==========================================上传证书start=========================================================
 
 
-                    like.certUpload('.cert-add', '{:url("file/other")}?local=1&sub_dir=cert', '{$storageUrl}');
-                    like.certUpload('.key-add', '{:url("file/other")}?local=1&sub_dir=cert', '{$storageUrl}');
+        like.certUpload('.cert-add', '{:url("file/other")}?local=1&sub_dir=cert', '{$storageUrl}');
+        like.certUpload('.key-add', '{:url("file/other")}?local=1&sub_dir=cert', '{$storageUrl}');
 
                     //==========================================上传证书end===========================================================
         //  删除按钮的显示与隐藏
diff --git a/app/admin/view/setting/pay_config/lists.html b/app/admin/view/setting/pay_config/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/register/index.html b/app/admin/view/setting/register/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/shop_withdrawal/index.html b/app/admin/view/setting/shop_withdrawal/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/sms/config.html b/app/admin/view/setting/sms/config.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/sms/detail.html b/app/admin/view/setting/sms/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/sms/lists.html b/app/admin/view/setting/sms/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/storage_config/edit.html b/app/admin/view/setting/storage_config/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/storage_config/lists.html b/app/admin/view/setting/storage_config/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/transaction/index.html b/app/admin/view/setting/transaction/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/setting/user/index.html b/app/admin/view/setting/user/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/shop/apply/audit.html b/app/admin/view/shop/apply/audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/shop/apply/detail.html b/app/admin/view/shop/apply/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/shop/apply/lists.html b/app/admin/view/shop/apply/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/shop/auth/add.html b/app/admin/view/shop/auth/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/shop/auth/edit.html b/app/admin/view/shop/auth/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/shop/auth/lists.html b/app/admin/view/shop/auth/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/shop/category/add.html b/app/admin/view/shop/category/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/shop/category/edit.html b/app/admin/view/shop/category/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/shop/category/lists.html b/app/admin/view/shop/category/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/shop/local_store/add.html b/app/admin/view/shop/local_store/add.html
old mode 100644
new mode 100755
index fddce8e7..7aba24a0
--- a/app/admin/view/shop/local_store/add.html
+++ b/app/admin/view/shop/local_store/add.html
@@ -244,8 +244,6 @@
             $('.layui-tab-content .layui-tab-item').eq(number).addClass('layui-show');
         }
 
-
-
         likeArea.init(
             "province", "city", "district", "province_id", "city_id", "district_id",
             "", "", ""
diff --git a/app/admin/view/shop/local_store/edit.html b/app/admin/view/shop/local_store/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/shop/local_store/lists.html b/app/admin/view/shop/local_store/lists.html
old mode 100644
new mode 100755
index 9db1f65b..20b7cdb0
--- a/app/admin/view/shop/local_store/lists.html
+++ b/app/admin/view/shop/local_store/lists.html
@@ -62,6 +62,7 @@
             </script>
 
             <script type="text/html" id="localstore-operation">
+                <a class="layui-btn layui-btn-info layui-btn-sm" lay-event="download">下载二维码</a>
                 <a class="layui-btn layui-btn-normal layui-btn-sm" lay-event="edit">编辑</a>
                 <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="del">删除</a>
             </script>
@@ -162,7 +163,7 @@
                 });
             },
             del: function (obj) {
-                layer.confirm("确定删除该条数据吗？", function (index) {
+                layer.confirm("是否删除? ", function (index) {
                     like.ajax({
                         url: "{:url('shop.LocalStore/del')}",
                         data: {id: obj.data.lstore_id},
@@ -177,6 +178,18 @@
                     });
                     layer.close(index);
                 })
+            },
+            download: function(obj) {
+                like.ajax({
+                    url: "{:url('shop.LocalStore/downloadErCode')}",
+                    data: obj.data,
+                    type: "POST",
+                    success:function(res) {
+                        if(res.code == 1) {
+                            window.location.href = res.data.url;
+                        }
+                    }
+                });
             }
         };
         like.eventClick(active);
diff --git a/app/admin/view/shop/local_store/order.html b/app/admin/view/shop/local_store/order.html
old mode 100644
new mode 100755
index 6f6bd908..9e129ae5
--- a/app/admin/view/shop/local_store/order.html
+++ b/app/admin/view/shop/local_store/order.html
@@ -25,10 +25,6 @@
             </div>
 
             <table id="like-table-lists" lay-filter="like-table-lists"></table>
-
-            <script type="text/html" id="table-operation">
-                <a class="layui-btn layui-btn-normal layui-btn-sm" lay-event="download">下载二维码</a>
-            </script>
         </div>
     </div>
 </div>
@@ -48,39 +44,8 @@
             , {field: "tips", width: 300, align: "center", title: "交易附言"}
             , {field: "notes", width: 300, align: "center", title: "备注"}
             , {field: "create_time", width: 300, align: "center", title: "创建时间"}
-            ,{title:"操作", width:200, align:"center", fixed:"right", toolbar:"#table-operation"}
         ]);
 
-        var active = {
-            download: function(obj) {
-                like.ajax({
-                    url: "{:url('shop.LocalStore/downloadErCode')}",
-                    data: obj.data,
-                    type: "POST",
-                    success:function(res) {
-                        if(res.code == 1) {
-                            console.log(res.data.url)
-                            // console.log(123)
-                            // const image = new Image()
-                            // image.src = res.data.pay_image;
-                            // image.onload = function () {
-                            //     const link = document.createElement('a')
-                            //     link.style.display = 'none'
-                            //     document.body.appendChild(link)
-                            //
-                            //     link.setAttribute('download', 'erCode.jpg')
-                            //     link.setAttribute('href', res.data.pay_image)
-                            //
-                            //     link.click()
-                            // }
-                            window.location.href = res.data.url;
-                        }
-                    }
-                });
-            },
-        };
-        like.eventClick(active);
-
         // 导出
         form.on('submit(data-export)', function (data) {
             var field = data.field;
diff --git a/app/admin/view/shop/store/account.html b/app/admin/view/shop/store/account.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/shop/store/add.html b/app/admin/view/shop/store/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/shop/store/adjust_first_leader.html b/app/admin/view/shop/store/adjust_first_leader.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/shop/store/edit.html b/app/admin/view/shop/store/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/shop/store/lists.html b/app/admin/view/shop/store/lists.html
old mode 100644
new mode 100755
index 23d01ae3..5facb365
--- a/app/admin/view/shop/store/lists.html
+++ b/app/admin/view/shop/store/lists.html
@@ -168,7 +168,7 @@
             ,{field:"account", width:100, align:"center",title:"商家账号"}
             ,{field:"category", width:100, align:"center", title:"主营类目"}
             ,{field:"is_run", width:90, align:"center", title:"营业状态"}
-            ,{field:"nickname", width:90, align:"center", title:"推荐人"}
+              ,{field:"nickname", width:90, align:"center", title:"推荐人"}
             ,{field:"is_freeze", width:90, align:"center", title:"商家状态"}
             ,{field:"is_recommend", width:90, align:"center", title:"推荐商家"}
             ,{field:"create_time", width:160, align:"center", title:"开通日期"}
@@ -306,12 +306,12 @@
                     }
                 });
             },
-            adjust_first_leader: function(obj) {
+             adjust_first_leader: function(obj) {
             var id = obj.data.id;
             layer.open({
                 type: 2
                 ,title: '推荐人调整'
-                ,content: '{:url("shop.store/adjustFirstLeader")}?id='+ id
+                ,content: '{:url("shop.Store/adjustFirstLeader")}?id='+ id
                 ,area: ['90%', '90%']
                 ,btn: ['确定', '取消']
                 ,yes: function(index, layero){
@@ -321,7 +321,7 @@
                     iframeWindow.layui.form.on('submit(formSubmit)', function(data){
                         var field = data.field;
                         $.ajax({
-                            url:'{:url("shop.store/adjustFirstLeader")}',
+                            url:'{:url("shop.Store/adjustFirstLeader")}',
                             data:field,
                             type:"post",
                             success:function(res)
diff --git a/app/admin/view/shop/store/set.html b/app/admin/view/shop/store/set.html
old mode 100644
new mode 100755
index bd5e5826..520c3d6d
--- a/app/admin/view/shop/store/set.html
+++ b/app/admin/view/shop/store/set.html
@@ -39,8 +39,8 @@
                 <div class="layui-form-mid layui-word-aux" style="white-space:nowrap;">商品排序权重，数字越小排序越前，权重越大</div>
             </div>
         </div>
-
-        <a class="layui-btn layui-btn-normal layui-btn-sm"  id="adjust_first_leader" lay-event="adjust_first_leader">推荐人调整</a>
+        <!--<a class="layui-btn layui-btn-normal layui-btn-sm"  id="adjust_first_leader" lay-event="adjust_first_leader">推荐人调整</a>-->
+    
     </div>
 
 
diff --git a/app/admin/view/shop/treaty/index.html b/app/admin/view/shop/treaty/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/sign_daily/add.html b/app/admin/view/sign_daily/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/sign_daily/edit.html b/app/admin/view/sign_daily/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/sign_daily/lists.html b/app/admin/view/sign_daily/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/statistics/goods.html b/app/admin/view/statistics/goods.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/statistics/member.html b/app/admin/view/statistics/member.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/statistics/shop.html b/app/admin/view/statistics/shop.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/statistics/trading.html b/app/admin/view/statistics/trading.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/statistics/visit.html b/app/admin/view/statistics/visit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/system/cache/cache.html b/app/admin/view/system/cache/cache.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/system/crontab/add.html b/app/admin/view/system/crontab/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/system/crontab/edit.html b/app/admin/view/system/crontab/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/system/crontab/lists.html b/app/admin/view/system/crontab/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/system/log/lists.html b/app/admin/view/system/log/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/system/upgrade/choose_page.html b/app/admin/view/system/upgrade/choose_page.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/system/upgrade/index.html b/app/admin/view/system/upgrade/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/team/activity/audit.html b/app/admin/view/team/activity/audit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/team/activity/details.html b/app/admin/view/team/activity/details.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/team/activity/lists.html b/app/admin/view/team/activity/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/team/activity/record.html b/app/admin/view/team/activity/record.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/team/found/detail.html b/app/admin/view/team/found/detail.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/team/found/lists.html b/app/admin/view/team/found/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/team/setting/index.html b/app/admin/view/team/setting/index.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/user/gzuser/lists.html b/app/admin/view/user/gzuser/lists.html
old mode 100644
new mode 100755
index 4736e559..7e73c614
--- a/app/admin/view/user/gzuser/lists.html
+++ b/app/admin/view/user/gzuser/lists.html
@@ -47,7 +47,8 @@
 
         <div class="layui-card-body">
             <div style="padding-bottom: 10px;">
-                   <button class="layui-btn layui-btn-sm layuiadmin-btn-user {$view_theme_color}" data-type="set_tag">设置会员标签</button>
+<!--                <button class="layui-btn layui-btn-sm layuiadmin-btn-procurement {$view_theme_color}" data-type="send_coupon">发放优惠券</button>-->
+                <button class="layui-btn layui-btn-sm layuiadmin-btn-user {$view_theme_color}" data-type="set_tag">设置会员标签</button>
             </div>
 
             <table id="user-lists" lay-filter="user-lists"></table>
@@ -105,12 +106,27 @@
                 }
             });
         });
+        //日期时间范围
+        laydate.render({
+            elem: '#start_time'
+            ,type: 'datetime'
+            ,trigger: 'click'
+        });
+
+        //日期时间范围
+        laydate.render({
+            elem: '#end_time'
+            ,type: 'datetime'
+            ,trigger: 'click'
+        });
 
         //清空查询
         form.on('submit(user-clear-search)', function(){
             $('#keyword_type').val('sn');
             $('#keyword').val('');  //清空输入框
             $('#gzhuser_state').val('');  //清空禁用状态
+            $('#start_time').val('');  //清空输入框
+            $('#end_time').val('');  //清空输入框
             form.render('select');
             //刷新列表
             table.reload('user-lists', {
diff --git a/app/admin/view/user/level/add.html b/app/admin/view/user/level/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/user/level/edit.html b/app/admin/view/user/level/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/user/level/lists.html b/app/admin/view/user/level/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/user/level/set.html b/app/admin/view/user/level/set.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/user/tag/add.html b/app/admin/view/user/tag/add.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/user/tag/edit.html b/app/admin/view/user/tag/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/user/tag/lists.html b/app/admin/view/user/tag/lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/user/user/adjust_account.html b/app/admin/view/user/user/adjust_account.html
old mode 100644
new mode 100755
index 3d5262dd..75ffd907
--- a/app/admin/view/user/user/adjust_account.html
+++ b/app/admin/view/user/user/adjust_account.html
@@ -33,7 +33,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label reqRed">余额增减：</label>
                             <div class="layui-input-block">
-                                <input type="radio" name="money_handle" value="2" title="百亿补贴增加余额">
+                                 <input type="radio" name="money_handle" value="2" title="百亿补贴增加余额">
                                 <input type="radio" name="money_handle" value="1" title="增加余额">
                                 <input type="radio" name="money_handle" value="0" title="扣减余额">
                             </div>
diff --git a/app/admin/view/user/user/adjust_first_leader.html b/app/admin/view/user/user/adjust_first_leader.html
old mode 100644
new mode 100755
index 2064a5ed..08b1f31d
--- a/app/admin/view/user/user/adjust_first_leader.html
+++ b/app/admin/view/user/user/adjust_first_leader.html
@@ -51,7 +51,15 @@
             <button class="layui-btn layui-btn-sm layui-bg-blue" id="show-user">选择用户</button>
         </div>
     </div>
-
+ <!--<div class="layui-form-item">-->
+ <!--       <label class="layui-form-label">选择公司：</label>-->
+ <!--       <div class="layui-inline">-->
+ <!--           <span id="user_selected"></span>-->
+ <!--       </div>-->
+ <!--       <div class="layui-inline">-->
+ <!--           <button class="layui-btn layui-btn-sm layui-bg-blue" id="show-user">选择公司</button>-->
+ <!--       </div>-->
+ <!--   </div>-->
     <input type="hidden" value="{$user_id}" name="id">
     <input type="hidden"  name="first_id" id="first_id">
     <div class="layui-form-item layui-hide">
diff --git a/app/admin/view/user/user/adjust_level.html b/app/admin/view/user/user/adjust_level.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/user/user/edit.html b/app/admin/view/user/user/edit.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/user/user/fans.html b/app/admin/view/user/user/fans.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/user/user/info.html b/app/admin/view/user/user/info.html
old mode 100644
new mode 100755
index 2d363df6..6746058c
--- a/app/admin/view/user/user/info.html
+++ b/app/admin/view/user/user/info.html
@@ -41,10 +41,7 @@
                 <img class="image-show" src="{$detail.avatar}" width="80px" height="80px">
             </label>
         </div>
-        <label class="layui-form-label">手机号码：</label>
-        <div class="layui-input-inline">
-            <label class="layui-form-mid">{$detail.mobile}</label>
-        </div>
+      
     </div>
     <div class="layui-form-item">
         <label class="layui-form-label">用户标签：</label>
diff --git a/app/admin/view/user/user/lists.html b/app/admin/view/user/user/lists.html
old mode 100644
new mode 100755
index 901d331d..d4071dd2
--- a/app/admin/view/user/user/lists.html
+++ b/app/admin/view/user/user/lists.html
@@ -36,12 +36,7 @@
                         </select>
                     </div>
                 </div>
-                <div class="layui-inline">
-                    <label class="layui-form-label">手机号码：</label>
-                    <div class="layui-input-inline">
-                        <label class="layui-form-mid">{$item.mobile}</label>
-                    </div>
-                </div>
+                
                 <div class="layui-inline">
                     <label class="layui-form-label">会员标签：</label>
                     <div class="layui-input-inline">
@@ -110,7 +105,7 @@
 
         <div class="layui-card-body">
             <div style="padding-bottom: 10px;">
-<!--                <button class="layui-btn layui-btn-sm layuiadmin-btn-procurement {$view_theme_color}" data-type="send_coupon">发放优惠券</button>-->
+<!--                <button class="layui-btn layui-btn-sm layuiadmin-btn-user {$view_theme_color}" data-type="send_coupon">发放优惠券</button>-->
                 <button class="layui-btn layui-btn-sm layuiadmin-btn-user {$view_theme_color}" data-type="set_tag">设置会员标签</button>
             </div>
 
@@ -130,7 +125,11 @@
                     </p>
                 </div>
             </script>
-            
+             <script type="text/html" id="mobile">
+                <div class="layui-input-inline" style="text-align:left;width: 240px">
+                 {{d.mobile}}
+                </div>
+            </script>
             <script type="text/html" id="user-team">
                 <div >
                         {{# if(d.is_team){}}
@@ -388,6 +387,7 @@
                 ,{title: '用户信息',width: 370,align: 'center', templet: '#user-info'}
                 ,{field: 'level_name', title: '用户等级',width: 120,align: 'center'}
                 ,{field: 'tag_str', title: '用户标签',width: 220,align: 'center'}
+                  ,{title: '手机号码',width: 100,align: 'center',templet: '#mobile'}
                 ,{title: '是否团队',width: 100,align: 'center',templet: '#user-team'}
                 ,{field: 'user_growth', title: '成长值',width: 120,align: 'center'}
                 ,{title: '钱包信息',width: 350,align: 'center', templet: '#wallet-info'}
diff --git a/app/admin/view/user/user/set_tag.html b/app/admin/view/user/user/set_tag.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/user/user/user_lists.html b/app/admin/view/user/user/user_lists.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/wechat/hfive/set.html b/app/admin/view/wechat/hfive/set.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/wechat/mnp/set_mnp.html b/app/admin/view/wechat/mnp/set_mnp.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/wechat/oa/oamenu.html b/app/admin/view/wechat/oa/oamenu.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/wechat/oa/setoa.html b/app/admin/view/wechat/oa/setoa.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/wechat/op/config.html b/app/admin/view/wechat/op/config.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/wechat/pc/set.html b/app/admin/view/wechat/pc/set.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/wechat/reply/add_default.html b/app/admin/view/wechat/reply/add_default.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/wechat/reply/add_subscribe.html b/app/admin/view/wechat/reply/add_subscribe.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/wechat/reply/add_text.html b/app/admin/view/wechat/reply/add_text.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/wechat/reply/edit_default.html b/app/admin/view/wechat/reply/edit_default.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/wechat/reply/edit_subscribe.html b/app/admin/view/wechat/reply/edit_subscribe.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/wechat/reply/edit_text.html b/app/admin/view/wechat/reply/edit_text.html
old mode 100644
new mode 100755
diff --git a/app/admin/view/wechat/reply/lists.html b/app/admin/view/wechat/reply/lists.html
old mode 100644
new mode 100755
diff --git a/app/api/cache/TokenCache.php b/app/api/cache/TokenCache.php
old mode 100644
new mode 100755
index bc0f7c97..5cc787d9
--- a/app/api/cache/TokenCache.php
+++ b/app/api/cache/TokenCache.php
@@ -47,7 +47,7 @@ class TokenCache extends CacheBase
             ->update(['update_time' => $time, 'expire_time' => $expire_time]);
 
         //返回用户信息
-        $user_info = Db::name('procurement')->alias('u')
+        $user_info = Db::name('user')->alias('u')
             ->join('session s', 'u.id=s.user_id')
             ->where(['s.token' => $this->extend['token']])
             ->field('u.*,s.token,s.client')
diff --git a/app/api/controller/Abutment.php b/app/api/controller/Abutment.php
new file mode 100755
index 00000000..1c7cb938
--- /dev/null
+++ b/app/api/controller/Abutment.php
@@ -0,0 +1,568 @@
+<?php
+
+namespace app\api\controller;
+
+use app\common\basics\Api;
+use app\common\server\JsonServer;
+use app\common\model\user\User;
+use app\common\model\user\UserAuth;
+use IcbcConstants;
+use think\App;
+use think\Request;
+use DefaultIcbcClient;
+use UiIcbcClient;
+use think\facade\Db;
+use weixin\Getopenid;
+use app\api\logic\DistributionLogic;
+include_once "../vendor/icbc-api-sdk-cop-php/DefaultIcbcClient.php";
+include_once "../vendor/icbc-api-sdk-cop-php/UiIcbcClient.php";
+class Abutment extends Api
+{
+     public $like_not_need_login = ['payTest','payTestCheck','changeGoods','chaifen','tuikuan','jiedong','jiedongCheck'];
+    private $APP_ID = '11000000000000026359';
+    private $url = 'https://gw.open.icbc.com.cn/api/mybank/enterprise/pay/payent/V1';
+    private $PRI_KEY = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC9Soh5U2wx4YQJUaXn80cuHzmZl8p+07yUwl5jawuS88zy6lyPav32ZrsTfQQZv4uqfYCA4oT+BIQE6Segd5yd90FcGHH/vYb9b7JLZxslUGiuXuD6u9ULPt3Upgy9IROq8ghyhBFas3rfNl48Hh0L5WKADYb3Ywi/CqbSKUe4hVJ22GbrGz1eMwZxMD2yveHsmFrsNTYTiy3u+kASk479iYkVxOoobwMMv+1BsnmrAqs5uJt+LVcR2qmLJE0Gyog+CvRI2MORIcYvu8yzwkJu2gsZTVr6yl3WyKv5Mh+79dloimP6YHJWvlmpu77BUsBSofCttPAkEsWG57Rfrft3AgMBAAECggEASpxePrRLKT4itSmho1OY8u0L3yadgnAjHN+gJL/EyB+g4P7PjRg3EjBb/MqCG0QM4R6m0CZ5FUbiYq0kGXQMH5eeA5b/GDa0RqEIPgBeCs8u88wiEbKHvu8AsRjiXIn1HqRYAAtea8ni3KipbDjSaiX4NVEfqdM3V1Xze1MaGfiFgs2artnUw3ZgiUeEIJxpuqwplXsUeZBKm88XNo7mfBfBvP3VFq9HF4O6Lo01SfCn+DWQfEpiRoS7xHfPhxnkggNdr4OMzUg7DV1xTJpX5FeeakuVO4CkyRBrjIR1W6Eq7HeAsoNoPK1OdoBN4zP77H0zW7RT0D8EImfkJKgpwQKBgQDZHH+zD6gvrlReN8DBt0wUksaQ3vAIlXrBIpshPDMvFpqBMQ2SIuMWx9CGiTX4iMAtdQR7cHG2lDwnyv6wjE4lejAZ0E3eHiQJsvA41pbZzenbiilLTv92Ea2PgR8V/qXxIyafedD3Xec7BilmOm+h33ZIo4v8MFjy83FT3H9vswKBgQDfMluU5K49rdtJpRlpCFywqPac7KOpcVT2T6UYmPO1fxek+3lnhB2qFMiJWBYI30mHRglERFRWWoHdEir2eUhXY5u/kN6ncVsMHCVqslJKmBBEeHJRFl41IbwByBHAPqKIcXI5lLyQdNxmgnG3tZDBDTQPz2pdbjARMb9o3wbDLQKBgQDX7bwjvoKrSVqnihOvljmYjJHoK5HXN7OqulxHJbRSNMzdiIfSu9fXJEuEQprm4Dsh+qvGiQLPb4aUnRPJSwG9zFRimAWZz6hP7SN1pBbL8DuSGUsQlzUDnHldrDHakjVAKpGTMnheTYpX7bzm619zQuhFPkNPQlZ06yHfIgGseQKBgQCXi4enNwYflvY3sMPqDuVwhai8r+gH2o2HmFhOtTt0VlDlkmHCKXBC1U28A3UinQk9sg4ErihdYaKfSgClzX+S5m0PyvuC0XKybEHzihRZ1ZnmA6oK6JcamEchJoj28RBGeFDIS/ckVlR3vcYcqEka6y4YNgrQWUqFwjNmr1fWGQKBgQDGFD2O3/2MH068DMTskQWWoJWV1Isvst+oXBgERKkh5A/BYAAaw9kb+tKke/czulajRizv+nhstPQ2d/701QmdLCK6rK05SEChctaq7Cxk2QRRWHznYPqmJHPkuUXqg5LaOa81UDlGKDK1ylljppZOONlLtm00k6s5fLOe1SRfJg==";
+    private $APIGW_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvUqIeVNsMeGECVGl5/NHLh85mZfKftO8lMJeY2sLkvPM8upcj2r99ma7E30EGb+Lqn2AgOKE/gSEBOknoHecnfdBXBhx/72G/W+yS2cbJVBorl7g+rvVCz7d1KYMvSETqvIIcoQRWrN63zZePB4dC+VigA2G92MIvwqm0ilHuIVSdthm6xs9XjMGcTA9sr3h7Jha7DU2E4st7vpAEpOO/YmJFcTqKG8DDL/tQbJ5qwKrObibfi1XEdqpiyRNBsqIPgr0SNjDkSHGL7vMs8JCbtoLGU1a+spd1sir+TIfu/XZaIpj+mByVr5Zqbu+wVLAUqHwrbTwJBLFhue0X637dwIDAQAB";
+
+    private $signType = "RSA2";
+    private $apiClient;
+    public function __construct(\think\App $app){
+        parent::__construct($app);
+        $this->apiClient = new \DefaultIcbcClient(
+            $this->APP_ID,
+            $this->PRI_KEY,
+            $this->signType,
+            'UTF-8',
+            '',
+            $this->APIGW_PUBLIC_KEY,
+            '',
+            '',
+            '',
+            ''
+        );
+    }
+    public function payTest($user_id="979",$money="1",$decive_info="111"){
+        
+       $merchant = 60; //商户获取金额比例
+       $our = 5; //服务费
+       $other = 35; // 其他分销推广人员费用
+       $all_other = 40; // 其他+服务费
+       $user_msg = UserAuth::where("user_id",$user_id)->find();
+       $msg_id = $this->getMsgId();
+    //   var_dump($msg_id);
+       $out = "dlh".time().$user_id;
+       $out1 = "dlh".time().$user_id."1";
+       $out2 = "dlh".time().$user_id."2";
+        $out3 = "dlh".time().$user_id."3";
+       $ip = '';
+       if (isset($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP'] != 'unknown') {
+            // 判断是否有HTTP_CLIENT_IP这个请求头，存在优先使用
+            $ip = $_SERVER['HTTP_CLIENT_IP'];
+       } elseif (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] != 'unknown') {
+            // 判断是否有HTTP_X_FORWARDED_FOR这个请求头，存在优先使用
+            $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+       } elseif (isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] != 'unknown') {
+            // 获取REMOTE_ADDR这个服务器变量
+            $ip = $_SERVER['REMOTE_ADDR'];
+       }
+       $orig_date_time = date("Y-m-d\TH:i:s");
+       $mer_url = "https://dlh.hainings.com/index/index/localReturn";
+       $shop_appid = "wx586d77b9edb0636d";
+        $request = [
+          'serviceUrl' => 'https://gw.open.icbc.com.cn/api/cardbusiness/aggregatepay/b2c/online/consumepurchase/V2',
+          'method' => 'POST',
+          'isNeedEncrypt'=>false,
+          'biz_content' => array(
+                "mer_id"=>"120448160200",
+                "ser_id"=>"120400005722",
+                "out_trade_no"=>$out,
+                "pay_mode"=>"9",
+                "access_type"=>"9",
+                "mer_prtcl_no"=>"1204481602000201",
+                "orig_date_time"=>$orig_date_time,
+                "decive_info"=>$decive_info,
+                "body"=>"东龙汇",
+                "fee_type"=>"001",
+                "spbill_create_ip"=>$ip,
+                "total_fee"=>strval($money*100),
+                "mer_url"=>$mer_url,
+                "notify_type"=>"HS",
+                "shop_appid"=>$shop_appid,
+                "icbc_appid"=>$this->APP_ID,
+                "open_id"=>$user_msg['openid'],
+                "expire_time"=>"300",
+                "is_suborder"=>"1",
+                "order_num"=>"3",
+                "order_submit_act_input"=>array(
+                    array( 
+                        "rec_num"=>"1",
+                        "sub_order_id"=>$out1,
+                        "oper_flag"=>"0",
+                        "busi_type"=>"1",
+                        "ori_mer_id"=>"120448160200",
+                        "seq_no"=>$out,
+                        "mer_acct"=>"1911025009202050845",
+                        "ori_trx_date"=>date("Y-m-d"),
+                        "sub_mer_id"=>"120448160198",
+                        "sub_mer_prtcl_no"=>"1204481601980201",
+                        "classify_amt"=>strval($money*$merchant)
+                        ),
+                    array( 
+                        "rec_num"=>"2",
+                        "sub_order_id"=>$out2,
+                        "oper_flag"=>"0",
+                        "busi_type"=>"1",
+                        "ori_mer_id"=>"120448160200",
+                        "seq_no"=>$out,
+                         "mer_acct"=>"1204068809100138961",
+                        "ori_trx_date"=>date("Y-m-d"),
+                        "sub_mer_id"=>"120448160201",
+                        "sub_mer_prtcl_no"=>"1204481602010201",
+                        "classify_amt"=>strval($money*$our)
+                        ),
+                    array( 
+                        "rec_num"=>"3",
+                        "sub_order_id"=>$out3,
+                        "oper_flag"=>"0",
+                        "busi_type"=>"1",
+                        "ori_mer_id"=>"120448160200",
+                        "seq_no"=>$out,
+                         "mer_acct"=>"1204064019200152507",
+                        "ori_trx_date"=>date("Y-m-d"),
+                        "sub_mer_id"=>"120448160202",
+                        "sub_mer_prtcl_no"=>"1204481602020201",
+                        "classify_amt"=>strval($money*$other)
+                        )
+                )
+          ),
+          'extraParams'=>[]
+        ];
+        //  $res = $this->apiClient->execute($request,$msg_id,"");
+        // print_r("<pre>");
+        // var_dump($request);
+        $data['mer_id'] = "120448160200";
+        $data['ser_id'] = "120400005722";
+        $data['out_trade_no'] = $out;
+        $data['pay_mode'] = "9";
+        $data['access_type'] = "9";
+        $data['mer_prtcl_no'] = "1204481602000201";
+        $data['orig_date_time'] = $orig_date_time;
+        $data['spbill_create_ip'] = $ip;
+        $data['decive_info'] = $decive_info;
+        $data['total_fee'] = $money;
+        $data['fee_type'] = "001";
+        $data['mer_url'] = $mer_url;
+        $data['notify_type'] = "HS";
+        $data['shop_appid'] = $shop_appid;
+        $data['icbc_appid'] = $this->APP_ID;
+        $data['user_id'] = $user_id;
+        $data['open_id'] = $user_msg['openid'];
+        $data['dtime'] = date("Y-m-d H:i:s");
+        $rest = Db::name("abutment_log")->save($data);
+        
+        $data1['rec_num'] = "1";
+        $data1['seq_no'] = $out;
+        $data1['sub_order_id'] = $out1;
+        $data1['oper_flag'] = "0";
+        $data1['busi_type'] = "1";
+        $data1['sub_mer_id'] = "120448160198";
+        $data1['sub_mer_prtcl_no'] = "1204481601980201";
+        $data1['classify_amt'] = $money*$merchant;
+        $data1['user_id'] = $user_id;
+        $data1['open_id'] = $user_msg['openid'];
+        $data1['dtime'] = date("Y-m-d H:i:s");
+         $rest = Db::name("abutment_log")->save($data1);
+         
+        $data2['rec_num'] = "2";
+        $data2['seq_no'] = $out;
+        $data2['sub_order_id'] = $out2;
+        $data2['oper_flag'] = "0";
+        $data2['busi_type'] = "1";
+        $data2['sub_mer_id'] = "120448160201";
+        $data2['sub_mer_prtcl_no'] = "1204481602010201";
+        $data2['classify_amt'] = $money*$our;
+        $data2['user_id'] = $user_id;
+        $data2['open_id'] = $user_msg['openid'];
+        $data2['dtime'] = date("Y-m-d H:i:s");
+        $rest = Db::name("abutment_log")->save($data2);
+        
+        $data3['rec_num'] = "3";
+        $data3['seq_no'] = $out;
+        $data3['sub_order_id'] = $out3;
+        $data3['oper_flag'] = "0";
+        $data3['busi_type'] = "1";
+        $data3['sub_mer_id'] = "120448160202";
+        $data3['sub_mer_prtcl_no'] = "1204481602020201";
+        $data3['classify_amt'] = $money*$other;
+        $data3['user_id'] = $user_id;
+        $data3['open_id'] = $user_msg['openid'];
+        $data3['dtime'] = date("Y-m-d H:i:s");
+        $rest = Db::name("abutment_log")->save($data3);
+        // print_r("<pre>");
+        // var_dump($request);die;
+        $res = $this->apiClient->execute($request,$msg_id,"");
+          $result = json_decode($res,true);
+        //   print_r("<pre>");
+        // var_dump($result);
+          $r = json_decode($result['wx_data_package'],true);
+       return JsonServer::success('查询成功',$r);
+
+    }
+         public function payTestCheck(){
+        $user_id = 1;
+           $msg_id = $this->getMsgId();
+        //   $out = "dlh".time().$user_id;
+        $request = [
+          'serviceUrl' => 'https://gw.open.icbc.com.cn/api/cardbusiness/aggregatepay/b2c/online/orderqry/V2',
+          'method' => 'POST',
+          'isNeedEncrypt'=>false,
+          'biz_content' => array(
+                "mer_id"=>"120448160198",
+                "deal_flag"=>'0',
+                // "out_trade_no"=>"dlh1722084782979",
+                 "order_id"=>"120448160200000532407270000039",
+                "mer_prtcl_no"=>"1204481601980201",
+                "icbc_appid"=>$this->APP_ID
+          ),
+          'extraParams'=>[]
+        ];
+         print_r("<pre>");
+        //  var_dump($request);
+        $res = $this->apiClient->execute($request,$msg_id,"");
+        // var_dump($res);
+        //   $result = json_decode($res,true);
+           $result = json_decode($res,true);
+        //   print_r("<pre>");
+        var_dump($result);die;
+          $r = json_decode($result['order_submit_act_output'],true);
+
+        var_dump($r);
+    }
+    
+    // 拆分子订单
+    public function chaifen(){
+        $user_id = 979;
+         $out1 = "dlh".time().$user_id."1";
+         $out2 = "dlh".time().$user_id."2";
+         $out3 = "dlh".time().$user_id."3";
+         $merchant = 60; //商户获取金额比例
+         $our = 5; //服务费
+         $other = 35; // 其他分销推广人员费用
+         $all_other = 40; // 其他+服务费
+         $msg_id = $this->getMsgId();
+         $money = 0.4;
+        //   $out = "dlh".time().$user_id;
+        $request = [
+          'serviceUrl' => 'https://gw.open.icbc.com.cn/api/cardbusiness/aggregatepay/b2c/online/sersuborder/V1',
+          'method' => 'POST',
+          'isNeedEncrypt'=>false,
+          'biz_content' => array(
+                "mer_id"=>"120400005722",
+                // "out_trade_no"=>"dlh1722239710979",
+                "mer_prtcl_no"=>"1204481602000201",
+                "icbc_appid"=>$this->APP_ID,
+                "order_num"=>"1",
+                "order_submit_act_input"=>array(
+                    array( 
+                        "rec_num"=>"1",
+                        "sub_order_id"=>$out1,
+                        "oper_flag"=>"0",
+                        "busi_type"=>"2",
+                        "ori_mer_id"=>"120448160200",
+                        "seq_no"=>"120448160200000562407290003182",
+                        // "seq_no"=>$out,
+                        "mer_acct"=>"1911025009202050845",
+                        "ori_trx_date"=>date("Y-m-d"),
+                        "sub_mer_id"=>"120448160198",
+                        "sub_mer_prtcl_no"=>"1204481601980201",
+                        "classify_amt"=>strval(1)
+                        )
+                    // array( 
+                    //     "rec_num"=>"2",
+                    //     "sub_order_id"=>$out2,
+                    //     "oper_flag"=>"0",
+                    //     "busi_type"=>"2",
+                    //     "ori_mer_id"=>"120448160200",
+                    //      "seq_no"=>"120448160200000532407270000039",
+                    //     // "seq_no"=>$out,
+                    //      "mer_acct"=>"1204068809100138961",
+                    //     "ori_trx_date"=>date("Y-m-d"),
+                    //     "sub_mer_id"=>"120448160201",
+                    //     "sub_mer_prtcl_no"=>"1204481602010201",
+                    //     "classify_amt"=>strval($money*$our)
+                    //     ),
+                    // array( 
+                    //     "rec_num"=>"3",
+                    //     "sub_order_id"=>$out3,
+                    //     "oper_flag"=>"0",
+                    //     "busi_type"=>"2",
+                    //     "ori_mer_id"=>"120448160200",
+                    //      "seq_no"=>"120448160200000532407270000039",
+                    //     // "seq_no"=>$out,
+                    //      "mer_acct"=>"1204064019200152507",
+                    //     "ori_trx_date"=>date("Y-m-d"),
+                    //     "sub_mer_id"=>"120448160202",
+                    //     "sub_mer_prtcl_no"=>"1204481602020201",
+                    //     "classify_amt"=>strval($money*$other)
+                    //     )
+                )
+          ),
+          'extraParams'=>[]
+        ];
+         print_r("<pre>");
+         var_dump($request);
+        $res = $this->apiClient->execute($request,$msg_id,"");
+         var_dump($res);
+        //   $result = json_decode($res,true);
+           $result = json_decode($res,true);
+        //   print_r("<pre>");
+        var_dump($result);
+    }
+    // 退款
+    public function tuikuan(){
+                $user_id = 979;
+         $out1 = "dlh".time().$user_id."1";
+         $out2 = "dlh".time().$user_id."2";
+         $out3 = "dlh".time().$user_id."3";
+         $merchant = 60; //商户获取金额比例
+         $our = 5; //服务费
+         $other = 35; // 其他分销推广人员费用
+         $all_other = 40; // 其他+服务费
+         $msg_id = $this->getMsgId();
+         $money = 1;
+        //   $out = "dlh".time().$user_id;
+        $request = [
+          'serviceUrl' => 'https://gw.open.icbc.com.cn/api/cardbusiness/aggregatepay/b2c/online/merrefund/V1',
+          'method' => 'POST',
+          'isNeedEncrypt'=>false,
+          'biz_content' => array(
+                "mer_id"=>"120448160200",
+                "outtrx_serial_no"=>$out1,
+                // "out_trade_no"=>"dlh1722239710979",
+                "order_id"=>"120448160200000562407290003182",
+                "ret_total_amt"=>100,
+                "trnsc_ccy"=>"001",
+                "mer_prtcl_no"=>"1204481602000201",
+                "icbc_appid"=>$this->APP_ID,
+          ),
+          'extraParams'=>[]
+        ];
+         print_r("<pre>");
+         var_dump($request);
+        $res = $this->apiClient->execute($request,$msg_id,"");
+         var_dump($res);
+        //   $result = json_decode($res,true);
+           $result = json_decode($res,true);
+        //   print_r("<pre>");
+        var_dump($result);
+    }
+    //解冻
+    public function jiedong(){
+         $msg_id = $this->getMsgId();
+        //   $out = "dlh".time().$user_id;
+        $request = [
+          'serviceUrl' => 'https://gw.open.icbc.com.cn/api/mybank/mer/merin/thaw/V1',
+          'method' => 'POST',
+          'isNeedEncrypt'=>false,
+          'biz_content' => array(
+                "icbcOrderSubNo"=>"1",
+                "icbcOrderNo"=>"120448160200000532407270000039",
+                "outAgreeNo"=>"1204481602000201"
+          ),
+          'extraParams'=>[]
+        ];
+         print_r("<pre>");
+         var_dump($request);
+        $res = $this->apiClient->execute($request,$msg_id,"");
+         var_dump($res);
+        //   $result = json_decode($res,true);
+           $result = json_decode($res,true);
+        //   print_r("<pre>");
+        var_dump($result);
+    }
+    //解冻查询
+    public function jiedongCheck(){
+         $msg_id = $this->getMsgId();
+        //   $out = "dlh".time().$user_id;
+        $request = [
+          'serviceUrl' => 'https://gw.open.icbc.com.cn/api/mybank/mer/merin/freezedtlquery/V1',
+          'method' => 'POST',
+          'isNeedEncrypt'=>false,
+          'biz_content' => array(
+                "queryType"=>"2",
+                "pageNum"=>"1",
+                "pageSize"=>"10",
+                "initFlag"=>"1",
+                "outAgreeNo"=>"1204481602000201",
+                "icbcOrderNo"=>"120448160200000562407290003182",
+                "icbcOrderSubNo"=>"0",
+                "startDate"=>"",
+                "endDate"=>""
+          ),
+          'extraParams'=>[]
+        ];
+         print_r("<pre>");
+         var_dump($request);
+        $res = $this->apiClient->execute($request,$msg_id,"");
+         var_dump($res);
+        //   $result = json_decode($res,true);
+           $result = json_decode($res,true);
+        //   print_r("<pre>");
+        var_dump($result);
+    }
+    
+    public function code()
+    {
+        $code = $this->request->post('code');
+        $invite_code = $this->request->post('invite_code',0);
+            //   trace('invite_code', $invite_code.'-'.$code);
+        if(isset($invite_code)){
+            if($invite_code !== 0){
+                $open=new Getopenid();
+                $info=$open->getAcc($code);
+                if(isset($info['openid'])) {
+                    $openid = $info['openid'];
+                    $user_msg = UserAuth::where("openid",$openid)->find();
+                    $firend_msg = User::where("distribution_code",$invite_code)->find();
+                    if($user_msg==null){
+                           $divide_role_user_id = 0;
+                            $firend_id = 0;
+                             $is_d = Db::name("distribution")->where('user_id', $firend_msg['id'] )->where('is_distribution', 1 )->find();
+                             if($is_d != null){
+                                $firend_id = $firend_msg['id'];
+                                if($firend_msg['first_leader'] !=0){
+                                    $divide_role_user_id = $firend_msg['first_leader'];
+                                }else{
+                                     $divide_role_user_id = $firend_id;
+                                }    
+                             }
+                        $data = [
+                            'sn'                => create_user_sn(),
+                            'create_time'       => time(),
+                            "first_leader"      => $firend_id,
+                            'distribution_code' => generate_invite_code(),//分销邀请码
+                            'is_distribution'   => DistributionLogic::isDistributionMember(),
+                            'client'            => 1,
+                            'is_new_user'       => 1,
+                            'user_ad_cret'      => 1,
+                            'divide_role_user_id' => $divide_role_user_id
+                        ];
+                        $user = User::create($data);
+                        $user_id = $user->id;
+                        $UserAuth = UserAuth::create([
+                            "user_id"=>$user_id,
+                            "openid"=>$openid,
+                            "create_time"=>time(),
+                            "client"=>1
+                        ]);
+                        if($is_d != null){
+                            $firend_id = $firend_msg['id'];
+                            $dat['f_user_id'] = $firend_id;
+                             $dat['user_id'] = $user_id;
+                             $dat['ditme'] = date("Y-m-d H:i:s");
+                            Db::name("user_firster")->save($dat);
+                         }
+                        //生成会员分销扩展表
+                        DistributionLogic::createUserDistribution($user_id);
+
+                        // 生成分销基础信息表
+                        \app\common\logic\DistributionLogic::add($user_id);
+                        $dt['user_id'] = $user_id;
+                        return JsonServer::success('绑定上级成功',$dt);
+
+                    }
+                    $dt['user_id'] = $user_msg['user_id']; 
+                    return JsonServer::success('绑定上级成功',$dt);
+                }
+            }
+        }
+         return JsonServer::success('绑定上级成功',[]);
+    }
+    
+    public function getMsgId(){
+        return substr(md5("donglonghui".time().mt_rand(1,1000000)),8,13);
+    }
+    public function abutmentContent(){
+        $data=[
+            "app_id"=> $this->app_id,
+            "timestamp"=>date("Y-m-dH:i:s"),
+            "notify_url"=>"https://dlh.hainings.com/index/index/localReturn"
+        ];
+        ksort($data);
+        print("<pre>");
+        var_dump($data);
+        $data['msg_id'] = $this->getId("donglonghui",$data);
+        $data1 = http_build_query($data);
+        $url = "https://gw.open.icbc.com.cn/api/mybank/enterprise/pay/payent/V1";
+        $res = $this->curl_post($url,$data1);
+//        var_dump($res);
+        $data['sign'] = $res['sign'];
+//        var_dump($data);
+
+        $d=[
+            "channelFlag"=>2,
+            "empowerPhone"=>"18868040087",
+            "applyType"=>"00100",
+            "crftType1"=>"101",
+            "crftNo1"=>"914310236828465718"
+        ];
+        $u = "https://gw.open.icbc.com.cn/api/mybank/cardbusiness/shop/MerRegistrationAdd/V1";
+        $d1= http_build_query($d);
+        $rest = $this->curl_post($u,$d1);
+        var_dump($rest);
+    }
+
+    public function changeGoods(){
+        $result = Db::name("goods")->where("shop_id",17)->select();
+        foreach($result as $key=>$value){
+            $r = Db::name("goods_item")->where("goods_id",$value['id'])->select();
+            foreach($r as $k=>$v){
+                $price = round($v['chengben_price']*1.7,2);
+                if($price < $v['price']){
+                     Db::name("goods_item")->where("id",$v['id'])->update(["price"=>$price]);
+                }
+                if($price < $value['min_price']){
+                      Db::name("goods")->where("id",$value['id'])->update(["min_price"=>$price]);
+                }
+            }
+        }
+    }
+    function getId($app_secret, $req_param=[])
+    {
+        // 排序所有请求参数
+        ksort($req_param);
+        $src_value = "";
+        // 按照key1value1key2value2...keynvaluen拼接
+        foreach ($req_param as $key => $value) {
+            $src_value .= ($key . $value);
+        }
+        //计算md5
+        return md5($app_secret . $src_value . $app_secret);
+    }
+
+    private function curl_post($url,$postdata){
+        $curl = curl_init(); // 启动一个CURL会话
+        curl_setopt($curl, CURLOPT_URL, $url); // 要访问的地址
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); // 对认证证书来源的检测
+        curl_setopt($curl, CURLOPT_HTTPHEADER, array(
+            'Expect:'
+        )); // 解决数据包大不能提交
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); // 使用自动跳转
+        curl_setopt($curl, CURLOPT_AUTOREFERER, 1); // 自动设置Referer
+        curl_setopt($curl, CURLOPT_POST, 1); // 发送一个常规的Post请求
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); // Post提交的数据包
+        curl_setopt($curl, CURLOPT_TIMEOUT, 30); // 设置超时限制防止死循
+        curl_setopt($curl, CURLOPT_HEADER, 0); // 显示返回的Header区域内容
+        curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type: application/x-www-form-urlencoded'));
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 获取的信息以文件流的形式返回
+// curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); // 跳过证书检查
+        $tmpInfo = curl_exec($curl); // 执行操作
+        if (curl_errno($curl)) {
+            echo 'Errno' . curl_error($curl);
+        }
+        curl_close($curl); // 关键CURL会话
+        $tmpInfo=json_decode($tmpInfo,true);
+        return $tmpInfo;
+    }
+    
+}
\ No newline at end of file
diff --git a/app/api/controller/Account.php b/app/api/controller/Account.php
old mode 100644
new mode 100755
index a8df4f4f..1f99e2d2
--- a/app/api/controller/Account.php
+++ b/app/api/controller/Account.php
@@ -130,7 +130,7 @@ class Account extends Api
      * @description 微信H5登录
      * @method post
      * @url /account/oalogin
-     * @return {"code":1,"msg":"登录成功","data":["token":"3237676fa733d73333341",//登录令牌"nickname":"好象cms-小林",//昵称"avatar":"http://b2c.yixiangonline.com/uploads/procurement/avatar/3f102df244d5b40f21c4b25dc321c5ab.jpeg",//头像url"level":0,//等级],"show":0,"time":"0.775400"}
+     * @return {"code":1,"msg":"登录成功","data":["token":"3237676fa733d73333341",//登录令牌"nickname":"好象cms-小林",//昵称"avatar":"http://b2c.yixiangonline.com/uploads/user/avatar/3f102df244d5b40f21c4b25dc321c5ab.jpeg",//头像url"level":0,//等级],"show":0,"time":"0.775400"}
      * @param code 必填 string code
      * @return_param token string 登录令牌
      * @return_param nickname string 昵称
diff --git a/app/api/controller/ActivityArea.php b/app/api/controller/ActivityArea.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Ad.php b/app/api/controller/Ad.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/AdContent.php b/app/api/controller/AdContent.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/AfterSale.php b/app/api/controller/AfterSale.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Article.php b/app/api/controller/Article.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Bargain.php b/app/api/controller/Bargain.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Billions.php b/app/api/controller/Billions.php
old mode 100644
new mode 100755
index 54d03c82..94ab1faa
--- a/app/api/controller/Billions.php
+++ b/app/api/controller/Billions.php
@@ -13,7 +13,7 @@ use app\common\model\WithdrawApply;
 use think\facade\Db;
 class Billions extends Api
 {
-
+  
     public static function getApp($client)
     {
         $config = WeChatServer::getPayConfigBySource($client)['config'];
@@ -68,7 +68,7 @@ class Billions extends Api
 //        $id = WithdrawLogic::balanceapply($this->user_id, $post);
 //        return JsonServer::success('申请成功', ['id' => $id]);
     }
-
+    
     /**
      * @notes 百亿充值到本地余额
      */
@@ -76,15 +76,16 @@ class Billions extends Api
     {
         $post = $this->request->post();
         $result = BillionsLogic::applyBillionsBalance($this->user_id, $post);
+
         if ($result['code'] == -1) {
             return JsonServer::error($result['msg']);
         }
-
+        
         if ($result['code'] == 1) {
             return JsonServer::success($result['msg']);
         }
     }
-
+    
     public function billionWithdrawal(){
         $user_id = $this->user_id;
         $price = $this->request->post("money");
@@ -99,10 +100,10 @@ class Billions extends Api
         }
         // 微信零钱最小提现金额 1元
         if($price < 1) {
-            return JsonServer::error('扣除手续费后提现金额不能小于1元');
+              return JsonServer::error('扣除手续费后提现金额不能小于1元');
         }
         if($price > 500) {
-            return JsonServer::error('提现金额不能大于500');
+             return JsonServer::error('提现金额不能大于500');
         }
         // 每天最多可向同一用户付款7次
         $count = Db::name('withdraw_apply')
@@ -112,7 +113,7 @@ class Billions extends Api
             ->where('status', '>=', 2) // 提现中、提现成功、提现失败
             ->count();
         if($count >= 7) {
-            return JsonServer::error('同一个用户一天最多可付款7次');
+             return JsonServer::error('同一个用户一天最多可付款7次');
         }
         // 一个商户默认同一日付款总额限额10万元
         $sum = Db::name('withdraw_apply')
@@ -122,23 +123,23 @@ class Billions extends Api
             ->sum('left_money');
         $sum = $sum + $price;
         if($sum > 100000) {
-            return JsonServer::error('一个商户默认同一日付款总额限额10万元');
+             return JsonServer::error('一个商户默认同一日付款总额限额10万元');
         }
 
         // 用户授权信息(同一个用户可能有多条，取client最小的一条)
         $userAuth = Db::name('user_auth')->where('user_id', $user_id)->order('client', 'asc')->find();
         if(!$userAuth) {
             // 无授权记录
-            return JsonServer::error('查询不到该用户的openid');
+             return JsonServer::error('查询不到该用户的openid');
         }
         //提现手续费
         $poundage = 0;
         $poundage_config = 0;
         // if ($type != WithdrawEnum::TYPE_BALANCE) {
-        $p_msg = Db::name("config")->where("type","withdraw")->where("name","poundage")->find();
-        $poundage_config = $p_msg['value'];
-        // $poundage_config = ConfigServer::get('withdraw', 'poundage', 0);
-        $poundage = $price * $poundage_config / 100;
+            $p_msg = Db::name("config")->where("type","withdraw")->where("name","poundage")->find();
+             $poundage_config = $p_msg['value'];
+            // $poundage_config = ConfigServer::get('withdraw', 'poundage', 0);
+            $poundage = $price * $poundage_config / 100;
         // }
 
         $data = [
@@ -165,7 +166,10 @@ class Billions extends Api
 
         //请求URL
         $url = 'https://api.mch.weixin.qq.com/v3/transfer/batches';
-        //请求方式
+       
+         //移除表情
+    //   $nickname['nickname'] = self::removeEmojiChar($nickname['nickname']);
+     //请求方式
         $http_method = 'POST';
         //请求参数
         $user_msg['nickname'] = mb_convert_encoding($user_msg['nickname'], "UTF-8", "auto");
@@ -219,6 +223,7 @@ class Billions extends Api
         $da['subsidy_withdrawal_id'] = $subsidy_withdrawal['id'];
         $da['user_id'] = $user_id;
         $da['type'] = 2;
+        $da['way'] = 1;
         $da['commission_money'] = $poundage;
         $da['commission'] = $poundage_config;
         $da['take_money'] = $withdraw_msg['left_money'];
@@ -226,8 +231,23 @@ class Billions extends Api
         $da['sn'] = $withdraw_msg['sn'];
         $da['create_time'] = date("Y-m-d H:i:s");
         Db::name("subsidy_withdrawal_record")->save($da);
-        return JsonServer::success('零钱提现中');
+         return JsonServer::success('零钱提现中');
     }
+     public static function removeEmojiChar($str){
+            $mbLen = mb_strlen($str); 
+            $strArr = []; 
+            for ($i = 0; $i < $mbLen; $i++) { 
+                $mbSubstr = mb_substr($str, $i, 1, 'utf-8'); 
+                if (strlen($mbSubstr) >= 4) { 
+                    continue; 
+                    
+                } 
+                $strArr[] = $mbSubstr; 
+                
+            } 
+            return implode('', $strArr);
+            
+        }
     public static function token($url,$http_method,$data,$config)
     {
         $timestamp   = time();//请求时间戳
@@ -258,7 +278,7 @@ class Billions extends Api
             $merchant_id, $nonce, $timestamp, $serial_no, $sign);//微信返回token
         return $schema.' '.$token;
     }
-
+    
     public static function https_request($url,$data,$token)
     {
         $curl = curl_init();
@@ -284,7 +304,7 @@ class Billions extends Api
         curl_close($curl);
         return $output;
     }
-
+    
     /**
      * @notes 百亿充值记录
      */
@@ -298,7 +318,7 @@ class Billions extends Api
         $result =  BillionsLogic::rechargeRecord($get);
         return JsonServer::success('', $result);
     }
-
+    
     /**
      * @notes 百亿提现记录
      */
diff --git a/app/api/controller/Cart.php b/app/api/controller/Cart.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Community.php b/app/api/controller/Community.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/CommunityComment.php b/app/api/controller/CommunityComment.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/CommunitySearch.php b/app/api/controller/CommunitySearch.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/CommunityUser.php b/app/api/controller/CommunityUser.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Coupon.php b/app/api/controller/Coupon.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Distribution.php b/app/api/controller/Distribution.php
old mode 100644
new mode 100755
index e1aa04f7..057cb145
--- a/app/api/controller/Distribution.php
+++ b/app/api/controller/Distribution.php
@@ -69,7 +69,7 @@ class Distribution extends Api
     /**
      * 填写邀请码
      */
-    /**
+         /**
      * 填写邀请码
      */
     public function writeCode()
@@ -81,7 +81,7 @@ class Distribution extends Api
         $user_id = $this->user_id;
         if($user_id == $up_user['id']){
             //  return JsonServer::success('请求成功');
-            return JsonServer::error("绑定失败，自己不能成为自己上级");
+              return JsonServer::error("绑定失败，自己不能成为自己上级");
         }
         $user_msg = User::where("id",$user_id)->where("del",0)->find();
         if($user_msg['first_leader'] > 0){
@@ -90,9 +90,9 @@ class Distribution extends Api
         }
         $is_d = Db::name("distribution")->where('user_id', $up_user['id'] )->where('is_distribution', 1 )->find();
         if($is_d == null){
-            return JsonServer::error("绑定失败，绑定人员不是分销会员");
+              return JsonServer::error("绑定失败，绑定人员不是分销会员");
         }
-        User::where("id",$user_id)->update(["first_leader"=>$up_user['id']]);
+         User::where("id",$user_id)->update(["first_leader"=>$up_user['id']]);
         return JsonServer::success('绑定上级成功');
     }
     public function code()
@@ -110,7 +110,7 @@ class Distribution extends Api
             'code' => $code,
         ];
 
-        //   trace('invite_code', $invite_code.'-'.$code);
+            //   trace('invite_code', $invite_code.'-'.$code);
         if(isset($invite_code)){
             if($invite_code != 0){
                 $open=new Getopenid();
@@ -120,17 +120,17 @@ class Distribution extends Api
                     $user_msg = UserAuth::where("openid",$openid)->find();
                     $firend_msg = User::where("distribution_code",$invite_code)->find();
                     if($user_msg==null){
-                        $divide_role_user_id = 0;
-                        $firend_id = 0;
-                        $is_d = Db::name("distribution")->where('user_id', $firend_msg['id'] )->where('is_distribution', 1 )->find();
-                        if($is_d != null){
-                            $firend_id = $firend_msg['id'];
-                            if($firend_msg['first_leader'] !=0){
-                                $divide_role_user_id = $firend_msg['first_leader'];
-                            }else{
-                                $divide_role_user_id = $firend_id;
-                            }
-                        }
+                           $divide_role_user_id = 0;
+                            $firend_id = 0;
+                             $is_d = Db::name("distribution")->where('user_id', $firend_msg['id'] )->where('is_distribution', 1 )->find();
+                             if($is_d != null){
+                                $firend_id = $firend_msg['id'];
+                                if($firend_msg['first_leader'] !=0){
+                                    $divide_role_user_id = $firend_msg['first_leader'];
+                                }else{
+                                     $divide_role_user_id = $firend_id;
+                                }    
+                             }
                         $data = [
                             'sn'                => create_user_sn(),
                             'create_time'       => time(),
@@ -153,10 +153,10 @@ class Distribution extends Api
                         if($is_d != null){
                             $firend_id = $firend_msg['id'];
                             $dat['f_user_id'] = $firend_id;
-                            $dat['user_id'] = $user_id;
-                            $dat['ditme'] = date("Y-m-d H:i:s");
+                             $dat['user_id'] = $user_id;
+                             $dat['ditme'] = date("Y-m-d H:i:s");
                             Db::name("user_firster")->save($dat);
-                        }
+                         }
                         //生成会员分销扩展表
                         DistributionLogic::createUserDistribution($user_id);
 
diff --git a/app/api/controller/File.php b/app/api/controller/File.php
old mode 100644
new mode 100755
index bd38e338..17ca4538
--- a/app/api/controller/File.php
+++ b/app/api/controller/File.php
@@ -38,12 +38,12 @@ class File extends Api
      * @return param url string 文件地址
      * @remark
      * @number 1
-     * @return {"code":1,"msg":"上传文件成功","data":{"url":"http:\/\/likeb2b2c.yixiangonline.com\/uploads\/images\/procurement\/20200810\/3cb866f6bb30b7239d91582f7d9822d6.png","name":"2.png"},"show":0,"time":"0.283254","debug":{"request":{"get":[],"post":[],"header":{"content-length":"103132","content-type":"multipart\/form-data; boundary=--------------------------206668736604428806173438","connection":"keep-alive","accept-encoding":"gzip, deflate, br","host":"www.likeb2b2c.com:20002","postman-token":"1f8aa4dd-f53c-4d12-98b4-8d901ac847db","cache-control":"no-cache","accept":"*\/*","procurement-agent":"PostmanRuntime\/7.26.2"}}}}
+     * @return {"code":1,"msg":"上传文件成功","data":{"url":"http:\/\/likeb2b2c.yixiangonline.com\/uploads\/images\/user\/20200810\/3cb866f6bb30b7239d91582f7d9822d6.png","name":"2.png"},"show":0,"time":"0.283254","debug":{"request":{"get":[],"post":[],"header":{"content-length":"103132","content-type":"multipart\/form-data; boundary=--------------------------206668736604428806173438","connection":"keep-alive","accept-encoding":"gzip, deflate, br","host":"www.likeb2b2c.com:20002","postman-token":"1f8aa4dd-f53c-4d12-98b4-8d901ac847db","cache-control":"no-cache","accept":"*\/*","user-agent":"PostmanRuntime\/7.26.2"}}}}
      */
     public function formImage()
     {
         try{
-            $data = FileServer::image(0, 0, $this->user_id, 'uploads/procurement/'.$this->user_id);
+            $data = FileServer::image(0, 0, $this->user_id, 'uploads/user/'.$this->user_id);
             return JsonServer::success('上传成功', $data);
         }catch(\Exception $e) {
             return JsonServer::error($e->getMessage());
diff --git a/app/api/controller/Footprint.php b/app/api/controller/Footprint.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Goods.php b/app/api/controller/Goods.php
old mode 100644
new mode 100755
index c8496c31..6148fa6a
--- a/app/api/controller/Goods.php
+++ b/app/api/controller/Goods.php
@@ -101,16 +101,16 @@ class Goods extends Api
                 $set = Procurementset::where("u_id",$p_id)->where("set_state",1)->order("set_update desc")->limit(1)->find();
             }
             $set_price_type = 0;
-            if ($set != null&&$settpye!=1) {
-                if($set['price_type']==1){
-                    $set_price_type = 1;
-                }
-                if($set['price_type']==2){
-                    $set_price_type = 2;
-                }
-                if($set['price_type']==3){
-                    $set_price_type = 3;
-                }
+             if ($set != null&&$settpye!=1) {
+                   if($set['price_type']==1){
+                     $set_price_type = 1;
+                 }
+                 if($set['price_type']==2){
+                     $set_price_type = 2;
+                 }
+                 if($set['price_type']==3){
+                     $set_price_type = 3;
+                 }
                 if ($set['set_pro'] != 0) {
                     // $set_price_type = 1;
                     if ($set['set_pro_type'] == 1) {
@@ -185,7 +185,7 @@ class Goods extends Api
                     }
                 }
             }
-            $goodsDetail['set_price_type'] = $set_price_type;
+             $goodsDetail['set_price_type'] = $set_price_type;
             $rst =  Mprocurement::where("user_id",$this->user_id)->where("u_state",1)->where("u_examine_state",1)->where("wholesale_state",2)->find();
             if($rst==null){
 //                foreach($goodsDetail['goods_item'] as $k => $v){
@@ -289,7 +289,7 @@ class Goods extends Api
             return JsonServer::error('请求方式错误');
         }
     }
-
+    
     // 根据商品名称搜索
     public function searchByName()
     {
@@ -301,8 +301,8 @@ class Goods extends Api
             return JsonServer::error('请求方式错误');
         }
     }
-
-
+    
+    
     // 2024-07-26 新版获取热销榜单
     public function hotList()
     {
@@ -312,10 +312,10 @@ class Goods extends Api
 
         return JsonServer::success('获取成功', $list);
     }
-
+    
     public function newGoods()
     {
-        // 等于recommend是获取4条推荐商品 等于all是获取全部的商品
+        // 等于1是获取4条推荐商品 等于2是获取全部的商品
         $type = $this->request->get('type');
         $page = $this->request->get('page_no', $this->page_no);
         $size = $this->request->get('page_size', $this->page_size);
@@ -323,5 +323,5 @@ class Goods extends Api
         $list = GoodsLogic::goodsList($type, $page, $size);
         return JsonServer::success('获取成功', $list);
     }
-
+    
 }
\ No newline at end of file
diff --git a/app/api/controller/GoodsBrand.php b/app/api/controller/GoodsBrand.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/GoodsCategory.php b/app/api/controller/GoodsCategory.php
old mode 100644
new mode 100755
index b7bc806c..a460340e
--- a/app/api/controller/GoodsCategory.php
+++ b/app/api/controller/GoodsCategory.php
@@ -16,6 +16,10 @@ class GoodsCategory extends Api
     public function getLevelOneList()
     {
         if($this->request->isGet()) {
+            trace('arr:' .json_encode($this->request), 'info');
+            trace('p_id:' .$this->request->get('p_id'), 'info');
+            trace('set:' .$this->request->get('set'), 'info');
+            //trace(json_encode($get), 'info');
             $p_id= $this->request->get('p_id',0);
             $setid= $this->request->get('set',0);
             $list = GoodsCategoryLogic::getLevelOneList($p_id,$setid);
diff --git a/app/api/controller/GoodsCollect.php b/app/api/controller/GoodsCollect.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/GoodsColumn.php b/app/api/controller/GoodsColumn.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/GoodsComment.php b/app/api/controller/GoodsComment.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Help.php b/app/api/controller/Help.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Index.php b/app/api/controller/Index.php
old mode 100644
new mode 100755
index 28908401..22905556
--- a/app/api/controller/Index.php
+++ b/app/api/controller/Index.php
@@ -18,7 +18,7 @@ class Index extends Api
     // 首页
     public function index()
     {
-
+        
         $terminal = $this->request->get('terminal', 'nmp');
         $city = $this->request->get('city_id', '');
         $p_id = $this->request->get('p_id',0);
@@ -26,14 +26,14 @@ class Index extends Api
         // $firend_invite_code = $this->request->get('firend_invite_code',0);
         $code = $this->request->get('code');
         $invite_code = $this->request->get('invite_code');
-
+          
         // file_put_contents('log.txt', '1invite_code= ' . $invite_code . '; code='. $code);
         // die;
         //   echo $code;
         //   echo $invite_code;
         //   Log::record('测试日志信息');
         //   trace('invite_code', $invite_code.'-'.$code);
-        // $data = $this->request->param();
+            // $data = $this->request->param();
         //   echo $data;die;
         // if(isset($invite_code)){
         //     if($invite_code != 0){
@@ -49,15 +49,15 @@ class Index extends Api
             if($user_msg==null){
                 $divide_role_user_id = 0;
                 $firend_id = 0;
-                $is_d = Db::name("distribution")->where('user_id', $firend_msg['id'] )->where('is_distribution', 1 )->find();
-                if($is_d != null){
+                 $is_d = Db::name("distribution")->where('user_id', $firend_msg['id'] )->where('is_distribution', 1 )->find();
+                 if($is_d != null){
                     $firend_id = $firend_msg['id'];
                     if($firend_msg['first_leader'] !=0){
                         $divide_role_user_id = $firend_msg['first_leader'];
                     }else{
-                        $divide_role_user_id = $firend_id;
-                    }
-                }
+                         $divide_role_user_id = $firend_id;
+                    }    
+                 }
                 $data = [
                     'sn'                => create_user_sn(),
                     'create_time'       => time(),
@@ -77,13 +77,13 @@ class Index extends Api
                     "create_time"=>time(),
                     "client"=>1
                 ]);
-                if($is_d != null){
+                 if($is_d != null){
                     $firend_id = $firend_msg['id'];
                     $dat['f_user_id'] = $firend_id;
-                    $dat['user_id'] = $user_id;
-                    $dat['ditme'] = date("Y-m-d H:i:s");
+                     $dat['user_id'] = $user_id;
+                     $dat['ditme'] = date("Y-m-d H:i:s");
                     Db::name("user_firster")->save($dat);
-                }
+                 }
                 //生成会员分销扩展表
                 DistributionLogic::createUserDistribution($user_id);
 
@@ -179,17 +179,17 @@ class Index extends Api
         }
         return JsonServer::success('',$result);
     }
-
-    // 控制显示本地生活
-    public function setHome(){
+    
+        // 控制显示本地生活
+       public function setHome(){
         $arr = array(
             array(
-                "image"=>'https://zjeloong.oss-cn-hangzhou.aliyuncs.com/uniapp/bundle_b/local_shop/store_manager.png',
-                "name"=>'商家信息',
-                "is_tab"=> 0,
-                "link"=>'/bundle_b/pages/local_shop/local_shop',
-                "link_type"=>1,
-                "is_set"=>0
+            "image"=>'https://zjeloong.oss-cn-hangzhou.aliyuncs.com/uniapp/bundle_b/local_shop/store_manager.png',
+            "name"=>'商家信息',
+            "is_tab"=> 0,
+            "link"=>'/bundle_b/pages/local_shop/local_shop',
+            "link_type"=>1,
+            "is_set"=>0
             ),
             array(
                 "image"=>'https://zjeloong.oss-cn-hangzhou.aliyuncs.com/uniapp/bundle_b/local_shop/store_settled.png',
@@ -204,6 +204,6 @@ class Index extends Api
         // return JsonServer::success('查询成功', []);
 
     }
-
-
+    
+   
 }
\ No newline at end of file
diff --git a/app/api/controller/IntegralGoods.php b/app/api/controller/IntegralGoods.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/IntegralOrder.php b/app/api/controller/IntegralOrder.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Live.php b/app/api/controller/Live.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/LocalStore.php b/app/api/controller/LocalStore.php
old mode 100644
new mode 100755
index d1fce165..6661e687
--- a/app/api/controller/LocalStore.php
+++ b/app/api/controller/LocalStore.php
@@ -66,17 +66,17 @@ class LocalStore extends Api
     {
         $page = $this->request->get('page_no', $this->page_no);
         $size = $this->request->get('page_size', $this->page_size);
-        $lists = Db::name('local_store')->alias('ls')
-            ->join('user u', 'ls.user_id = u.id')
+        $lists = Db::name('local_store')
             ->where(['user_id' => $this->user_id, 'store_state' => 1])
             ->order('create_time', 'desc')
-            ->field('ls.*, u.id, u.nickname, u.avatar')
             ->page($page,$size)
             ->select()
             ->toArray();
 
         foreach ($lists as &$v) {
-            $v['avatar'] = UrlServer::getFileUrl($v['avatar']);
+            if (!empty($v['header_image'])) {
+                $v['header_image'] = FileConfig::get('aliyunoss.domain') . 'local_life_shop/' . $v['header_image'];
+            }
         }
 
         $count = Db::name('local_store')
@@ -101,7 +101,7 @@ class LocalStore extends Api
     public function makeMyPayImage(){
         // $user_id = 2;
         $user_id = $this->user_id;
-//        $url = $this->request->get('url');
+        $lstore_id = $this->request->post('lstore_id');
         $user_msg = User::where("id",$user_id)->where("del",0)->where("disable",0)->find();
         if($user_msg==null){
             return JsonServer::error('暂无用户');
@@ -114,14 +114,14 @@ class LocalStore extends Api
             }else{
                 $url = "bundle_b/pages/local_shop/local_pay";
                 $save_dir = ROOT_PATH .'/uploads/localpay/';
-                $scene = 'lid='.$user_local_msg['lstore_id'];
+                $scene = 'lid='.$lstore_id;
                 $a = time().$scene;
                 $qr_src = $a . '.jpg';
             }
         }else{
             $url = "bundle_b/pages/local_shop/local_pay";
             $save_dir = ROOT_PATH .'/uploads/localpay/';
-            $scene = 'lid='.$user_local_msg['lstore_id'];
+            $scene = 'lid='.$lstore_id;
             $a = time().$scene;
             $qr_src = $a . '.jpg';
         }
@@ -140,7 +140,7 @@ class LocalStore extends Api
                 $response->saveAs($save_dir, $a);
                 $us = \think\facade\Request::instance()->domain();
                 $data['pay_image'] = $us.'/uploads/localpay/'.$qr_src;
-                $user_msg = Db::name("local_store")->where("user_id",$user_id)->update($data);
+                $user_msg = Db::name("local_store")->where("lstore_id",$lstore_id)->update($data);
                 if($user_msg){
                     return JsonServer::success('查询成功',$data);
                 }else{
@@ -162,6 +162,7 @@ class LocalStore extends Api
         $result = Db::name('local_store')
             ->where(['lstore_id' => $id, 'user_id' => $this->user_id, 'store_state' => 1])
             ->order('create_time', 'desc')
+            ->field('lstore_id, store_state, header_image, store_nickname, pay_image')
             ->find();
         if ($result) {
             $result['header_image'] = FileConfig::get('aliyunoss.domain') . 'local_life_shop/' . $result['header_image'] ;
@@ -181,7 +182,7 @@ class LocalStore extends Api
         if ($id && $header_image) {
             $result = Db::name('local_store')
                 ->where(['lstore_id' => $id, 'user_id' => $this->user_id])
-                ->update(['header_image' => basename($header_image), 'update_time' => date('Y-m-d H:i:s')]);
+                ->update(['header_image' => 'local_life_shop/' . basename($header_image), 'update_time' => date('Y-m-d H:i:s')]);
         }
 
         if ($id && $store_name) {
diff --git a/app/api/controller/LoginPassword.php b/app/api/controller/LoginPassword.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/MallNews.php b/app/api/controller/MallNews.php
old mode 100644
new mode 100755
index 0f4675de..87ea591d
--- a/app/api/controller/MallNews.php
+++ b/app/api/controller/MallNews.php
@@ -20,7 +20,7 @@ class MallNews extends Api
         }
     }
 
-    public function details()
+    public function detail()
     {
         if($this->request->isGet()) {
             $id = $this->request->get('id');
diff --git a/app/api/controller/Menu.php b/app/api/controller/Menu.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Notice.php b/app/api/controller/Notice.php
old mode 100644
new mode 100755
index 6b1a0adf..c6868ec5
--- a/app/api/controller/Notice.php
+++ b/app/api/controller/Notice.php
@@ -3,12 +3,12 @@
 // | likeshop开源商城系统
 // +----------------------------------------------------------------------
 // | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | gitee下载：https://gitee.com/likeshop_gitee
-// | github下载：https://github.com/likeshop-github
-// | 访问官网：https://www.likeshop.cn
-// | 访问社区：https://home.likeshop.cn
-// | 访问手册：http://doc.likeshop.cn
-// | 微信公众号：likeshop技术社区
+	// | gitee下载：https://gitee.com/likeshop_gitee
+	// | github下载：https://github.com/likeshop-github
+	// | 访问官网：https://www.likeshop.cn
+	// | 访问社区：https://home.likeshop.cn
+	// | 访问手册：http://doc.likeshop.cn
+	// | 微信公众号：likeshop技术社区
 // | likeshop系列产品在gitee、github等公开渠道开源版本可免费商用，未经许可不能去除前后端官方版权标识
 // |  likeshop系列产品收费版本务必购买商业授权，购买去版权授权后，方可去除前后端官方版权标识
 // | 禁止对系统程序代码以任何目的，任何形式的再发布
@@ -22,11 +22,7 @@ namespace app\api\controller;
 
 use app\common\basics\Api;
 use app\common\logic\SystemNoticeLogic;
-use app\common\model\Client_;
-use app\common\model\user\UserAuth;
 use app\common\server\JsonServer;
-use app\common\server\WeChatServer;
-use EasyWeChat\Factory;
 
 class Notice extends Api
 {
@@ -53,39 +49,4 @@ class Notice extends Api
         return JsonServer::success('获取成功', $lists);
     }
 
-    /**
-     * @notes 本地生活消息订阅模板ID，需要将template_id放在配置文件中
-     */
-    public function getLocalLifeTemplateId()
-    {
-        return JsonServer::success('获取成功', ['id' => ['w6LVw0dwdmBWBlj06j-A-s34NZSdFC5xkasFhZbYSfM']]);
-    }
-
-    /**
-     * @notes 将template_id放在配置文件中
-     */
-    public function sendMsg()
-    {
-        $config = WeChatServer::getMnpConfig();
-        $app  = Factory::miniProgram($config);
-        $user = UserAuth::where(['user_id' => $this->user_id, 'client' => Client_::mnp])->find();
-
-        $data = [
-            'template_id' => 'w6LVw0dwdmBWBlj06j-A-s34NZSdFC5xkasFhZbYSfM', // 所需下发的订阅模板id
-            'touser' => $user['openid'],     // 接收者（用户）的 openid
-            'page' => '/pages/goods_cate/goods_cate',       // 点击模板卡片后的跳转页面，仅限本小程序内的页面。支持带参数,（示例index?foo=bar）。该字段不填则模板无跳转。
-            'data' => [         // 模板内容，格式形如 { "key1": { "value": any }, "key2": { "value": any } }
-                'thing1' => [
-                    'value' => '我的店铺',
-                ],
-                'thing4' => [
-                    'value' => '您的店铺审核成功',
-                ],
-                'phrase5' => [
-                    'value' => '审核成功'
-                ]
-            ],
-        ];
-        $app->subscribe_message->send($data);
-    }
 }
\ No newline at end of file
diff --git a/app/api/controller/Order.php b/app/api/controller/Order.php
old mode 100644
new mode 100755
index 82999c79..381badff
--- a/app/api/controller/Order.php
+++ b/app/api/controller/Order.php
@@ -43,167 +43,71 @@ class  Order extends Api
         }
         return JsonServer::success('下单成功!', $order);
     }
-
+    
     public function testPromotion(){  ///无相测试使用
         $time = time();
         $afterSaleTime = ConfigServer::get('distribution', 'settlement_days', 7);
         $afterSaleTime = intval($afterSaleTime * 24 * 60 * 60);
-
+        
         //2.查询所有未分销结算的订单,推荐人提成计算  //无相增加
-        $promotionOrders_rz = Morder::alias('O') //入驻店铺
-        ->field(['O.id','O.order_sn','O.total_amount','O.user_id','U.first_leader','S.type as stype','U.second_leader','U.third_leader','S.id as sid','U.id as uid','S.trade_promotion_fee','S.promotion_buy_fee','S.team_first_fee','S.team_second_fee','S.team_third_fee'])
-            ->join('shop S','O.shop_id = S.id')
-            ->join('shop_admin SA','O.shop_id = SA.shop_id')
-            ->join('shop_apply SAP','SAP.account = SA.account')
-            ->join('procurement U','SAP.user_id = U.id')
-            ->whereRaw("O.confirm_take_time+$afterSaleTime < $time")
-            ->where([['O.confirm_take_time', '>', 0],['O.promotion_settle',"=",0],['S.type','=',2]]) //已确认收货且没有结算的订单,商家为入驻商家
-            ->limit(100)
-            ->select()->toArray();
-
-        $promotionOrders_zy = Morder::alias('O')  //自营店铺
-        ->field(['O.id','O.order_sn','O.total_amount','U.first_leader','U.second_leader','U.third_leader','S.id as sid','U.id as uid','S.trade_promotion_fee','S.promotion_buy_fee','S.team_first_fee','S.team_second_fee','S.team_third_fee','S.type as stype'])
-            ->join('shop S','O.shop_id = S.id')
-            ->join('procurement U','O.user_id = U.id')
-            ->whereRaw("O.confirm_take_time+$afterSaleTime < $time")
-            ->where([['O.confirm_take_time', '>', 0],['O.promotion_settle',"=",0],['S.type','=',1]]) //已确认收货且没有结算的订单,商家为入驻商家
-            ->limit(100)
-            ->select()->toArray();
-
-        $promotionOrders = array_merge($promotionOrders_rz,$promotionOrders_zy);
-        //dump($promotionOrders);die();
+           $promotionOrders_rz = Morder::alias('O') //入驻店铺
+                                ->field(['O.id','O.order_sn','O.total_amount','O.user_id','U.first_leader','S.type as stype','U.second_leader','U.third_leader','S.id as sid','U.id as uid','S.trade_promotion_fee','S.promotion_buy_fee','S.team_first_fee','S.team_second_fee','S.team_third_fee'])
+                                ->join('shop S','O.shop_id = S.id')
+                                ->join('shop_admin SA','O.shop_id = SA.shop_id')
+                                ->join('shop_apply SAP','SAP.account = SA.account')
+                                ->join('procurement U','SAP.user_id = U.id')
+                                ->whereRaw("O.confirm_take_time+$afterSaleTime < $time")
+                                ->where([['O.confirm_take_time', '>', 0],['O.promotion_settle',"=",0],['S.type','=',2]]) //已确认收货且没有结算的订单,商家为入驻商家
+                                ->limit(100)
+                                ->select()->toArray();
+                                
+            $promotionOrders_zy = Morder::alias('O')  //自营店铺
+                                ->field(['O.id','O.order_sn','O.total_amount','U.first_leader','U.second_leader','U.third_leader','S.id as sid','U.id as uid','S.trade_promotion_fee','S.promotion_buy_fee','S.team_first_fee','S.team_second_fee','S.team_third_fee','S.type as stype'])
+                                ->join('shop S','O.shop_id = S.id')
+                                ->join('procurement U','O.user_id = U.id')
+                                ->whereRaw("O.confirm_take_time+$afterSaleTime < $time")
+                                ->where([['O.confirm_take_time', '>', 0],['O.promotion_settle',"=",0],['S.type','=',1]]) //已确认收货且没有结算的订单,商家为入驻商家
+                                ->limit(100)
+                                ->select()->toArray();
+            
+            $promotionOrders = array_merge($promotionOrders_rz,$promotionOrders_zy);
+            //dump($promotionOrders);die();
         foreach ($promotionOrders as &$order) {
-
-            // 增加用户佣金,推广者如果是个人，就直接返推广点，否者按推广层级进行返点
-            if($order["stype"]==1){ //如果是自营店铺，直接给购买人提成
-                $buyer = User::where('id', $order['uid'])->find(); //购买者
-                $wallet = Shop::where('id', $order['sid'])->value('wallet'); //商家减去佣金
-                $earnings_buy = User::where('id', $buyer['first_leader'])->value('earnings');
-                if($earnings_buy){ //如果购买者有推荐人，就发推荐奖励
-                    $money_buy = $order['total_amount'] * $order['promotion_buy_fee'] / 100;
-                    User::update([
-                        'earnings'    => $earnings_buy + $money_buy,
-                        'update_time' => $time,
-                        'id' => $buyer['first_leader']
-                    ]);
-
-                    Shop::update([
-                        'wallet'    => $wallet - $money_buy,
-                        'update_time' => $time,
-                        'id' => $order['sid']
-                    ]);
-
-                    UserDistribution::where("user_id",$buyer['id'])->update([
-                        'order_num'  => Db::raw('order_num+1'),
-                        'distribution_money'  => $money_buy,
-                        'order_amount'  => Db::raw("order_amount+".$order['total_amount']),
-                    ]);
-
-                    // 记录流水
-                    AccountLog::create([
-                        'log_sn'        => createSn('account_log', 'log_sn', '', 4),
-                        'user_id'       => $buyer['first_leader'],
-                        'source_type'   => AccountLog::distribution_inc_earnings,
-                        'source_id'     => $order['id'],
-                        'source_sn'     => $order['order_sn'],
-                        'change_amount' => $money_buy,
-                        'left_amount'   => $earnings_buy+$money_buy,
-                        'change_type'   => 1,
-                        'remark'        => '推广佣金增加'
-                    ]);
-                    // 记录流水
-                    AccountLog::create([
-                        'log_sn'        => createSn('account_log', 'log_sn', '', 4),
-                        'user_id'       => $order['uid'],
-                        'source_type'   => AccountLog::shop_reduce_wallet,
-                        'source_id'     => $order['id'],
-                        'source_sn'     => $order['order_sn'],
-                        'change_amount' => $money_buy,
-                        'left_amount'   => $wallet - $money_buy,
-                        'change_type'   => 1,
-                        'remark'        => '商铺钱包余额减少'
-                    ]);
-
-                }
-
-            }else{
-
-                // 商家钱包金额
-                $wallet = Shop::where('id', $order['sid'])->value('wallet'); //商家减去佣金
-                //先执行推荐购买返点
-                $buyer = User::where('id', $order['user_id'])->find(); //购买者
-                $earnings_buy = User::where('id', $buyer['first_leader'])->value('earnings');
-                if($earnings_buy){ //如果购买者有推荐人，就发推荐奖励
-                    $money_buy = $order['total_amount'] * $order['promotion_buy_fee'] / 100;
-                    User::update([
-                        'earnings'    => $earnings_buy + $money_buy,
-                        'update_time' => $time,
-                        'id' => $buyer['first_leader']
-                    ]);
-
-                    Shop::update([
-                        'wallet'    => $wallet - $money_buy,
-                        'update_time' => $time,
-                        'id' => $order['sid']
-                    ]);
-
-                    // 记录流水
-                    AccountLog::create([
-                        'log_sn'        => createSn('account_log', 'log_sn', '', 4),
-                        'user_id'       => $buyer['first_leader'],
-                        'source_type'   => AccountLog::distribution_inc_earnings,
-                        'source_id'     => $order['id'],
-                        'source_sn'     => $order['order_sn'],
-                        'change_amount' => $money_buy,
-                        'left_amount'   => $earnings_buy+$money_buy,
-                        'change_type'   => 1,
-                        'remark'        => '推广佣金增加'
-                    ]);
-                    // 记录流水
-                    AccountLog::create([
-                        'log_sn'        => createSn('account_log', 'log_sn', '', 4),
-                        'user_id'       => $order['uid'],
-                        'source_type'   => AccountLog::shop_reduce_wallet,
-                        'source_id'     => $order['id'],
-                        'source_sn'     => $order['order_sn'],
-                        'change_amount' => $money_buy,
-                        'left_amount'   => $wallet - $money_buy,
-                        'change_type'   => 1,
-                        'remark'        => '商铺钱包余额减少'
-                    ]);
-
-                }
-
-                //获取店铺
-
-                $promoter = User::where('id', $order['first_leader'])->find(); //查询推广者
-                if($promoter){
-
-                    if(!$promoter["is_team"]){ //不是团队就直接分账
-                        $earnings = User::where('id', $order['first_leader'])->value('earnings'); //给推广者增加佣金
-                        $money = $order['total_amount'] * $order['trade_promotion_fee'] / 100;
-                        User::update([
-                            'earnings'    => $earnings + $money,
-                            'update_time' => $time,
-                            'id' => $order['first_leader']
-                        ]);
-
-
-                        Shop::update([
-                            'wallet'    => $wallet - $money,
+                
+                // 增加用户佣金,推广者如果是个人，就直接返推广点，否者按推广层级进行返点
+                if($order["stype"]==1){ //如果是自营店铺，直接给购买人提成
+                    $buyer = User::where('id', $order['uid'])->find(); //购买者
+                    $wallet = Shop::where('id', $order['sid'])->value('wallet'); //商家减去佣金
+                    $earnings_buy = User::where('id', $buyer['first_leader'])->value('earnings');
+                    if($earnings_buy){ //如果购买者有推荐人，就发推荐奖励
+                            $money_buy = $order['total_amount'] * $order['promotion_buy_fee'] / 100;
+                            User::update([
+                                'earnings'    => $earnings_buy + $money_buy,
+                                'update_time' => $time,
+                                'id' => $buyer['first_leader']
+                            ]);
+                            
+                            Shop::update([
+                            'wallet'    => $wallet - $money_buy,
                             'update_time' => $time,
                             'id' => $order['sid']
-                        ]);
-
-                        // 记录流水
+                            ]);
+                            
+                            UserDistribution::where("user_id",$buyer['id'])->update([
+                                'order_num'  => Db::raw('order_num+1'),
+                                'distribution_money'  => $money_buy,
+                                'order_amount'  => Db::raw("order_amount+".$order['total_amount']),
+                                ]);
+                            
+                            // 记录流水
                         AccountLog::create([
                             'log_sn'        => createSn('account_log', 'log_sn', '', 4),
-                            'user_id'       => $order['first_leader'],
+                            'user_id'       => $buyer['first_leader'],
                             'source_type'   => AccountLog::distribution_inc_earnings,
                             'source_id'     => $order['id'],
                             'source_sn'     => $order['order_sn'],
-                            'change_amount' => $money,
-                            'left_amount'   => $earnings+$money,
+                            'change_amount' => $money_buy,
+                            'left_amount'   => $earnings_buy+$money_buy,
                             'change_type'   => 1,
                             'remark'        => '推广佣金增加'
                         ]);
@@ -214,37 +118,44 @@ class  Order extends Api
                             'source_type'   => AccountLog::shop_reduce_wallet,
                             'source_id'     => $order['id'],
                             'source_sn'     => $order['order_sn'],
-                            'change_amount' => $money,
-                            'left_amount'   => $wallet - $money,
+                            'change_amount' => $money_buy,
+                            'left_amount'   => $wallet - $money_buy,
                             'change_type'   => 1,
                             'remark'        => '商铺钱包余额减少'
                         ]);
-                    }else{ //如果是团队需要按三级分成
-                        //一级
-                        $earnings = User::where('id', $order['first_leader'])->value('earnings'); //给推广者增加佣金
-                        $money = $order['total_amount'] * $order['team_first_fee'] / 100;
-                        User::update([
-                            'earnings'    => $earnings + $money,
-                            'update_time' => $time,
-                            'id' => $order['first_leader']
-                        ]);
-
-
-                        Shop::update([
-                            'wallet'    => $wallet - $money,
+                            
+                        }
+                    
+                }else{
+                    
+                    // 商家钱包金额
+                        $wallet = Shop::where('id', $order['sid'])->value('wallet'); //商家减去佣金
+                        //先执行推荐购买返点
+                        $buyer = User::where('id', $order['user_id'])->find(); //购买者
+                        $earnings_buy = User::where('id', $buyer['first_leader'])->value('earnings');
+                        if($earnings_buy){ //如果购买者有推荐人，就发推荐奖励
+                            $money_buy = $order['total_amount'] * $order['promotion_buy_fee'] / 100;
+                            User::update([
+                                'earnings'    => $earnings_buy + $money_buy,
+                                'update_time' => $time,
+                                'id' => $buyer['first_leader']
+                            ]);
+                            
+                            Shop::update([
+                            'wallet'    => $wallet - $money_buy,
                             'update_time' => $time,
                             'id' => $order['sid']
-                        ]);
-
-                        // 记录流水
+                            ]);
+                            
+                            // 记录流水
                         AccountLog::create([
                             'log_sn'        => createSn('account_log', 'log_sn', '', 4),
-                            'user_id'       => $order['first_leader'],
+                            'user_id'       => $buyer['first_leader'],
                             'source_type'   => AccountLog::distribution_inc_earnings,
                             'source_id'     => $order['id'],
                             'source_sn'     => $order['order_sn'],
-                            'change_amount' => $money,
-                            'left_amount'   => $earnings+$money,
+                            'change_amount' => $money_buy,
+                            'left_amount'   => $earnings_buy+$money_buy,
                             'change_type'   => 1,
                             'remark'        => '推广佣金增加'
                         ]);
@@ -255,34 +166,39 @@ class  Order extends Api
                             'source_type'   => AccountLog::shop_reduce_wallet,
                             'source_id'     => $order['id'],
                             'source_sn'     => $order['order_sn'],
-                            'change_amount' => $money,
-                            'left_amount'   => $wallet - $money,
+                            'change_amount' => $money_buy,
+                            'left_amount'   => $wallet - $money_buy,
                             'change_type'   => 1,
                             'remark'        => '商铺钱包余额减少'
                         ]);
-
-                        //二级
-                        $promoter_2 = User::where('id', $order['second_leader'])->find(); //给推广者增加佣金
-                        if($promoter_2){
-                            $earnings = User::where('id', $order['second_leader'])->value('earnings'); //给推广者增加佣金
-                            $money = $order['total_amount'] * $order['team_second_fee'] / 100;
+                            
+                        }
+                        
+                        //获取店铺
+                        
+                        $promoter = User::where('id', $order['first_leader'])->find(); //查询推广者
+                    if($promoter){
+                        
+                         if(!$promoter["is_team"]){ //不是团队就直接分账
+                            $earnings = User::where('id', $order['first_leader'])->value('earnings'); //给推广者增加佣金
+                            $money = $order['total_amount'] * $order['trade_promotion_fee'] / 100;
                             User::update([
                                 'earnings'    => $earnings + $money,
                                 'update_time' => $time,
-                                'id' => $order['second_leader']
+                                'id' => $order['first_leader']
                             ]);
-
-
+                            
+                            
                             Shop::update([
                                 'wallet'    => $wallet - $money,
                                 'update_time' => $time,
                                 'id' => $order['sid']
-                            ]);
-
+                                ]);
+            
                             // 记录流水
                             AccountLog::create([
                                 'log_sn'        => createSn('account_log', 'log_sn', '', 4),
-                                'user_id'       => $order['second_leader'],
+                                'user_id'       => $order['first_leader'],
                                 'source_type'   => AccountLog::distribution_inc_earnings,
                                 'source_id'     => $order['id'],
                                 'source_sn'     => $order['order_sn'],
@@ -303,31 +219,27 @@ class  Order extends Api
                                 'change_type'   => 1,
                                 'remark'        => '商铺钱包余额减少'
                             ]);
-                        }
-
-
-                        //三级
-                        $promoter_3 = User::where('id', $order['third_leader'])->find(); //给推广者增加佣金
-                        if($promoter_3){
-                            $earnings = User::where('id', $order['third_leader'])->value('earnings'); //给推广者增加佣金
-                            $money = $order['total_amount'] * $order['team_third_fee'] / 100;
+                        }else{ //如果是团队需要按三级分成
+                            //一级
+                            $earnings = User::where('id', $order['first_leader'])->value('earnings'); //给推广者增加佣金
+                            $money = $order['total_amount'] * $order['team_first_fee'] / 100;
                             User::update([
                                 'earnings'    => $earnings + $money,
                                 'update_time' => $time,
-                                'id' => $order['third_leader']
+                                'id' => $order['first_leader']
                             ]);
-
-
+                            
+                            
                             Shop::update([
                                 'wallet'    => $wallet - $money,
                                 'update_time' => $time,
                                 'id' => $order['sid']
-                            ]);
-
+                                ]);
+            
                             // 记录流水
                             AccountLog::create([
                                 'log_sn'        => createSn('account_log', 'log_sn', '', 4),
-                                'user_id'       => $order['third_leader'],
+                                'user_id'       => $order['first_leader'],
                                 'source_type'   => AccountLog::distribution_inc_earnings,
                                 'source_id'     => $order['id'],
                                 'source_sn'     => $order['order_sn'],
@@ -348,28 +260,116 @@ class  Order extends Api
                                 'change_type'   => 1,
                                 'remark'        => '商铺钱包余额减少'
                             ]);
+                            
+                            //二级
+                            $promoter_2 = User::where('id', $order['second_leader'])->find(); //给推广者增加佣金
+                            if($promoter_2){
+                                $earnings = User::where('id', $order['second_leader'])->value('earnings'); //给推广者增加佣金
+                                $money = $order['total_amount'] * $order['team_second_fee'] / 100;
+                                User::update([
+                                    'earnings'    => $earnings + $money,
+                                    'update_time' => $time,
+                                    'id' => $order['second_leader']
+                                ]);
+                                
+                                
+                                Shop::update([
+                                    'wallet'    => $wallet - $money,
+                                    'update_time' => $time,
+                                    'id' => $order['sid']
+                                    ]);
+                
+                                // 记录流水
+                                AccountLog::create([
+                                    'log_sn'        => createSn('account_log', 'log_sn', '', 4),
+                                    'user_id'       => $order['second_leader'],
+                                    'source_type'   => AccountLog::distribution_inc_earnings,
+                                    'source_id'     => $order['id'],
+                                    'source_sn'     => $order['order_sn'],
+                                    'change_amount' => $money,
+                                    'left_amount'   => $earnings+$money,
+                                    'change_type'   => 1,
+                                    'remark'        => '推广佣金增加'
+                                ]);
+                                // 记录流水
+                                AccountLog::create([
+                                    'log_sn'        => createSn('account_log', 'log_sn', '', 4),
+                                    'user_id'       => $order['uid'],
+                                    'source_type'   => AccountLog::shop_reduce_wallet,
+                                    'source_id'     => $order['id'],
+                                    'source_sn'     => $order['order_sn'],
+                                    'change_amount' => $money,
+                                    'left_amount'   => $wallet - $money,
+                                    'change_type'   => 1,
+                                    'remark'        => '商铺钱包余额减少'
+                                ]);
+                            }
+                            
+                            
+                            //三级
+                            $promoter_3 = User::where('id', $order['third_leader'])->find(); //给推广者增加佣金
+                            if($promoter_3){
+                                $earnings = User::where('id', $order['third_leader'])->value('earnings'); //给推广者增加佣金
+                                $money = $order['total_amount'] * $order['team_third_fee'] / 100;
+                                User::update([
+                                    'earnings'    => $earnings + $money,
+                                    'update_time' => $time,
+                                    'id' => $order['third_leader']
+                                ]);
+                                
+                                
+                                Shop::update([
+                                    'wallet'    => $wallet - $money,
+                                    'update_time' => $time,
+                                    'id' => $order['sid']
+                                    ]);
+                
+                                // 记录流水
+                                AccountLog::create([
+                                    'log_sn'        => createSn('account_log', 'log_sn', '', 4),
+                                    'user_id'       => $order['third_leader'],
+                                    'source_type'   => AccountLog::distribution_inc_earnings,
+                                    'source_id'     => $order['id'],
+                                    'source_sn'     => $order['order_sn'],
+                                    'change_amount' => $money,
+                                    'left_amount'   => $earnings+$money,
+                                    'change_type'   => 1,
+                                    'remark'        => '推广佣金增加'
+                                ]);
+                                // 记录流水
+                                AccountLog::create([
+                                    'log_sn'        => createSn('account_log', 'log_sn', '', 4),
+                                    'user_id'       => $order['uid'],
+                                    'source_type'   => AccountLog::shop_reduce_wallet,
+                                    'source_id'     => $order['id'],
+                                    'source_sn'     => $order['order_sn'],
+                                    'change_amount' => $money,
+                                    'left_amount'   => $wallet - $money,
+                                    'change_type'   => 1,
+                                    'remark'        => '商铺钱包余额减少'
+                                ]);
+                            }
+                            
                         }
-
+                        
+                        
                     }
+                    
+                    
+                } ///入驻店铺结束
+                
+               
+                
+                
+                //更新订单推广状态
+                Morder::update([
+                    'promotion_settle'    => 1,
+                    'update_time' => $time,
+                    'id' => $order['id']
+                    ]);
 
-
-                }
-
-
-            } ///入驻店铺结束
-
-
-
-
-            //更新订单推广状态
-            Morder::update([
-                'promotion_settle'    => 1,
-                'update_time' => $time,
-                'id' => $order['id']
-            ]);
-
-        }
-
+            }
+         
         //var_dump($promotionOrders);die();
         return JsonServer::success('获取成功', $promotionOrders);
     }
@@ -421,9 +421,9 @@ class  Order extends Api
     }
 //   public function getOrder1()
 //     {
-
+      
 //         $detail = OrderLogic::billions();
-
+       
 //     }
     /**
      * @notes 取消订单
@@ -455,7 +455,7 @@ class  Order extends Api
         if (empty($order_id)) {
             return JsonServer::error('参数错误');
         }
-        $result = OrderLogic::billions($order_id);
+         $result = OrderLogic::billions($order_id);
         if($result === -2){
             return JsonServer::error('账户被禁用');
         }
@@ -576,22 +576,22 @@ class  Order extends Api
         $result = OrderInvoiceLogic::getInvoiceDetailByOrderId($id);
         return JsonServer::success('获取成功', $result);
     }
-
-
-    /*提交集采订单*/
-    public function submitJicai(){
-        $post = $this->request->post();
-        $post["user_id"] = $this->user_id;
-        $post["status"] = 0;
-        $post["create_time"] = time();
-        $post["get_time"] = strtotime($post["get_time"]);
-        $res = Db::name("jicai")->insert($post);
-        if($res){
-            return JsonServer::success('提交成功');
-        }
-
-    }
-
+	
+	
+	/*提交集采订单*/
+	public function submitJicai(){
+		$post = $this->request->post();
+		$post["user_id"] = $this->user_id;
+		$post["status"] = 0;
+		$post["create_time"] = time();
+		$post["get_time"] = strtotime($post["get_time"]);
+		$res = Db::name("jicai")->insert($post);
+		if($res){
+			return JsonServer::success('提交成功');
+		}
+		
+	}
+	
     /**
      * 获取物流地址
      */
@@ -616,14 +616,14 @@ class  Order extends Api
             return JsonServer::success('获取成功', $result);
         } else if (isset($result['returnCode']) && $result['returnCode'] != 200) {
             return JsonServer::success('获取成功', []);
-        }
-
-
-
-
+        } 
+        
+         
+        
+        
         //dump(123);die;
         // if ($result['returnCode'] == 200) {
-
+            
         // }
     }
 
diff --git a/app/api/controller/OrderInvoice.php b/app/api/controller/OrderInvoice.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Pay.php b/app/api/controller/Pay.php
old mode 100644
new mode 100755
index be866f76..3d8e7215
--- a/app/api/controller/Pay.php
+++ b/app/api/controller/Pay.php
@@ -38,16 +38,6 @@ class Pay extends Api
     {
         $user_id = $this->user_id;
         $post = $this->request->post();
-        if(isset($post['p_id'])){
-            $p_id = $post['p_id'];
-        }else{
-            $p_id = 0;
-        }
-        if(isset($post['set'])){
-            $set_id = $post['set'];
-        }else{
-            $set_id = 0;
-        }
         if(!isset($post['pay_way'])) {
             return JsonServer::error('请选择支付方式');
         }
@@ -98,7 +88,7 @@ class Pay extends Api
         }
         switch ($pay_way) {
             case OrderEnum::PAY_WAY_BALANCE://余额支付
-                $result = PayLogic::balancePay($post['order_id'], $post['from'],$p_id,$set_id);
+                $result = PayLogic::balancePay($post['order_id'], $post['from']);
                 break;
             case OrderEnum::PAY_WAY_WECHAT://微信支付
                 $result = PayLogic::wechatPay($post['order_id'], $post['from'],$payment_method, $this->client);
@@ -122,6 +112,14 @@ class Pay extends Api
         return $result;
 
     }
+   public  function localPay()
+    {
+        $user_id = $this->user_id;
+        $post = $this->request->post();
+        $result = PayLogic::localWxPay($user_id,$post, $this->client);
+        return $result;
+
+    }
 
 
 
diff --git a/app/api/controller/Pc.php b/app/api/controller/Pc.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Policy.php b/app/api/controller/Policy.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Procurement.php b/app/api/controller/Procurement.php
old mode 100644
new mode 100755
index bf2e618e..6569ce56
--- a/app/api/controller/Procurement.php
+++ b/app/api/controller/Procurement.php
@@ -172,6 +172,7 @@ class Procurement extends Api
             $data['set_update']= date('Y-m-d H:i:s');
             $data['set_dtime']= date('Y-m-d H:i:s');
             //  var_dump($data);die;
+      
             $MprocurementsetModel = new Procurementset();
             $result = $MprocurementsetModel->insertGetId($data);
             if($result){
@@ -240,33 +241,33 @@ class Procurement extends Api
         }
 
     }
-    /**
+        /**
      *生成推广微信二维码
      */
     public function makeMyWxImage(){
         $user_id = $this->user_id;
-//        $url = $this->request->get('url');
+        // $url = $this->request->get('url');
         $user_msg = User::where("id",$user_id)->where("del",0)->where("disable",0)->find();
         if($user_msg==null){
             return JsonServer::error('暂无用户');
         }
-        if ($user_msg['wx_image']!=null && $user_msg['wx_image']!="") {
-            $data['wx_image'] = $user_msg['wx_image'];
-            return JsonServer::success('查询成功',$data);
-        }else{
+        // if ($user_msg['wx_image']!=null && $user_msg['wx_image']!="") {
+        //     $data['wx_image'] = $user_msg['wx_image'];
+        //     return JsonServer::success('查询成功',$data);
+        // }else{
             $url = "pages/index/index";
             $save_dir = ROOT_PATH .'/uploads/wximage/';
             $scene = 'invite_code='.$user_msg['distribution_code'];
             $a = time().$user_msg['distribution_code'];
             $qr_src = $a . '.jpg';
-        }
+        // }
         try {
             $config = WeChatServer::getMnpConfig();
             $app = Factory::miniProgram($config);
 
             $response = $app->app_code->getUnlimit($scene, [
                 'page'  => $url
-                // 'env_version' => 'trial',
+                // 'env_version' => 'trial'
                 // 'env_version' => 'develop'
             ]);
             // print_r("<pre>");
@@ -282,6 +283,7 @@ class Procurement extends Api
                     return JsonServer::error('查询失败');
                 }
             }
+           
             if(isset($response['errcode']) && 41030 === $response['errcode']){
                 return '商城小程序未上线或商城小程序页面发布';
             }
@@ -349,19 +351,19 @@ class Procurement extends Api
     {
         $user_id = $this->user_id;
         if($user_id!=0){
-            $xy = Procurementxy::where("user_id",$user_id)->where("xy_state",1)->find();
-            if($xy!=null){
-                if($xy['xy_y_price'] != 0){
-                    $data['xy_y_price'] = $xy['xy_y_price'];
-                    $data['xy_ap_state'] = $xy['xy_ap_state'];
-                    return JsonServer::success('获取成功', $data);
+                $xy = Procurementxy::where("user_id",$user_id)->where("xy_state",1)->find();
+                if($xy!=null){
+                    if($xy['xy_y_price'] != 0){
+                        $data['xy_y_price'] = $xy['xy_y_price'];
+                        $data['xy_ap_state'] = $xy['xy_ap_state'];
+                        return JsonServer::success('获取成功', $data);
+                    }else{
+                        return JsonServer::error('暂无还款');
+                    }
                 }else{
-                    return JsonServer::error('暂无还款');
+                    return JsonServer::error('暂无额度');
                 }
-            }else{
-                return JsonServer::error('暂无额度');
-            }
-
+           
         }else{
             return JsonServer::error('参数错误');
         }
@@ -410,105 +412,105 @@ class Procurement extends Api
     {
         $user_id = $this->user_id;
         $dt = $this->request->get('dt');
-        $procurementxy = Procurementxy::where("user_id",$user_id)->where("xy_y_state",1)->where("xy_state",1)->find();
-        if($procurementxy!=null){
-            $procurementxyset = Procurementxyset::where("s_state",1)->find();
-            if($procurementxyset == null){
-                return JsonServer::error('暂无数据');
-            }
-            $f = round($procurementxy['xy_y_price']/$dt,2);
-            $arr = array();
-            for($i=0;$i<$dt;$i++){
-                $x = $i + 1;
-                if($i+1 == $dt){
-                    $p = round($procurementxy['xy_y_price']- $i*$f,2);
-                    $p1 = round($p*$procurementxyset['s_content'],2);
-                    $arr[$i]['xp_price'] = $p;
-                    $arr[$i]['xp_interest'] =  $p1;
-                    $arr[$i]['xp_aprice'] = round($p + $p1,2);
-                    $arr[$i]['xp_price_time'] = date("Y-m-d",strtotime("+".$x."month") );
-                }else{
-                    $p1 = round($f*$procurementxyset['s_content'],2);;
-                    $arr[$i]['xp_price'] = $f;
-                    $arr[$i]['xp_interest'] = $p1;
-                    $arr[$i]['xp_aprice'] = round($f+$p1,2);
-                    $arr[$i]['xp_price_time'] = date("Y-m-d",strtotime("+".$x."month") );
+            $procurementxy = Procurementxy::where("user_id",$user_id)->where("xy_y_state",1)->where("xy_state",1)->find();
+            if($procurementxy!=null){
+                $procurementxyset = Procurementxyset::where("s_state",1)->find();
+                if($procurementxyset == null){
+                    return JsonServer::error('暂无数据');
                 }
+                $f = round($procurementxy['xy_y_price']/$dt,2);
+                $arr = array();
+                for($i=0;$i<$dt;$i++){
+                    $x = $i + 1;
+                    if($i+1 == $dt){
+                        $p = round($procurementxy['xy_y_price']- $i*$f,2);
+                        $p1 = round($p*$procurementxyset['s_content'],2);
+                        $arr[$i]['xp_price'] = $p;
+                        $arr[$i]['xp_interest'] =  $p1;
+                        $arr[$i]['xp_aprice'] = round($p + $p1,2);
+                        $arr[$i]['xp_price_time'] = date("Y-m-d",strtotime("+".$x."month") );
+                    }else{
+                        $p1 = round($f*$procurementxyset['s_content'],2);;
+                        $arr[$i]['xp_price'] = $f;
+                        $arr[$i]['xp_interest'] = $p1;
+                        $arr[$i]['xp_aprice'] = round($f+$p1,2);
+                        $arr[$i]['xp_price_time'] = date("Y-m-d",strtotime("+".$x."month") );
+                    }
+                }
+                $data['data'] = $arr;
+                return JsonServer::success('查询成功',$data);
+            }else{
+                return JsonServer::error('当前无需还款');
             }
-            $data['data'] = $arr;
-            return JsonServer::success('查询成功',$data);
-        }else{
-            return JsonServer::error('当前无需还款');
-        }
     }
     // 提交分期
     public function byStagesSubmit()
     {
         $user_id = $this->user_id;
         $dt = $this->request->get('dt');
-        $procurementxy = Procurementxy::where("user_id",$user_id)->where("xy_y_state",1)->where("xy_state",1)->find();
-        if($procurementxy!=null){
-            if($procurementxy['xy_ap_state'] == 1){
-                return JsonServer::error('当前还有额度未归还，请先归还额度');
-            }
-            $procurementxyset = Procurementxyset::where("s_state",1)->find();
-            if($procurementxyset == null){
-                return JsonServer::error('暂无数据');
-            }
-            $f = round($procurementxy['xy_y_price']/$dt,2);
-            $arr = array();
-            for($i=0;$i<$dt;$i++){
-                $x = $i + 1;
-                if($i+1 == $dt){
-                    $p = rand($procurementxy['xy_y_price']- $i*$f,2);
-                    $p1 = round($p*$procurementxyset['s_content'],2);
-                    $arr[$i]['xp_price'] = $p;
-                    $arr[$i]['xp_interest'] = $p1;
-                    $arr[$i]['xp_aprice'] = $p + $p1;
-                    $arr[$i]['xp_dtime'] = date("Y-m-d H:i:s");
-                    $arr[$i]['xp_price_time'] = date("Y-m-d",strtotime("+".$x."month") );
-                }else{
-                    $p1 = round($f*$procurementxyset['s_content'],2);;
-                    $arr[$i]['xp_price'] = $f;
-                    $arr[$i]['xp_interest'] = $p1;
-                    $arr[$i]['xp_aprice'] = $f+$p1;
-                    $arr[$i]['xp_dtime'] = date("Y-m-d H:i:s");
-                    $arr[$i]['xp_price_time'] = date("Y-m-d",strtotime("+".$x."month") );
+            $procurementxy = Procurementxy::where("user_id",$user_id)->where("xy_y_state",1)->where("xy_state",1)->find();
+            if($procurementxy!=null){
+                if($procurementxy['xy_ap_state'] == 1){
+                    return JsonServer::error('当前还有额度未归还，请先归还额度');
                 }
-            }
-            $re_procurementxy = Procurementxy::where("user_id",$user_id)->update(['xy_ap_state'=>1]);
-            if(!$re_procurementxy){
-                return JsonServer::error('数据出现错误');
-            }
-            $procurementxyallpriceModel = new Procurementxyallprice();
-            $data['user_id'] = $user_id;
-            $data['xy_price'] = $procurementxy['xy_y_price'];
-            $data['xy_interest'] = $procurementxy['xy_y_price']*$procurementxyset['s_content'];
-            $data['xy_allprice'] = $data['xy_interest'] + $procurementxy['xy_y_price'];
-            $data['xy_qishu'] = $dt;
-            $data['ap_dtime'] = date("Y-m-d H:i:s");
-            $ap_id = $procurementxyallpriceModel->insertGetId($data);
-            if(!$ap_id){
-                return JsonServer::error('数据异常');
-            }
-            $procurementxypriceModel = new Procurementxyprice();
-            if(!empty($arr)){
-                foreach($arr as $key=>$value){
-                    $arr[$key]['ap_id'] = $ap_id;
+                $procurementxyset = Procurementxyset::where("s_state",1)->find();
+                if($procurementxyset == null){
+                    return JsonServer::error('暂无数据');
                 }
-                $procurementxypriceModel->saveall($arr);
+                $f = round($procurementxy['xy_y_price']/$dt,2);
+                $arr = array();
+                for($i=0;$i<$dt;$i++){
+                    $x = $i + 1;
+                    if($i+1 == $dt){
+                        $p = rand($procurementxy['xy_y_price']- $i*$f,2);
+                        $p1 = round($p*$procurementxyset['s_content'],2);
+                        $arr[$i]['xp_price'] = $p;
+                        $arr[$i]['xp_interest'] = $p1;
+                        $arr[$i]['xp_aprice'] = $p + $p1;
+                        $arr[$i]['xp_dtime'] = date("Y-m-d H:i:s");
+                        $arr[$i]['xp_price_time'] = date("Y-m-d",strtotime("+".$x."month") );
+                    }else{
+                        $p1 = round($f*$procurementxyset['s_content'],2);;
+                        $arr[$i]['xp_price'] = $f;
+                        $arr[$i]['xp_interest'] = $p1;
+                        $arr[$i]['xp_aprice'] = $f+$p1;
+                        $arr[$i]['xp_dtime'] = date("Y-m-d H:i:s");
+                        $arr[$i]['xp_price_time'] = date("Y-m-d",strtotime("+".$x."month") );
+                    }
+                }
+                $re_procurementxy = Procurementxy::where("user_id",$user_id)->update(['xy_ap_state'=>1]);
+                if(!$re_procurementxy){
+                    return JsonServer::error('数据出现错误');
+                }
+                $procurementxyallpriceModel = new Procurementxyallprice();
+                $data['user_id'] = $user_id;
+                $data['xy_price'] = $procurementxy['xy_y_price'];
+                $data['xy_interest'] = $procurementxy['xy_y_price']*$procurementxyset['s_content'];
+                $data['xy_allprice'] = $data['xy_interest'] + $procurementxy['xy_y_price'];
+                $data['xy_qishu'] = $dt;
+                $data['ap_dtime'] = date("Y-m-d H:i:s");
+                $ap_id = $procurementxyallpriceModel->insertGetId($data);
+                if(!$ap_id){
+                    return JsonServer::error('数据异常');
+                }
+                $procurementxypriceModel = new Procurementxyprice();
+                if(!empty($arr)){
+                    foreach($arr as $key=>$value){
+                        $arr[$key]['ap_id'] = $ap_id;
+                    }
+                    $procurementxypriceModel->saveall($arr);
+                }
+                return JsonServer::success('分期成功');
+            }else{
+                return JsonServer::error('当前无需还款');
             }
-            return JsonServer::success('分期成功');
-        }else{
-            return JsonServer::error('当前无需还款');
-        }
     }
 // 一次结清
     public function checkSettleStages()
     {
         $user_id = $this->user_id;
-        $procurementxyallprice= Procurementxyallprice::where("user_id",$user_id)->where("ap_state",0)->find();
-        if($procurementxyallprice!=null){
+            $procurementxyallprice= Procurementxyallprice::where("user_id",$user_id)->where("ap_state",0)->find();
+       if($procurementxyallprice!=null){
             $procurementxyprice= Procurementxyprice::where("ap_id",$procurementxyallprice['ap_id'])->where('xp_state',0)->select();
             $total =$xp_price=$xp_interest= "0.00";
             foreach($procurementxyprice as $key=>$value){
@@ -531,30 +533,30 @@ class Procurement extends Api
                 return JsonServer::error('当前无需还款');
             }
         }
-
+     
     }
     // 查询当前还款
     public function checkNowxy(){
         $user_id = $this->user_id;
-        $procurementxyallprice= Procurementxyallprice::where("user_id",$user_id)->where("ap_state",0)->find();
-        if($procurementxyallprice!=null){
-            $procurementxyprice= Procurementxyprice::where("ap_id",$procurementxyallprice['ap_id'])->select();
-            $procurementxyprice = json_decode($procurementxyprice);
-            return JsonServer::success('查询成功',$procurementxyprice);
-        }else{
-            return JsonServer::error('暂无记录');
-        }
+            $procurementxyallprice= Procurementxyallprice::where("user_id",$user_id)->where("ap_state",0)->find();
+            if($procurementxyallprice!=null){
+                $procurementxyprice= Procurementxyprice::where("ap_id",$procurementxyallprice['ap_id'])->select();
+                $procurementxyprice = json_decode($procurementxyprice);
+                return JsonServer::success('查询成功',$procurementxyprice);
+            }else{
+                return JsonServer::error('暂无记录');
+            }
     }
     // 查询还款记录
     public function checkNowxyList(){
         $user_id = $this->user_id;
-        $procurementxyrpay= Procurementxyrpay::where("user_id",$user_id)->where('rpay_state',1)->order("dtime desc")->select();
-        if(!empty($procurementxyrpay)){
-            $procurementxyrpay = json_decode($procurementxyrpay);
-            return JsonServer::success('查询成功',$procurementxyrpay);
-        }else{
-            return JsonServer::error('暂无记录');
-        }
+            $procurementxyrpay= Procurementxyrpay::where("user_id",$user_id)->where('rpay_state',1)->order("dtime desc")->select();
+            if(!empty($procurementxyrpay)){
+                $procurementxyrpay = json_decode($procurementxyrpay);
+                return JsonServer::success('查询成功',$procurementxyrpay);
+            }else{
+                return JsonServer::error('暂无记录');
+            }
     }
     // 查询协议
     public function checkTreaty()
diff --git a/app/api/controller/Recharge.php b/app/api/controller/Recharge.php
old mode 100644
new mode 100755
index d72b4312..4df42db8
--- a/app/api/controller/Recharge.php
+++ b/app/api/controller/Recharge.php
@@ -35,8 +35,8 @@ class Recharge extends Api
         }
         return JsonServer::success('', $result);
     }
-
-    /**
+	
+	/**
      * 卡密核销
      */
     public function kamihexiao(){
@@ -60,7 +60,7 @@ class Recharge extends Api
         $result =  RechargeLogic::rechargeRecord($get);
         return JsonServer::success('', $result);
     }
-
+    
     /**
      * 提现记录
      */
diff --git a/app/api/controller/SearchRecord.php b/app/api/controller/SearchRecord.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/SeckillGoods.php b/app/api/controller/SeckillGoods.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Setting.php b/app/api/controller/Setting.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Share.php b/app/api/controller/Share.php
old mode 100644
new mode 100755
index 560ac342..ce3d15f0
--- a/app/api/controller/Share.php
+++ b/app/api/controller/Share.php
@@ -25,11 +25,9 @@ class Share extends Api
 
         $id = $this->request->get('id');
         $url = $this->request->get('url');
-        $p_id = $this->request->get('p_id',0);
-        $set_id = $this->request->get('set',0);
         $client = $this->client;
         if ($id && $url) {
-            $result = ShareLogic::shareGoods($this->user_id, $id, $url,$p_id,$set_id, $client);
+            $result = ShareLogic::shareGoods($this->user_id, $id, $url, $client);
             return $result;
         }
         return JsonServer::error('参数缺失');
diff --git a/app/api/controller/Shop.php b/app/api/controller/Shop.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/ShopApply.php b/app/api/controller/ShopApply.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/ShopCategory.php b/app/api/controller/ShopCategory.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/ShopFollow.php b/app/api/controller/ShopFollow.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/ShopGoodsCategory.php b/app/api/controller/ShopGoodsCategory.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Sign.php b/app/api/controller/Sign.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Sms.php b/app/api/controller/Sms.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Subscribe.php b/app/api/controller/Subscribe.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Team.php b/app/api/controller/Team.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Test.php b/app/api/controller/Test.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/User.php b/app/api/controller/User.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/UserAddress.php b/app/api/controller/UserAddress.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Wechat.php b/app/api/controller/Wechat.php
old mode 100644
new mode 100755
diff --git a/app/api/controller/Withdraw.php b/app/api/controller/Withdraw.php
old mode 100644
new mode 100755
index 5b6b9fb7..332ea04b
--- a/app/api/controller/Withdraw.php
+++ b/app/api/controller/Withdraw.php
@@ -57,8 +57,8 @@ class Withdraw extends Api
      */
     public function config()
     {
-
-        $data = WithdrawLogic::config($this->user_id);
+        $hide = $this->request->get('hide');
+        $data = WithdrawLogic::config($this->user_id, $hide);
         return JsonServer::success('', $data);
     }
 
diff --git a/app/api/http/middleware/Login.php b/app/api/http/middleware/Login.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/ActivityAreaLogic.php b/app/api/logic/ActivityAreaLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/AdLogic.php b/app/api/logic/AdLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/AfterSaleLogic.php b/app/api/logic/AfterSaleLogic.php
old mode 100644
new mode 100755
index 4c3c56e9..331d1833
--- a/app/api/logic/AfterSaleLogic.php
+++ b/app/api/logic/AfterSaleLogic.php
@@ -313,7 +313,7 @@ class AfterSaleLogic extends Logic
         $where = ['order_id' => $order_id, 'item_id' => $item_id];
         $info = $goods->where($where)->find()->toArray();
         $goods['image'] = isset($info['image']) ? UrlServer::getFileUrl($info['image']) : '';
-        $data = [
+       $data = [
             'goods' => $info,
             'reason' => AfterSale::getReasonLists(),
         ];
@@ -500,19 +500,20 @@ class AfterSaleLogic extends Logic
                 $user_id,
                 AfterSaleLog::USER_AGAIN_REFUND
             );
-
-            $order = Order::with('shop')->where(['id' => $after_sale['order_id']])->find();
+            
+            $order = Order::with('shop')->where(['id' => $post['order_id']])->find();
             if (!empty($order['shop']['mobile'])) {
                 //通知商家
                 event('Notice', [
-                    'scene' => NoticeEnum::AFTER_SALE_NOTICE_SHOP,
+                    'scene' => NoticeEnum::AFTER_SALE_NOTICE_SHOP_REFUND,
                     'mobile' => $order['shop']['mobile'],
                     'params' => [
                         'user_id' => $user_id,
-                        'after_sale_sn' => $after_sale['sn']
+                        'after_sale_sn' => $data['sn']
                     ]
                 ]);
             }
+
             Db::commit();
             return ['after_sale_id' => $id];
         } catch (Exception $e) {
diff --git a/app/api/logic/ArticleLogic.php b/app/api/logic/ArticleLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/BargainLogic.php b/app/api/logic/BargainLogic.php
old mode 100644
new mode 100755
index 7aa34faf..879fccb7
--- a/app/api/logic/BargainLogic.php
+++ b/app/api/logic/BargainLogic.php
@@ -431,7 +431,7 @@ class BargainLogic extends Logic
         $bargain_launch = new BargainLaunch();
         $bargain_launch = $bargain_launch
             ->where(['id' => $id])
-            ->with('bargain_knife.procurement')
+            ->with('bargain_knife.user')
             ->append(['item_id', 'image', 'name', 'price', 'spec_value_str', 'over_time', 'diff_price', 'activity_price', 'progress', 'knife_list', 'knife_price', 'share_titles', 'share_intros'])
             ->find();
         //砍价快照
diff --git a/app/api/logic/BillionsLogic.php b/app/api/logic/BillionsLogic.php
old mode 100644
new mode 100755
index 1efb80e4..c79119d5
--- a/app/api/logic/BillionsLogic.php
+++ b/app/api/logic/BillionsLogic.php
@@ -44,6 +44,13 @@ class BillionsLogic extends Logic
             $where[] = ['b.state', '=', 0];
         }
 
+        // $list = Billions::alias('b')->where($where)
+        //     ->leftjoin('order o', 'o.id = b.order_id')
+        //     ->leftjoin('goods g', 'g.id = b.goods_id')
+        //     ->leftjoin('shop s', 's.id = b.shop_id')
+        //     ->field('b.*, o.order_sn, s.name')
+        //     ->page($page,$size)->select();
+        
         if ($state == 1) {
             $list = Billions::alias('b')->where($where)->order('billions_id', 'desc')
                 ->page($page,$size)->select();
@@ -156,22 +163,22 @@ class BillionsLogic extends Logic
     {
         // 手续费
         $data['commission'] = self::COMMISSION . '%';
-
+  
         // 最小充值金额
         $data['min_recharge'] = self::MIN_RECHARGE;
         // 最小提现金额
         $data['min_withdraw'] = self::MINIMUM_WITHDRAWAL;
-
+        
         // 充值金额规则
         $data['recharge_rule'] =
-            '   <p>
-                <b>充值规则</b>
+        '   <p>
+                <b>充值到本地余额能参与百亿返补，余额提现参考余额规则</b>
             </p> 
         ';
-
+        
         // 提现金额规则
         $data['withdrawl_rule'] =
-            '   <p>
+        '   <p>
                 <b>提现规则</b>
             </p> 
             <p>提现手续费 10%</p>
@@ -249,12 +256,12 @@ class BillionsLogic extends Logic
                 $suffix .= $pool[array_rand($pool)];
             }
         }
-        return $prefix . date('YmdHis') . $suffix;
+       return $prefix . date('YmdHis') . $suffix;
     }
-
+    
     public static function applyBillionsBalance($user_id, $post)
     {
-
+        
         $money = $post['money'];
         $check = self::checkBalance($user_id, $money);
 
@@ -321,7 +328,7 @@ class BillionsLogic extends Logic
         $data['type'] = 3; // 类型是充值
         $data['subsidy_price'] = round($money * $user_subsidy / 100,8);
         $res = Db::name("user_billions")->save($data);
-
+      
         $subsidy = $money * $all_user_subsidy / 100;
         if($is_d != null){
             $ufl =  round($subsidy*$user_first_leader/100,8);
@@ -382,8 +389,8 @@ class BillionsLogic extends Logic
                             // 剩余金额
                             $ufl = round($ufl+$v['subsidy_price']-$v['order_price'],8);
                         }else{
-                            $subsidy_price_sum = round($v['subsidy_price']+$ufl,8);
-                            Db::name("user_billions")->where("billions_id",$v['billions_id'])->update(['subsidy_price'=>$subsidy_price_sum]);
+                             $subsidy_price_sum = round($v['subsidy_price']+$ufl,8);
+                             Db::name("user_billions")->where("billions_id",$v['billions_id'])->update(['subsidy_price'=>$subsidy_price_sum]);
                             // Db::name("user_billions")->where("billions_id",$v['billions_id'])->inc("subsidy_price",$ufl)->update();
                             $ufl = 0;
                         }
@@ -501,25 +508,28 @@ class BillionsLogic extends Logic
 
                     // 剩余数量
                     $residue_count = $user_start_num - $k - 1;
-                    // 剩余金额
-                    $residue_price = round($arr[$k]+$v['subsidy_price']-$v['order_price'],8);
-                    foreach($arr as $k1=>$v1){
-                        if($k1 > $k){
-                            $residue_price+=$arr[$k1];
-                        }
-                    }
-
-                    $average = round($residue_price/$residue_count,8);
-                    $last = round($residue_price - $average*($residue_count-1),8);
-                    foreach($arr as $k1=>$v1){
-                        if($k1+1 == $user_start_num){
-                            $arr[$k1] = $last;
-                        }else{
+                    if($residue_count != 0){
+                         // 剩余金额
+                        $residue_price = round($arr[$k]+$v['subsidy_price']-$v['order_price'],8);
+                        foreach($arr as $k1=>$v1){
                             if($k1 > $k){
-                                $arr[$k1] = $average;
+                                $residue_price+=$arr[$k1];
+                            }
+                        }
+    
+                        $average = round($residue_price/$residue_count,8);
+                        $last = round($residue_price - $average*($residue_count-1),8);
+                        foreach($arr as $k1=>$v1){
+                            if($k1+1 == $user_start_num){
+                                $arr[$k1] = $last;
+                            }else{
+                                if($k1 > $k){
+                                    $arr[$k1] = $average;
+                                }
                             }
                         }
                     }
+                   
 
                 }else{
                     // $subp = round($v['subsidy_price']+$arr[$k],6);
@@ -586,24 +596,27 @@ class BillionsLogic extends Logic
 
                     // 剩余数量
                     $residue_count = $count-$user_start_num - $k+$user_start_num - 1;
-                    // 剩余金额
-                    $residue_price = round($arr1[$k-$user_start_num]+$v['subsidy_price']-$v['order_price'],8);
-                    foreach($arr1 as $k1=>$v1){
-                        if($k1 > $k - $user_start_num){
-                            $residue_price+=$arr1[$k1];
+                    if($residue_count!=0){
+                           // 剩余金额
+                        $residue_price = round($arr1[$k-$user_start_num]+$v['subsidy_price']-$v['order_price'],8);
+                        foreach($arr1 as $k1=>$v1){
+                            if($k1 > $k - $user_start_num){
+                                $residue_price+=$arr1[$k1];
+                            }
                         }
-                    }
-                    $average = round($residue_price/$residue_count,8);
-                    $last = round($residue_price - $average*($residue_count-1),8);
-                    foreach($arr1 as $k1=>$v1){
-                        if($k1+1 == $count-$user_start_num){
-                            $arr1[$k1] = $last;
-                        }else{
-                            if($k1 > $k){
-                                $arr[$k1] = $average;
+                        $average = round($residue_price/$residue_count,8);
+                        $last = round($residue_price - $average*($residue_count-1),8);
+                        foreach($arr1 as $k1=>$v1){
+                            if($k1+1 == $count-$user_start_num){
+                                $arr1[$k1] = $last;
+                            }else{
+                                if($k1 > $k){
+                                    $arr[$k1] = $average;
+                                }
                             }
                         }
                     }
+                 
                 }else{
                     //  $subp =  round($v['subsidy_price']+$arr1[$k-$user_start_num],6);
                     //  $billion_arr.="  when ".$v['billions_id']." then '".$subp."'";
@@ -622,13 +635,13 @@ class BillionsLogic extends Logic
         // // var_dump($billion_arr);
         // // var_dump($billion_arr_id);die;
         // $billion_arr_id = implode(",",$billion_arr_id);
-        // $sql = "UPDATE `ls_user_billions`
+        // $sql = "UPDATE `ls_user_billions` 
         // SET subsidy_price = CASE billions_id
         //     $billion_arr
         // END
         // WHERE billions_id IN ($billion_arr_id)";
         // $query = Db::query($sql);
-
+        
         //  Db::name("billions")->updateAll($dataSet,"billions_id");
         if($is_d!=null){
             if($user['first_leader']>0){
@@ -725,7 +738,7 @@ class BillionsLogic extends Logic
         }
 
         $able_withdraw = SubsidyWithdrawal::where('user_id', $user_id)->value('total_amount');
-
+        
         // 1.如果充值金额大于余额
         if ($money > $able_withdraw) {
             return [
@@ -753,7 +766,7 @@ class BillionsLogic extends Logic
         // }
         return  ['code' => 1, 'msg' => ''];
     }
-
+    
     /**
      * @notes 百亿充值记录
      */
@@ -779,7 +792,7 @@ class BillionsLogic extends Logic
         foreach($list as &$item) {
             $item['desc'] = '充值到余额￥'. clearZero($item['order_amount']);
         }
-
+        
         $result = [
             'count' => $count,
             'lists' => $list,
@@ -790,7 +803,7 @@ class BillionsLogic extends Logic
 
         return $result;
     }
-
+    
     /**
      * @notes 百亿提现微信记录
      */
diff --git a/app/api/logic/BillionsWechatWithdrawalLogic.php b/app/api/logic/BillionsWechatWithdrawalLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/CartLogic.php b/app/api/logic/CartLogic.php
old mode 100644
new mode 100755
index 3a6a334b..11ad6b4c
--- a/app/api/logic/CartLogic.php
+++ b/app/api/logic/CartLogic.php
@@ -76,14 +76,15 @@ class CartLogic extends Logic
                         'is_pay'    => $cart['shop']['is_pay'],
                     ];
                 }
-                $goods_total_amounts = 0;
+                 $goods_total_amounts = 0;
                 $cart_msg = Cart::where('id', $cart['id'])->find();
                 $sub_price = 0; // 已选中 && 上架 && 未删除 && 规格信息不为空 && 商家支付功能开启
                 if ($cart['selected'] == 1 && $cart['goods']['status'] == 1 && $cart['goods']['del'] == 0
                     && !empty($cart['goods_item']) && $cart['shop']['is_pay'])
                 {
                     $goods_num += $cart['goods_num'];
-                    if($cart_msg['p_id']!=0){
+                  
+                  if($cart_msg['p_id']!=0){
                         if($cart_msg['w_discount'] > 0){
                             $goods_total_amounts = round($cart_msg['w_price'] * $cart_msg['basic_num']*$cart_msg['w_discount']/100 + $cart_msg['w_price']*$cart_msg['exc_num'],2);
                             $total += round($cart_msg['w_price'] * $cart_msg['basic_num']*$cart_msg['w_discount']/100 + $cart_msg['w_price']*$cart_msg['exc_num'],2);
@@ -93,17 +94,21 @@ class CartLogic extends Logic
                         }
 
                     }elseif($cart['price_type'] == "jicai_wholesale"){
+                        // var_dump(111);
                         $goods_total_amounts = round($cart['goods_item']['wholesale_pce'] * $cart['goods_num'],2);
                         $total += $cart['goods_item']['wholesale_pce'] * $cart['goods_num'];
                     }else{
+                        // var_dump(222);
                         $goods_total_amounts = round($cart['goods_item']['price'] * $cart['goods_num'],2);
                         $total += $cart['goods_item']['price'] * $cart['goods_num'];
                     }
                     $sub_price = round($cart['goods_item']['price'] * $cart['goods_num'], 2);
                 } else {
+                      $goods_total_amounts = round($cart['goods_item']['price'] * $cart['goods_num'],2);
+                    // var_dump(333);
                     $cart['selected'] = 0;
                 }
-
+// var_dump($goods_total_amounts);
                 // 设置商家选中状态; 满足条件(未选中的商品,上架,未删除,有规格信息,商家支付功能开启) 才影响商家选中状态
                 if(!$cart['selected']) {
                     if ($cart['goods']['status'] == 1 && $cart['goods']['del'] == 0
@@ -140,7 +145,7 @@ class CartLogic extends Logic
                     'price_type'              => $cart['price_type'],
                     'w_discount'              => $cart['w_discount'],
                     'exc_num'              => $cart['exc_num'],
-                    'basic_num'              => $cart['basic_num'],
+                    'basic_num'              => (int)$cart['basic_num'],
                     'goods_total_amounts'    => $goods_total_amounts
                 ];
             }
@@ -172,7 +177,7 @@ class CartLogic extends Logic
             $p_id = isset($post['p_id'])?$post['p_id']:0;
             $w_price = isset($post['w_price'])?$post['w_price']:0;
             $price_type = isset($post['price_type'])?$post['price_type']:0;
-            $basic_num = isset($post['basic_num'])?$post['basic_num']:0;
+              $basic_num = isset($post['basic_num'])?$post['basic_num']:0;
             $exc_num = isset($post['exc_num'])?$post['exc_num']:0;
             $w_discount = isset($post['w_discount'])?$post['w_discount']:0;
             $firend_invite_code = isset($post['firend_invite_code'])?$post['firend_invite_code']:0;
@@ -217,9 +222,9 @@ class CartLogic extends Logic
                     'w_price'  => $w_price,
                     'firend_invite_code' =>$firend_invite_code,
                     'price_type'=>$price_type,
-                    'basic_num'=>$basic_num,
-                    'exc_num'=>$exc_num,
-                    'w_discount'=>$w_discount
+                        'basic_num'=>$basic_num,
+                        'exc_num'=>$exc_num,
+                        'w_discount'=>$w_discount
                 ]);
             }
 
@@ -256,12 +261,12 @@ class CartLogic extends Logic
             return false;
         }
         $result = Cart::where('id',$cart_id)->find();
-        if($result['basic_num'] > 0){
+         if($result['basic_num'] > 0){
             if($goods_num < $result['basic_num']){
                 self::$error = '批发价数量不能低于选择的批发数量';
                 return false;
             }else{
-                $exc_num = $goods_num-$result['basic_num'];
+               $exc_num = $goods_num-$result['basic_num'];
                 Cart::update(['goods_num' => $goods_num,'exc_num'=>$exc_num], ['id' => $cart_id]);
             }
         }else{
diff --git a/app/api/logic/CommunityCommentLogic.php b/app/api/logic/CommunityCommentLogic.php
old mode 100644
new mode 100755
index fe434648..919e74bd
--- a/app/api/logic/CommunityCommentLogic.php
+++ b/app/api/logic/CommunityCommentLogic.php
@@ -44,7 +44,7 @@ class CommunityCommentLogic extends Logic
             'status' => CommunityCommentEnum::STATUS_SUCCESS
         ];
         $count = CommunityComment::where($where)->count();
-        $lists = CommunityComment::with(['procurement'])
+        $lists = CommunityComment::with(['user'])
             ->where($where)
             ->append(['child'])
             ->order(['like' => 'desc', 'id' => 'desc'])
@@ -91,10 +91,10 @@ class CommunityCommentLogic extends Logic
      */
     public static function getArticleData($article_id)
     {
-        $article = CommunityArticle::with(['procurement'])->findOrEmpty($article_id);
+        $article = CommunityArticle::with(['user'])->findOrEmpty($article_id);
 
         // 当前文章所有评论人
-        $reply_user = CommunityComment::with(['procurement'])
+        $reply_user = CommunityComment::with(['user'])
             ->field('id,user_id,pid')
             ->where('article_id', $article_id)
             ->select()
@@ -189,9 +189,9 @@ class CommunityCommentLogic extends Logic
     public static function getRelyData($comment, $article, $reply_user)
     {
         // 回复谁的评论
-        $comment['reply_id'] = $article['procurement']['id'];
-        $comment['reply_nickname'] = $article['procurement']['nickname'];
-        $comment['reply_avatar'] = UrlServer::getFileUrl($article['procurement']['avatar']);
+        $comment['reply_id'] = $article['user']['id'];
+        $comment['reply_nickname'] = $article['user']['nickname'];
+        $comment['reply_avatar'] = UrlServer::getFileUrl($article['user']['avatar']);
         if (!empty($comment['pid'])) {
             foreach ($reply_user as $reply) {
                 if ($reply['id'] == $comment['pid']) {
@@ -218,7 +218,7 @@ class CommunityCommentLogic extends Logic
         Db::startTrans();
         try {
 
-            $article = CommunityArticle::with(['procurement' => function($query) {
+            $article = CommunityArticle::with(['user' => function($query) {
                 $query->field(['id','nickname', 'avatar']);
             }])->findOrEmpty($post['article_id']);
 
@@ -243,7 +243,7 @@ class CommunityCommentLogic extends Logic
 
             // 上级评论id关系链
             if (!empty($post['pid'])) {
-                $relation = CommunityComment::with(['procurement'])->findOrEmpty($post['pid']);
+                $relation = CommunityComment::with(['user'])->findOrEmpty($post['pid']);
                 $ancestor = $relation->isEmpty() ? '' : trim($relation['ancestor_relation']);
                 $data['ancestor_relation'] = trim($post['pid'] . ',' . $ancestor, ',');
             }
@@ -256,7 +256,7 @@ class CommunityCommentLogic extends Logic
                 ->update();
 
             // 评论信息
-            $info = CommunityComment::with(['procurement'])
+            $info = CommunityComment::with(['user'])
                 ->withoutField(['ancestor_relation','update_time', 'del'])
                 ->where(['id' => $comment['id']])
                 ->findOrEmpty()
@@ -264,8 +264,8 @@ class CommunityCommentLogic extends Logic
             $info['avatar'] = UrlServer::getFileUrl($info['avatar']);
             $info['create_time'] = friend_date(strtotime($info['create_time']));
             $info['reply_id'] = $relation['user_id'] ?? $article['user_id'];
-            $info['reply_nickname'] = $relation['nickname'] ?? $article['procurement']['nickname'];
-            $reply_avatar = !empty($relation['avatar']) ? $relation['avatar'] : $article['procurement']['avatar'];
+            $info['reply_nickname'] = $relation['nickname'] ?? $article['user']['nickname'];
+            $reply_avatar = !empty($relation['avatar']) ? $relation['avatar'] : $article['user']['avatar'];
             $info['reply_avatar'] = UrlServer::getFileUrl($reply_avatar);
             $info['is_like'] = 0;
 
@@ -309,12 +309,12 @@ class CommunityCommentLogic extends Logic
             ];
         }
 
-        $count = CommunityComment::with(['procurement'])
+        $count = CommunityComment::with(['user'])
             ->whereFindInSet('ancestor_relation', $comment_id)
             ->where(['del' => 0, 'status' => CommunityCommentEnum::STATUS_SUCCESS])
             ->count();
 
-        $lists = CommunityComment::with(['procurement'])
+        $lists = CommunityComment::with(['user'])
             ->whereFindInSet('ancestor_relation', $comment_id)
             ->where(['del' => 0, 'status' => CommunityCommentEnum::STATUS_SUCCESS])
             ->order(['like' => 'desc'])
diff --git a/app/api/logic/CommunityLogic.php b/app/api/logic/CommunityLogic.php
old mode 100644
new mode 100755
index 0933374d..b3a4a8f6
--- a/app/api/logic/CommunityLogic.php
+++ b/app/api/logic/CommunityLogic.php
@@ -277,7 +277,7 @@ class CommunityLogic extends Logic
         $model = new CommunityArticle();
         $count = $model->where($where)->count();
         $lists = $model
-            ->with(['procurement' => function ($query) {
+            ->with(['user' => function ($query) {
                 $query->field(['id', 'nickname', 'avatar']);
             }])
             ->where($where)
@@ -285,8 +285,8 @@ class CommunityLogic extends Logic
             ->page($page, $size)
             ->order($sort)
             ->select()
-            ->bindAttr('procurement', ['nickname', 'avatar'])
-            ->hidden(['procurement'])
+            ->bindAttr('user', ['nickname', 'avatar'])
+            ->hidden(['user'])
             ->toArray();
 
         // 点赞的文章
@@ -441,7 +441,7 @@ class CommunityLogic extends Logic
     public static function detail($user_id, $id)
     {
         $result = CommunityArticle::with([
-            'images', 'procurement' => function ($query) {
+            'images', 'user' => function ($query) {
                 $query->field(['id', 'nickname', 'avatar']);
             },
             'topic' => function ($query) {
@@ -481,7 +481,7 @@ class CommunityLogic extends Logic
         $result['total_comment'] = $comment_count;
         // 当前用户是否为文章作者
         $result['is_author'] = ($user_id == $result['user_id']) ? 1 : 0;
-        $result['procurement']['avatar'] = !empty($result['procurement']['avatar']) ? UrlServer::getFileUrl($result['procurement']['avatar']) : '';
+        $result['user']['avatar'] = !empty($result['user']['avatar']) ? UrlServer::getFileUrl($result['user']['avatar']) : '';
         // 增加话题点击量
         CommunityTopic::where(['id' => $result['topic_id']])->inc('click')->update();
         // 审核状态描述
@@ -687,7 +687,7 @@ class CommunityLogic extends Logic
 
         $lists = CommunityArticle::with([
             'images',
-            'procurement' => function ($query) {
+            'user' => function ($query) {
                 $query->field(['id', 'nickname', 'avatar']);
             },
             'topic' => function ($query) {
@@ -710,7 +710,7 @@ class CommunityLogic extends Logic
         ])->column('relation_id');
 
         foreach ($lists as $item) {
-            $item['procurement']['avatar'] = UrlServer::getFileUrl($item['procurement']['avatar']);
+            $item['user']['avatar'] = UrlServer::getFileUrl($item['user']['avatar']);
             $item['create_time'] = friend_date(strtotime($item['create_time']));
             $item['total_goods'] = count($item['goods']);
             $item['total_shop'] = count($item['shop']);
@@ -860,15 +860,15 @@ class CommunityLogic extends Logic
         $field = ['id', 'image', 'content', 'like', 'status', 'create_time', 'user_id'];
 
         $count = CommunityArticle::where($article_where)->count();
-        $lists = CommunityArticle::with(['procurement' => function($query) {
+        $lists = CommunityArticle::with(['user' => function($query) {
             $query->field(['id', 'nickname', 'avatar']);
         }])->field($field)
             ->where($article_where)
             ->page($page, $size)
             ->order(['id' => 'desc', 'like' => 'desc'])
             ->select()
-            ->bindAttr('procurement', ['nickname', 'avatar'])
-            ->hidden(['procurement']);
+            ->bindAttr('user', ['nickname', 'avatar'])
+            ->hidden(['user']);
 
         foreach ($lists as $item) {
             $item['create_time'] = friend_date(strtotime($item['create_time']));
diff --git a/app/api/logic/CommunitySearchRecordLogic.php b/app/api/logic/CommunitySearchRecordLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/CommunityUserLogic.php b/app/api/logic/CommunityUserLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/CouponLogic.php b/app/api/logic/CouponLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/DistributionLogic.php b/app/api/logic/DistributionLogic.php
old mode 100644
new mode 100755
index 983ef94d..e731b560
--- a/app/api/logic/DistributionLogic.php
+++ b/app/api/logic/DistributionLogic.php
@@ -122,7 +122,7 @@ class DistributionLogic extends Logic
      */
     public static function applyDetail($userId)
     {
-        $result = DistributionMemberApply::field(['real_name','mobile','province', 'city', 'district', 'id_card', 'hand_id_card', 'reason', 'denial_reason', 'status'])
+        $result = DistributionMemberApply::field(['real_name','mobile','province', 'city', 'district', 'id_card', 'hand_id_card', 'reason', 'denial_reason', 'status', 'front_id_card', 'back_id_card'])
             ->where('user_id', $userId)
             ->order('id', 'desc')
             ->findOrEmpty();
diff --git a/app/api/logic/FootPrintLogic.php b/app/api/logic/FootPrintLogic.php
old mode 100644
new mode 100755
index 0bb51e3f..23c25e97
--- a/app/api/logic/FootPrintLogic.php
+++ b/app/api/logic/FootPrintLogic.php
@@ -31,7 +31,7 @@ class FootPrintLogic extends Logic
 
             $model = new FootprintRecord();
             $lists = $model->field(true)->where($where)
-                ->with(['procurement' => function ($query) {
+                ->with(['user' => function ($query) {
                     $query->withAttr('nickname', function ($value) {
                         if (mb_strlen($value) > 4) {
                             return mb_substr($value, 0, 4) . '**';
@@ -44,7 +44,7 @@ class FootPrintLogic extends Logic
 
             foreach ($lists as &$item) {
                 $item['template'] = self::getTemplate($item);
-                $item['procurement']['avatar'] = UrlServer::getFileUrl($item['procurement']['avatar']);
+                $item['user']['avatar'] = UrlServer::getFileUrl($item['user']['avatar']);
                 unset($item['user_id']);
                 unset($item['foreign_id']);
             }
@@ -58,7 +58,7 @@ class FootPrintLogic extends Logic
     // 获取模板
     private static function getTemplate($data)
     {
-        $nickname = $data['procurement']['nickname'].' ';
+        $nickname = $data['user']['nickname'].' ';
         $time = $data['time'];
         return $nickname.$time.$data['template'];
     }
diff --git a/app/api/logic/GoodsBrandLogic.php b/app/api/logic/GoodsBrandLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/GoodsCategoryLogic.php b/app/api/logic/GoodsCategoryLogic.php
old mode 100644
new mode 100755
index 232a7a84..1767d7b8
--- a/app/api/logic/GoodsCategoryLogic.php
+++ b/app/api/logic/GoodsCategoryLogic.php
@@ -20,48 +20,62 @@ class GoodsCategoryLogic extends Logic
         ];
         // 扫码分类
         $w = "";
-        $set_price_type = 0;
-        if($p_id != 0&&$setid!=0){
+        // if($p_id != 0&&$setid!=0){
+        //     $set = Procurementset::where("set_id",$setid)->where("set_state",1)->find();
+        //     if($set != null){
+        //         if($set['goods_onetype']!=null){
+        //             $w = " id in (".$set['goods_onetype'].")";
+        //         }
+        //     }
+        // }
+        // if($p_id != 0&&$setid==0){
+        //     $set = Procurementset::where("u_id",$p_id)->where("set_state",1)->order("set_update desc")->limit(1)->find();
+        //     if($set != null){
+        //         if($set['goods_onetype']!=null){
+        //             $w = " id in (".$set['goods_onetype'].")";
+        //         }
+        //     }
+        // }
+         if($p_id != 0&&$setid!=0){
             $set = Procurementset::where("set_id",$setid)->where("set_state",1)->find();
             if($set != null){
-                if($set['goods_twotype']!=null){
-                    $w = " id in (".$set['goods_onetype'].")";
-                }else{
-                    if($set['goods_onetype']!=null){
-                        $type_arr = "";
-                        $set_array = json_decode($set['goods_onetype'], true);
-                        foreach($set_array as $key=>$value){
-                            if($key == 0){
-                                $type_arr = $value['id'];
-                            }else{
-                                $type_arr.= ",".$value['id'];
-                            }
+                if($set['goods_onetype']!=null){
+                    $type_arr = "";
+                    $set_array = json_decode($set['goods_onetype'], true);
+                    foreach($set_array as $key=>$value){
+                        if($key == 0){
+                            $type_arr = $value['id'];
+                        }else{
+                            $type_arr.= ",".$value['id'];
                         }
-                        $w = " id in (".$type_arr.")";
                     }
+                    $w = " id in (".$type_arr.")";
                 }
-
-
+//                if ($set['set_pro'] != 0) {
+//                    $set_price_type = 1;
+//                }
+//                if ($set['set_issued'] != 0) {
+//                    $set_price_type = 2;
+//                }
+//                if ($set['set_wholesale'] != 0) {
+//                    $set_price_type = 3;
+//                }
             }
         }
         if($p_id != 0&&$setid==0){
             $set = Procurementset::where("u_id",$p_id)->where("set_state",1)->order("set_update desc")->limit(1)->find();
             if($set != null){
-                if($set['goods_twotype']!=null){
-                    $w = " id in (".$set['goods_onetype'].")";
-                }else {
-                    if ($set['goods_onetype'] != null) {
-                        $type_arr = "";
-                        $set_array = json_decode($set['goods_onetype'], true);
-                        foreach ($set_array as $key => $value) {
-                            if ($key == 0) {
-                                $type_arr = $value['id'];
-                            } else {
-                                $type_arr .= "," . $value['id'];
-                            }
+                if($set['goods_onetype']!=null){
+                    $type_arr = "";
+                    $set_array = json_decode($set['goods_onetype'], true);
+                    foreach($set_array as $key=>$value){
+                        if($key == 0){
+                            $type_arr = $value['id'];
+                        }else{
+                            $type_arr.= ",".$value['id'];
                         }
-                        $w = " id in (" . $type_arr . ")";
                     }
+                    $w = " id in (".$type_arr.")";
                 }
             }
         }
@@ -78,7 +92,7 @@ class GoodsCategoryLogic extends Logic
             ->order('sort', 'asc')
             ->select()
             ->toArray();
-//        $list['set_price_type'] = $set_price_type;
+
         return $list;
     }
 
@@ -93,40 +107,46 @@ class GoodsCategoryLogic extends Logic
             'pid' => $id
         ];
         $w = "";
+        // if($p_id != 0&&$setid!=0){
+        //     $set = Procurementset::where("set_id",$setid)->where("set_state",1)->find();
+        //     if($set != null){
+        //         if($set['goods_twotype']!=null) {
+        //             $w = " id in (" . $set['goods_twotype'] . ")";
+        //         }
+        //     }
+        // }
+        // if($p_id != 0&&$setid==0){
+        //     $set = Procurementset::where("u_id",$p_id)->where("set_state",1)->order("set_update desc")->limit(1)->find();
+        //     if($set != null){
+        //         if($set['goods_twotype']!=null) {
+        //             $w = " id in (" . $set['goods_twotype'] . ")";
+        //         }
+        //     }
+        // }
         if($p_id != 0&&$setid!=0){
             $set = Procurementset::where("set_id",$setid)->where("set_state",1)->find();
             if($set != null){
-                if($set['goods_twotype']!=null&&$set['goods_twotype']!="") {
-                    $w = " id in (" . $set['goods_twotype'] . ")";
-
-                }else{
-                    $second_t = "";
-                    $set_array = json_decode($set['goods_onetype'], true);
-                    foreach($set_array as $key=>$value){
-                        if($value['id'] == $id){
-                            $second_t = $value['child_id'];
-                        }
+                $second_t = "";
+                $set_array = json_decode($set['goods_onetype'], true);
+                foreach($set_array as $key=>$value){
+                    if($value['id'] == $id){
+                        $second_t = $value['child_id'];
                     }
-                    $w = " id in (" . $second_t . ")";
                 }
+                $w = " id in (" . $second_t . ")";
             }
         }
         if($p_id != 0&&$setid==0){
             $set = Procurementset::where("u_id",$p_id)->where("set_state",1)->order("set_update desc")->limit(1)->find();
             if($set != null){
-                if($set['goods_twotype']!=null&&$set['goods_twotype']!="") {
-                    $w = " id in (" . $set['goods_twotype'] . ")";
-
-                }else{
-                    $second_t = "";
-                    $set_array = json_decode($set['goods_onetype'], true);
-                    foreach($set_array as $key=>$value){
-                        if($value['id'] == $id){
-                            $second_t = $value['child_id'];
-                        }
+                $second_t = "";
+                $set_array = json_decode($set['goods_onetype'], true);
+                foreach($set_array as $key=>$value){
+                    if($value['id'] == $id){
+                        $second_t = $value['child_id'];
                     }
-                    $w = " id in (" . $second_t . ")";
                 }
+                $w = " id in (" . $second_t . ")";
             }
         }
         $list = GoodsCategory::field('id,name,image')
diff --git a/app/api/logic/GoodsCollectLogic.php b/app/api/logic/GoodsCollectLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/GoodsColumnLogic.php b/app/api/logic/GoodsColumnLogic.php
old mode 100644
new mode 100755
index 34d30b85..34f354ae
--- a/app/api/logic/GoodsColumnLogic.php
+++ b/app/api/logic/GoodsColumnLogic.php
@@ -21,5 +21,6 @@ class GoodsColumnLogic extends Logic
             ->select()
             ->toArray();
         return $list;
+        // return [];
     }
 }
\ No newline at end of file
diff --git a/app/api/logic/GoodsCommentLogic.php b/app/api/logic/GoodsCommentLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php
old mode 100644
new mode 100755
index 6c16ffea..5c5faf50
--- a/app/api/logic/GoodsLogic.php
+++ b/app/api/logic/GoodsLogic.php
@@ -990,7 +990,6 @@ class GoodsLogic extends Logic
 
             if ($count < 4) {
                 $goods = Db::name('goods')
-                    ->where($where)
                     ->where($onSaleWhere)
                     ->limit(4 - $count)
                     ->order('create_time desc')
@@ -1016,7 +1015,6 @@ class GoodsLogic extends Logic
                 ->toArray();
 
             $goods = Db::name('goods')
-                ->where($where)
                 ->where($onSaleWhere)
                 ->order('create_time desc')
                 ->page($page, $size)
@@ -1024,7 +1022,6 @@ class GoodsLogic extends Logic
                 ->toArray();
 
             $count = Db::name('goods')
-                ->where($where)
                 ->where($onSaleWhere)
                 ->count();
 
diff --git a/app/api/logic/HelpLogic.php b/app/api/logic/HelpLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/IndexLogic.php b/app/api/logic/IndexLogic.php
old mode 100644
new mode 100755
index c3d0a10f..29562364
--- a/app/api/logic/IndexLogic.php
+++ b/app/api/logic/IndexLogic.php
@@ -229,11 +229,11 @@ class IndexLogic extends Logic
                 }
             }
         }
-
+        
         // 热销榜单
         $hot_list = self::getIndexHotList();
-
-
+ 
+        
         return [
             'headlines' => $headlines,
             'hots' => $hots,
@@ -970,7 +970,7 @@ class IndexLogic extends Logic
 
         return $result;
     }
-
+    
     private static function getIndexHotList()
     {
         $hot_list = $order_goods = [];
@@ -979,7 +979,7 @@ class IndexLogic extends Logic
             'status' => GoodsEnum::STATUS_SHELVES, // 上架中
             'audit_status' => GoodsEnum::AUDIT_STATUS_OK, // 审核通过
         ];
-
+        
         $hot_list = Db::name('hot_list')
             ->alias('hl')
             ->join('goods g', 'hl.goods_id = g.id')
@@ -992,20 +992,20 @@ class IndexLogic extends Logic
             ->toArray();
 
         $count = count($hot_list);
-
+        
         if ($count < 6) {
             $where[] = ['og.create_time', '>=', strtotime("today")];
             $where[] = ['og.create_time', '<=', strtotime("tomorrow") - 1];
 
             $order_goods = Db::name('order_goods')
-                ->alias('og')
-                ->join('goods g', 'og.goods_id = g.id')
-                ->field('og.goods_id, og.create_time, count(*) as count, g.id as gid, g.name, g.image, g.issuing_price, g.market_price, g.min_price, g.purchase_price, g.wholesale_price')
-                ->group('og.goods_id')
-                ->limit(6 - $count)
-                ->order('og.create_time desc, count desc')
-                ->select()
-                ->toArray();
+            ->alias('og')
+            ->join('goods g', 'og.goods_id = g.id')
+            ->field('og.goods_id, og.create_time, count(*) as count, g.id as gid, g.name, g.image, g.issuing_price, g.market_price, g.min_price, g.purchase_price, g.wholesale_price')
+            ->group('og.goods_id')
+            ->limit(6 - $count)
+            ->order('og.create_time desc, count desc')
+            ->select()
+            ->toArray();
         }
 
         $result = array_merge($hot_list, $order_goods);
diff --git a/app/api/logic/IntegralGoodsLogic.php b/app/api/logic/IntegralGoodsLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/IntegralOrderLogic.php b/app/api/logic/IntegralOrderLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/LiveLogic.php b/app/api/logic/LiveLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/LoginLogic.php b/app/api/logic/LoginLogic.php
old mode 100644
new mode 100755
index 33604e82..da86dfbd
--- a/app/api/logic/LoginLogic.php
+++ b/app/api/logic/LoginLogic.php
@@ -165,7 +165,7 @@ class LoginLogic extends Logic
     public static function getUserByWechatResponse($response)
     {
         $user_id = UserAuth::alias('au')
-            ->join('procurement u', 'au.user_id=u.id')
+            ->join('user u', 'au.user_id=u.id')
             ->where(['u.del' => 0])
             ->where(function ($query) use ($response) {
                 $query->whereOr(['au.openid' => $response['openid']]);
@@ -188,7 +188,7 @@ class LoginLogic extends Logic
     public static function checkUserInfo($user_info)
     {
         if (empty($user_info)) {
-            return '登录失败:procurement';
+            return '登录失败:user';
         }
 
         if ($user_info['disable']) {
@@ -398,7 +398,7 @@ class LoginLogic extends Logic
             }
         //添加或更新用户
         $user_id = UserAuth::alias('au')
-            ->join('procurement u', 'au.user_id=u.id')
+            ->join('user u', 'au.user_id=u.id')
             ->where(['u.del' => 0])
             ->where(function ($query) use ($user) {
                 $query->whereOr(['au.openid' => $user['openid']]);
@@ -415,7 +415,7 @@ class LoginLogic extends Logic
         }
 
         if (empty($user_info)) {
-            return '登录失败:procurement';
+            return '登录失败:user';
         }
 
         if ($user_info['disable']) {
@@ -457,9 +457,9 @@ class LoginLogic extends Logic
         } catch (Exception $e) {
             return $e->getMessage();
         }
-//        dump($procurement);
+//        dump($user);
         //添加或更新用户
-        $user_id = UserAuth::alias('au')->join('procurement u', 'au.user_id=u.id')
+        $user_id = UserAuth::alias('au')->join('user u', 'au.user_id=u.id')
             ->where(['u.del' => 0])
             ->where(function ($query) use ($user) {
                 $query->whereOr(['au.openid' => $user['openid']])
@@ -474,7 +474,7 @@ class LoginLogic extends Logic
         }
 
         if (empty($user_info)) {
-            return '登录失败:procurement';
+            return '登录失败:user';
         }
 
         if ($user_info['disable']) {
@@ -634,11 +634,11 @@ class LoginLogic extends Logic
      */
     public static function updateUser($post,$user_id)
     {
-//        $procurement = Db::name('procurement')->where(['id'=>$user_id])->find();
-//        if ($procurement['is_new_user'] == 0) {
+//        $user = Db::name('user')->where(['id'=>$user_id])->find();
+//        if ($user['is_new_user'] == 0) {
 //            return self::dataError('非新用户无法使用此接口更新用户信息');
 //        }
-        Db::name('procurement')->where(['id'=>$user_id])->update(['nickname'=>$post['nickname'],'avatar'=>UrlServer::setFileUrl($post['avatar']),'is_new_user'=>0]);
+        Db::name('user')->where(['id'=>$user_id])->update(['nickname'=>$post['nickname'],'avatar'=>UrlServer::setFileUrl($post['avatar']),'is_new_user'=>0]);
         return true;
     }
 }
diff --git a/app/api/logic/LoginPasswordLogic.php b/app/api/logic/LoginPasswordLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/MallNewsLogic.php b/app/api/logic/MallNewsLogic.php
old mode 100644
new mode 100755
index 2deb1321..68e47a1b
--- a/app/api/logic/MallNewsLogic.php
+++ b/app/api/logic/MallNewsLogic.php
@@ -70,7 +70,6 @@ class MallNewsLogic extends Logic
     {
         foreach ($arg as &$v) {
             if ($v['shop_id'] > 0) {
-
                 $v['shop'] = Goods::field('name, image, min_price')->find($v['shop_id']);
             }
 
diff --git a/app/api/logic/MenuLogic.php b/app/api/logic/MenuLogic.php
old mode 100644
new mode 100755
index ba095716..b5f83bf4
--- a/app/api/logic/MenuLogic.php
+++ b/app/api/logic/MenuLogic.php
@@ -71,12 +71,12 @@ class MenuLogic extends Logic
             ->where(['del' => 0, 'is_show' => 1])
             ->field('name, image, url')
             ->order('sort desc')
-            ->select();
-
+            ->select()->toArray();
+        
         foreach ($result as &$v) {
             $v['image'] = UrlServer::getFileUrl($v['image']);
         }
-
+        
         return $result;
     }
 }
\ No newline at end of file
diff --git a/app/api/logic/OrderInvoiceLogic.php b/app/api/logic/OrderInvoiceLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/OrderLogic.php b/app/api/logic/OrderLogic.php
old mode 100644
new mode 100755
index 1295eb76..3cff35b0
--- a/app/api/logic/OrderLogic.php
+++ b/app/api/logic/OrderLogic.php
@@ -190,7 +190,7 @@ class OrderLogic extends Logic
 
             // 订单日志
             OrderLog::insertAll($order_log_datas_insert);
-
+            
             // 订单商品
             OrderGoods::insertAll($order_goods_datas_insert);
 
@@ -339,7 +339,7 @@ class OrderLogic extends Logic
             $good['original_price'] = $goods_item['price'];
             $good['basic_num'] = isset($good['basic_num'])?$good['basic_num']:0;
             $good['exc_num'] = isset($good['exc_num'])?$good['exc_num']:0;
-            $good['w_discount'] = isset($good['w_discount'])?$good['w_discount']:0;
+             $good['w_discount'] = isset($good['w_discount'])?$good['w_discount']:0;
             $good['spec_value'] = $goods_item['spec_value_str'];
             $good['image'] = empty($goods_item['image']) ? $goods_item['image'] : $goods_item['image'];
             $good['image'] = UrlServer::getFileUrl($good['image']);
@@ -406,14 +406,14 @@ class OrderLogic extends Logic
             $user = User::where('id', $post['user_id'])->find();
             $discount = UserLevel::where(['id' => $user['level'],'del' => 0])->value('discount');
             // 普通订单才参与会员价
-            if (self::$order_type == OrderEnum::NORMAL_ORDER) {
-                if($discount == 0){
-                    $discount = 10;
-                }
-                $shop[$value['shop_id']]['total_amount'] = round(self::calculateGoodsPrice($shop[$value['shop_id']]['goods'],$discount) + $shop[$value['shop_id']]['shipping_price'], 2);
-            } else {
+            // if (self::$order_type == OrderEnum::NORMAL_ORDER) {
+            //     if($discount == 0){
+            //         $discount = 10;
+            //     }
+            //     $shop[$value['shop_id']]['total_amount'] = round(self::calculateGoodsPrice($shop[$value['shop_id']]['goods'],$discount) + $shop[$value['shop_id']]['shipping_price'], 2);
+            // } else {
                 $shop[$value['shop_id']]['total_amount'] = round(round($value['price'] * $value['num'], 2) + $shop[$value['shop_id']]['shipping_price'], 2);
-            }
+            // }
 
             //优惠券
             $discount_amount = 0;
@@ -431,6 +431,7 @@ class OrderLogic extends Logic
                 $shop[$value['shop_id']]['total_amount'] = 0;
             }
             $num = 0;
+            $total_amount = 0;
             foreach ($shop[$value['shop_id']]['goods'] as &$item) {
                 $is_member = Goods::where('id',$item['goods_id'])->value('is_member');
                 $price_sum = round($item['price'] * $item['num'],2);
@@ -442,22 +443,26 @@ class OrderLogic extends Logic
                     $item['is_member'] = 0;
                 }
 
-                if($item['is_member']) {
-                    $member_amount = round($item['price']*$discount/10,2);
-                    $item['member_amount'] = $member_amount;
-                    $price_sum = round($member_amount * $item['num'],2);
-                }
+                // if($item['is_member']) {
+                //     $member_amount = round($item['price']*$discount/10,2);
+                //     $item['member_amount'] = $member_amount;
+                //     $price_sum = round($member_amount * $item['num'],2);
+                // }
                 $item['sum_price'] = $price_sum;
                 $num += $item['num'];
+                $total_amount += round($item['num']*$item['price'],2);
             }
             $shop[$value['shop_id']]['total_num'] = $num;
+            
         }
 
         foreach($shop as $key=>$value){
+              $shop[$key]['total_amount'] =0;
             $a = 0;
             if(isset($value['p_id'])){
                 if($value['p_id']>0){
                     foreach($shop[$key]['goods'] as $k=>$v){
+                        $shop[$key]['total_amount']+= round($v['num']*$v['price'],2);
                         if($v['w_discount'] > 0){
                             $a+=round($v['basic_num']*$v['w_price']*$v['w_discount']/100 + $v['exc_num']*$v['w_price'],2);
                             $shop[$key]['total_amount'] = round($a,2);
@@ -470,6 +475,7 @@ class OrderLogic extends Logic
             }else{
                 $all_goods_price = 0;
                 foreach($shop[$key]['goods'] as $k=>$v){
+                      $shop[$key]['total_amount']+= round($v['num']*$v['price'],2);
                     $price_t = 0;
                     if(isset($v['price_type'])){
                         if($v['price_type'] == "jicai_wholesale"){
@@ -488,18 +494,21 @@ class OrderLogic extends Logic
                 if($all_goods_price!= 0){
                     $shop[$key]['total_amount'] = round($all_goods_price,2);
                 }
-
+                
             }
         }
         $shop = array_values($shop);
-        $total_amount = array_sum(array_column($shop, 'total_amount'));
-
+        // var_dump("<pre>");
+        // var_dump($shop);
+        // $total_amount = array_sum(array_column($shop, 'total_amount'));
+        
+       
         $orders['address'] = $address;
         $orders['shop'] = $shop;
         $orders['order_type'] = self::$order_type;
         $orders['total_amount'] = round($total_amount,2);
         $orders['pay_way_text'] = "微信支付";
-        $orders['pay_way'] = OrderEnum::PAY_WAY_WECHAT;
+        $orders['pay_way'] = OrderEnum::PAY_WAY_WECHAT; 
         if($w_price==0) {
             // 检验是否参与包邮活动，若参与去除邮费
             $orders = self::checkFreeShipping($orders);
@@ -508,7 +517,7 @@ class OrderLogic extends Logic
             $orders['total_amount'] = round($orders['total_amount'], 2);
         }
         $orders['invoice'] = array_values($invoice);
-
+//  var_dump($orders['total_amount']);
         return $orders;
     }
 
@@ -987,7 +996,8 @@ class OrderLogic extends Logic
             $remark = $remarks;
         }
         $user = User::where('id', $post['user_id'])->find();
-        $discount = UserLevel::where('id', $user['level'])->value('discount');
+        $discount = 0;
+//        $discount = UserLevel::where('id', $user['level'])->value('discount');
         if($discount == 0 || self::$order_type != OrderEnum::NORMAL_ORDER){
             $discount = 10;
         }
@@ -1025,7 +1035,7 @@ class OrderLogic extends Logic
         foreach($post['goods'] as $key=>$value){
             if(isset($value['p_id'])){
                 if($value['p_id'] > 0){
-                    $a = 1;
+                   $a = 1;
                 }
             }
         }
@@ -1074,7 +1084,7 @@ class OrderLogic extends Logic
         if(isset($post['billions_type'])){
             $order_data['billions_type'] = $post['billions_type'];
         }
-
+        
         if (isset($post['balance_pay'])) {
             $order_data['is_balance_type'] = 1;
         }
@@ -1085,7 +1095,7 @@ class OrderLogic extends Logic
         }
 
         $order_create = $Order->create($order_data);
-
+   
         if (false === $order_create) {
             return false;
         }
@@ -1143,9 +1153,9 @@ class OrderLogic extends Logic
                     $goods_data[$key]['total_pay_price'] = round($value['w_price'] * $value['num'],2);
                 }
             }
-            if(isset($value['set'])){
-                $goods_data[$key]['set_id'] = $value['set'];
-            }
+           if(isset($value['set'])){
+               $goods_data[$key]['set_id'] = $value['set'];
+           }
             if(isset($value['w_price'])){
                 $goods_data[$key]['w_price'] = $value['w_price'];
             }
@@ -1359,7 +1369,7 @@ class OrderLogic extends Logic
                 $where[] = ['order_status', '=', OrderEnum::ORDER_STATUS_DOWN];
                 break;
         }
-        $after_sale = AfterSale::where("user_id",$user_id)->where("status <> 2")->where("del",0)->select();
+         $after_sale = AfterSale::where("user_id",$user_id)->where("status <> 2")->where("del",0)->select();
         $after_order_id = $after_order_id_array = "";
         foreach($after_sale as $key=>$value){
             if($key == 0){
@@ -1373,7 +1383,7 @@ class OrderLogic extends Logic
             $after_order_id_array = "id not in ($after_order_id)";
         }
         $count = $order->where(['del' => 0, 'user_id' => $user_id])
-            ->where($after_order_id_array)
+        ->where($after_order_id_array)
             ->where($where)
             ->count();
 
@@ -1385,9 +1395,9 @@ class OrderLogic extends Logic
             ->page($page, $size)
             ->order('id desc')
             ->select();
-
+   
         $lists->append(['goods_count', 'pay_btn', 'cancel_btn', 'delivery_btn', 'take_btn', 'del_btn', 'comment_btn', 'content_btn','order_cancel_time']);
-
+    
         foreach ($lists as $list) {
             if ($list['order_type'] == OrderEnum::SECKILL_ORDER) {//如果是秒杀
                 foreach ($list['order_goods'] as $item) {
@@ -1485,7 +1495,7 @@ class OrderLogic extends Logic
             $refund_days = ConfigServer::get('after_sale', 'refund_days', 7 * 86400, 0) * 86400;
 
             foreach ($order->order_goods as $order_good) {
-                $after_sale = AfterSale::where("order_id",$order_id)->where("status",0)->where("del",0)->where("goods_id",$order_good['goods_id'])->order("id desc")->limit(1)->find();
+                 $after_sale = AfterSale::where("order_id",$order_id)->where("status",0)->where("del",0)->where("goods_id",$order_good['goods_id'])->order("id desc")->limit(1)->find();
                 if($after_sale != null){
                     $order_good['after_sale_id'] = $after_sale['id'];
                 }else{
@@ -1737,17 +1747,17 @@ class OrderLogic extends Logic
         $other_leader =  3; //分公司收入 如没有则并入东龙汇
         $shop_com = 60; // 商家获取收入
         $order_goods = Db::name("order_goods")->where('order_id',$order['id'])->select()->toArray();
-        $user = Db::name("user")->where("id",$order['user_id'])->find();
-        $is_d = Distribution::where('user_id', $user['first_leader'] )->where('is_distribution', 1 )->find();
-        foreach($order_goods as $key=>$value){
-            $data['order_price'] = $value['total_pay_price'];
-            $data['user_id'] = $order['user_id'];
-            $data['goods_id'] = $value['goods_id'];
-            $data['shop_id'] = $value['shop_id'];
-            $data['goods_num'] = $value['goods_num'];
-            $data['order_id'] = $order['id'];
-            $data['dtime'] = date("Y-m-d H:i:s");
-            $data['subsidy_price'] = round($value['total_pay_price']*$user_subsidy/100,8);
+         $user = Db::name("user")->where("id",$order['user_id'])->find();
+         $is_d = Distribution::where('user_id', $user['first_leader'] )->where('is_distribution', 1 )->find();
+         foreach($order_goods as $key=>$value){
+             $data['order_price'] = $value['total_pay_price'];
+             $data['user_id'] = $order['user_id'];
+             $data['goods_id'] = $value['goods_id'];
+             $data['shop_id'] = $value['shop_id'];
+             $data['goods_num'] = $value['goods_num'];
+             $data['order_id'] = $order['id'];
+             $data['dtime'] = date("Y-m-d H:i:s");
+             $data['subsidy_price'] = round($value['total_pay_price']*$user_subsidy/100,8);
             $res = Db::name("user_billions")->save($data);
             $billions_msg = Db::name("user_billions")->where("state",0)->select()->toArray();
             $subsidy = $value['total_pay_price']*$all_user_subsidy/100;
@@ -1820,224 +1830,224 @@ class OrderLogic extends Logic
             }
 //             $first_msg = Db::name("user_billions")->where("user_id",$user['first_leader'])->where("state",0)->select()->toArray();
             $count = count($billions_msg);
-            $arr = $arr1 = array();
-            // 数量超出前几位补贴用户
-            if($count > $user_start_num) {
-                $start_subsidy = $subsidy * $user_start_subsidy / 100;
-                $average = round($start_subsidy / $user_start_num, 8);
-                $last = round($start_subsidy - $average * ($user_start_num - 1), 8);
-                for ($i = 0; $i < $user_start_num; $i++) {
-                    if ($i + 1 == $user_start_num) {
-                        $arr[$i] = $last;
-                    } else {
-                        $arr[$i] = $average;
-                    }
-                }
-                // 剩余人数补贴
-                $end_average = round(($subsidy - $start_subsidy)/ ($count-$user_start_num), 8);
-                $end_last = round($subsidy - $start_subsidy - $end_average * ($count-$user_start_num - 1), 8);
-                for ($y = 0; $y < $count-$user_start_num; $y++) {
-                    if ($y + 1 == $count-$user_start_num) {
-                        $arr1[$y] = $end_last;
-                    } else {
-                        $arr1[$y] = $end_average;
-                    }
-                }
-            }else{
-                $user_start_num = $count;
-                // 数量不超出前几位补贴用户，按全部金额计算
-                $average = round($subsidy/$count, 8);
-                $last = round($subsidy - $average * ($count - 1), 8);
-                for ($i = 0; $i < $count; $i++) {
-                    if ($i + 1 == $count) {
-                        $arr[$i] = $last;
-                    } else {
-                        $arr[$i] = $average;
-                    }
-                }
-            }
-            $billion_arr = $billion_arr_id = "";
-            foreach($billions_msg as $k=>$v){
-                if($k+1 <= $user_start_num){
-                    //       var_dump($v['order_price']);
-                    //   var_dump($arr[$k]);
-                    //   var_dump($v['subsidy_price']);
-                    if($v['order_price'] <= $arr[$k]+$v['subsidy_price']){
-                        // 查询用户总余额账户
-                        $user_all_account = Db::name("subsidy_withdrawal")->where("user_id",$v['user_id'])->find();
-                        if($user_all_account != null){
-                            // 判断账户是否可用
-                            if($user_all_account['state'] == 0 || $user_all_account['state'] == 2){
-                                return -2;
-                            }
-                            // 更新主表
-                            $update_subsidy_withdrawal = Db::name("subsidy_withdrawal")->where("user_id",$v['user_id'])->inc("total_amount",$v['order_price'])->update();
-                            if(!$update_subsidy_withdrawal){
-                                return -4;
-                            }
-                            $dat['subsidy_withdrawal_id'] = $user_all_account['id'];
-                            $dat['user_id'] = $v['user_id'];
-                            $dat['billions_id'] = $v['billions_id'];
-                            $dat['type'] = 1;
-                            $dat['money'] = $v['order_price'];
-                            $dat['create_time'] = date("Y-m-d H:i:s");
-                            // 插入提现记录
-                            $save_record = Db::name("subsidy_withdrawal_record")->save($dat);
-                            if(!$save_record){
-                                return -5;
-                            }
-                        }else{
-                            $d['user_id'] = $v['user_id'];
-                            $d['total_amount'] = $v['order_price'];
-                            $update_subsidy_withdrawal = Db::name("subsidy_withdrawal")->insertGetId($d);
-                            if(!$update_subsidy_withdrawal){
-                                return -4;
-                            }
-                            $dat['subsidy_withdrawal_id'] = $update_subsidy_withdrawal;
-                            $dat['user_id'] = $v['user_id'];
-                            $dat['billions_id'] = $v['billions_id'];
-                            $dat['type'] = 1;
-                            $dat['money'] = $v['order_price'];
-                            $dat['create_time'] = date("Y-m-d H:i:s");
-                            // 插入提现记录
-                            $save_record = Db::name("subsidy_withdrawal_record")->save($dat);
-                            if(!$save_record){
-                                return -5;
-                            }
-                        }
+             $arr = $arr1 = array();
+             // 数量超出前几位补贴用户
+             if($count > $user_start_num) {
+                 $start_subsidy = $subsidy * $user_start_subsidy / 100;
+                 $average = round($start_subsidy / $user_start_num, 8);
+                 $last = round($start_subsidy - $average * ($user_start_num - 1), 8);
+                 for ($i = 0; $i < $user_start_num; $i++) {
+                     if ($i + 1 == $user_start_num) {
+                         $arr[$i] = $last;
+                     } else {
+                         $arr[$i] = $average;
+                     }
+                 }
+                 // 剩余人数补贴
+                 $end_average = round(($subsidy - $start_subsidy)/ ($count-$user_start_num), 8);
+                 $end_last = round($subsidy - $start_subsidy - $end_average * ($count-$user_start_num - 1), 8);
+                 for ($y = 0; $y < $count-$user_start_num; $y++) {
+                     if ($y + 1 == $count-$user_start_num) {
+                         $arr1[$y] = $end_last;
+                     } else {
+                         $arr1[$y] = $end_average;
+                     }
+                 }
+             }else{
+                 $user_start_num = $count;
+                 // 数量不超出前几位补贴用户，按全部金额计算
+                 $average = round($subsidy/$count, 8);
+                 $last = round($subsidy - $average * ($count - 1), 8);
+                 for ($i = 0; $i < $count; $i++) {
+                     if ($i + 1 == $count) {
+                         $arr[$i] = $last;
+                     } else {
+                         $arr[$i] = $average;
+                     }
+                 }
+             }
+             $billion_arr = $billion_arr_id = "";
+              foreach($billions_msg as $k=>$v){
+                  if($k+1 <= $user_start_num){
+                //       var_dump($v['order_price']);
+                //   var_dump($arr[$k]);
+                //   var_dump($v['subsidy_price']);
+                      if($v['order_price'] <= $arr[$k]+$v['subsidy_price']){
+                          // 查询用户总余额账户
+                          $user_all_account = Db::name("subsidy_withdrawal")->where("user_id",$v['user_id'])->find();
+                          if($user_all_account != null){
+                               // 判断账户是否可用
+                              if($user_all_account['state'] == 0 || $user_all_account['state'] == 2){
+                                  return -2;
+                              }
+                                  // 更新主表
+                              $update_subsidy_withdrawal = Db::name("subsidy_withdrawal")->where("user_id",$v['user_id'])->inc("total_amount",$v['order_price'])->update();
+                              if(!$update_subsidy_withdrawal){
+                                  return -4;
+                              }
+                                  $dat['subsidy_withdrawal_id'] = $user_all_account['id'];
+                                  $dat['user_id'] = $v['user_id'];
+                                  $dat['billions_id'] = $v['billions_id'];
+                                  $dat['type'] = 1;
+                                  $dat['money'] = $v['order_price'];
+                                  $dat['create_time'] = date("Y-m-d H:i:s");
+                                  // 插入提现记录
+                                  $save_record = Db::name("subsidy_withdrawal_record")->save($dat);
+                                  if(!$save_record){
+                                      return -5;
+                                  }
+                          }else{
+                              $d['user_id'] = $v['user_id'];
+                              $d['total_amount'] = $v['order_price'];
+                              $update_subsidy_withdrawal = Db::name("subsidy_withdrawal")->insertGetId($d);
+                              if(!$update_subsidy_withdrawal){
+                                  return -4;
+                              }
+                              $dat['subsidy_withdrawal_id'] = $update_subsidy_withdrawal;
+                              $dat['user_id'] = $v['user_id'];
+                              $dat['billions_id'] = $v['billions_id'];
+                              $dat['type'] = 1;
+                              $dat['money'] = $v['order_price'];
+                              $dat['create_time'] = date("Y-m-d H:i:s");
+                              // 插入提现记录
+                              $save_record = Db::name("subsidy_withdrawal_record")->save($dat);
+                              if(!$save_record){
+                                  return -5;
+                              }
+                          }
+                             
 
-
-                        // 更新排队状态
-                        $update_user_billions = Db::name("user_billions")->where("billions_id",$v['billions_id'])->update(['subsidy_price'=>$v['order_price'],"state"=>2]);
-                        if(!$update_user_billions){
-                            return -3;
-                        }
-
-
-                        // 剩余数量
-                        $residue_count = $user_start_num - $k - 1;
-                        if($residue_count!=0){
-                            // 剩余金额
-                            $residue_price = round($arr[$k]+$v['subsidy_price']-$v['order_price'],8);
-                            foreach($arr as $k1=>$v1){
-                                if($k1 > $k){
-                                    $residue_price+=$arr[$k1];
-                                }
-                            }
-                            $average = round($residue_price/$residue_count,8);
-                            $last = round($residue_price - $average*($residue_count-1),8);
-                            foreach($arr as $k1=>$v1){
-                                if($k1+1 == $user_start_num){
-                                    $arr[$k1] = $last;
-                                }else{
-                                    if($k1 > $k){
-                                        $arr[$k1] = $average;
-                                    }
-                                }
-                            }
-
-                        }
-
-                    }else{
+                              // 更新排队状态
+                              $update_user_billions = Db::name("user_billions")->where("billions_id",$v['billions_id'])->update(['subsidy_price'=>$v['order_price'],"state"=>2]);
+                              if(!$update_user_billions){
+                                  return -3;
+                              }
+                          
+                            
+                              // 剩余数量
+                              $residue_count = $user_start_num - $k - 1;
+                              if($residue_count!=0){
+                                  // 剩余金额
+                                  $residue_price = round($arr[$k]+$v['subsidy_price']-$v['order_price'],8);
+                                  foreach($arr as $k1=>$v1){
+                                      if($k1 > $k){
+                                          $residue_price+=$arr[$k1];
+                                      }
+                                  }
+                                  $average = round($residue_price/$residue_count,8);
+                                  $last = round($residue_price - $average*($residue_count-1),8);
+                                  foreach($arr as $k1=>$v1){
+                                      if($k1+1 == $user_start_num){
+                                          $arr[$k1] = $last;
+                                      }else{
+                                          if($k1 > $k){
+                                              $arr[$k1] = $average;
+                                          }
+                                      }
+                                  }
+                            
+                              }
+                              
+                      }else{
                         //   $subp = round($v['subsidy_price']+$arr[$k],8);
                         //     $billion_arr.="  when ".$v['billions_id']." then '".$subp."'";
                         //     $billion_arr_id.=$v['billions_id'].",";
-                        Db::name("user_billions")->where("billions_id",$v['billions_id'])->inc("subsidy_price",$arr[$k])->update();
-                    }
-                }else{
-                    if($v['order_price'] <= $arr1[$k-$user_start_num]+$v['subsidy_price']){
-                        // 查询用户总余额账户
-                        $user_all_account = Db::name("subsidy_withdrawal")->where("user_id",$v['user_id'])->find();
-                        if($user_all_account == null){
-                            $d['user_id'] = $v['user_id'];
-                            $d['total_amount'] = $v['order_price'];
-                            $update_subsidy_withdrawal = Db::name("subsidy_withdrawal")->insertGetId($d);
-                            if(!$update_subsidy_withdrawal){
-                                return -4;
-                            }
-                            $dat['subsidy_withdrawal_id'] = $update_subsidy_withdrawal;
-                            $dat['user_id'] = $v['user_id'];
-                            $dat['billions_id'] = $v['billions_id'];
-                            $dat['type'] = 1;
-                            $dat['money'] = $v['order_price'];
-                            $dat['create_time'] = date("Y-m-d H:i:s");
-                            // 插入提现记录
-                            $save_record = Db::name("subsidy_withdrawal_record")->save($dat);
-                            if(!$save_record){
-                                return -5;
-                            }
-                        }else{
-                            // 判断账户是否可用
-                            if($user_all_account['state'] == 0 || $user_all_account['state'] == 2){
-                                return -2;
-                            }
-
-                            // 更新主表
-                            $update_subsidy_withdrawal = Db::name("subsidy_withdrawal")->where("user_id",$v['user_id'])->inc("total_amount",$v['order_price'])->update();
-                            if(!$update_subsidy_withdrawal){
-                                return -4;
-                            }
-                            $dat['subsidy_withdrawal_id'] = $user_all_account['id'];
-                            $dat['user_id'] = $v['user_id'];
-                            $dat['billions_id'] = $v['billions_id'];
-                            $dat['type'] = 1;
-                            $dat['money'] = $v['order_price'];
-                            $dat['create_time'] = date("Y-m-d H:i:s");
-                            // 插入提现记录
-                            $save_record = Db::name("subsidy_withdrawal_record")->save($dat);
-                            if(!$save_record){
-                                return -5;
-                            }
-                        }
-                        // 更新排队状态
-                        $update_user_billions = Db::name("user_billions")->where("billions_id",$v['billions_id'])->update(['subsidy_price'=>$v['order_price'],"state"=>2]);
-                        if(!$update_user_billions){
-                            return -3;
-                        }
-
-                        // 剩余数量
-                        $residue_count = $count-$user_start_num - $k+$user_start_num - 1;
-                        if($residue_count!=0){
-                            // 剩余金额
-                            $residue_price = round($arr1[$k-$user_start_num]+$v['subsidy_price']-$v['order_price'],8);
-                            foreach($arr1 as $k1=>$v1){
-                                if($k1 > $k - $user_start_num){
-                                    $residue_price+=$arr1[$k1];
-                                }
-                            }
-                            $average = round($residue_price/$residue_count,8);
-                            $last = round($residue_price - $average*($residue_count-1),8);
-                            foreach($arr1 as $k1=>$v1){
-                                if($k1+1 == $count-$user_start_num){
-                                    $arr1[$k1] = $last;
-                                }else{
-                                    if($k1 > $k){
-                                        $arr[$k1] = $average;
-                                    }
-                                }
-                            }
-                        }
-
-                    }else{
+                          Db::name("user_billions")->where("billions_id",$v['billions_id'])->inc("subsidy_price",$arr[$k])->update();
+                      }
+                  }else{
+                      if($v['order_price'] <= $arr1[$k-$user_start_num]+$v['subsidy_price']){
+                          // 查询用户总余额账户
+                          $user_all_account = Db::name("subsidy_withdrawal")->where("user_id",$v['user_id'])->find();
+                          if($user_all_account == null){
+                              $d['user_id'] = $v['user_id'];
+                              $d['total_amount'] = $v['order_price'];
+                              $update_subsidy_withdrawal = Db::name("subsidy_withdrawal")->insertGetId($d);
+                              if(!$update_subsidy_withdrawal){
+                                  return -4;
+                              }
+                              $dat['subsidy_withdrawal_id'] = $update_subsidy_withdrawal;
+                              $dat['user_id'] = $v['user_id'];
+                              $dat['billions_id'] = $v['billions_id'];
+                              $dat['type'] = 1;
+                              $dat['money'] = $v['order_price'];
+                              $dat['create_time'] = date("Y-m-d H:i:s");
+                              // 插入提现记录
+                              $save_record = Db::name("subsidy_withdrawal_record")->save($dat);
+                              if(!$save_record){
+                                  return -5;
+                              }
+                          }else{
+                                // 判断账户是否可用
+                              if($user_all_account['state'] == 0 || $user_all_account['state'] == 2){
+                                  return -2;
+                              }
+                                
+                              // 更新主表
+                              $update_subsidy_withdrawal = Db::name("subsidy_withdrawal")->where("user_id",$v['user_id'])->inc("total_amount",$v['order_price'])->update();
+                              if(!$update_subsidy_withdrawal){
+                                  return -4;
+                              }
+                              $dat['subsidy_withdrawal_id'] = $user_all_account['id'];
+                              $dat['user_id'] = $v['user_id'];
+                              $dat['billions_id'] = $v['billions_id'];
+                              $dat['type'] = 1;
+                              $dat['money'] = $v['order_price'];
+                              $dat['create_time'] = date("Y-m-d H:i:s");
+                              // 插入提现记录
+                              $save_record = Db::name("subsidy_withdrawal_record")->save($dat);
+                              if(!$save_record){
+                                  return -5;
+                              }
+                          }
+                                // 更新排队状态
+                              $update_user_billions = Db::name("user_billions")->where("billions_id",$v['billions_id'])->update(['subsidy_price'=>$v['order_price'],"state"=>2]);
+                              if(!$update_user_billions){
+                                  return -3;
+                              }
+                            
+                              // 剩余数量
+                              $residue_count = $count-$user_start_num - $k+$user_start_num - 1;
+                              if($residue_count!=0){
+                                   // 剩余金额
+                                  $residue_price = round($arr1[$k-$user_start_num]+$v['subsidy_price']-$v['order_price'],8);
+                                  foreach($arr1 as $k1=>$v1){
+                                      if($k1 > $k - $user_start_num){
+                                          $residue_price+=$arr1[$k1];
+                                      }
+                                  }
+                                  $average = round($residue_price/$residue_count,8);
+                                  $last = round($residue_price - $average*($residue_count-1),8);
+                                  foreach($arr1 as $k1=>$v1){
+                                      if($k1+1 == $count-$user_start_num){
+                                          $arr1[$k1] = $last;
+                                      }else{
+                                          if($k1 > $k){
+                                              $arr[$k1] = $average;
+                                          }
+                                      }
+                                  }
+                              }
+                         
+                      }else{
                         //   $subp =  round($v['subsidy_price']+$arr1[$k-$user_start_num],8);
                         //  $billion_arr.="  when ".$v['billions_id']." then '".$subp."'";
                         //   $billion_arr_id.=$v['billions_id'].",";
-                        Db::name("user_billions")->where("billions_id",$v['billions_id'])->inc("subsidy_price",$arr1[$k-$user_start_num])->update();
-                    }
-                }
-            }
+                          Db::name("user_billions")->where("billions_id",$v['billions_id'])->inc("subsidy_price",$arr1[$k-$user_start_num])->update();
+                      }
+                  }
+              }
             //   $billion_arr_id = explode(",",$billion_arr_id);
             //     array_pop($billion_arr_id);
             //     // print_r("<pre>");
             //     // var_dump($billion_arr_id);die;
             //     $billion_arr_id = implode(",",$billion_arr_id);
-            //     $sql = "UPDATE `ls_user_billions`
+            //     $sql = "UPDATE `ls_user_billions` 
             //     SET subsidy_price = CASE billions_id
             //         $billion_arr
             //     END
             //     WHERE billions_id IN ($billion_arr_id)";
             //     $query = Db::query($sql);
-            if($is_d!=null){
+             if($is_d!=null){
                 if($user['first_leader']>0){
                     $first_leader_percent = round($value['total_pay_price']*$first_leader / 100, 8);
                     Order::where('id', $order['id'])
@@ -2075,104 +2085,104 @@ class OrderLogic extends Logic
                         'settlement_time' => time()
                     ]);
                 }
-                // 店铺推广收益
-                $shop_user_msg = Shop::where('id', $value['shop_id'] )->find();
-                if($shop_user_msg['reference_user_id'] == 0){
-                    $shop_user_msg['reference_user_id'] = $order['user_id'];
-                }
-                $shop_u = Distribution::where('user_id', $shop_user_msg['reference_user_id'])->where('is_distribution', 1 )->find();
-                if($shop_u!=null){
-                    $shop_percent = round($value['total_pay_price'] * $store_subsidy / 100, 8);
-                    Order::where('id', $order['id'])
-                        ->inc('distribution_money',$shop_percent)->update();
-                    $shopDistribution_msg =  UserShopDistribution::where('shop_id', $value['shop_id'])
-                        ->find();
-                    if($shopDistribution_msg == null){
-                        UserShopDistribution::create([
-                            'shop_id' => $value['shop_id'],
-                            'order_num' => 1,
-                            'order_amount' => $shop_percent,
-                            'create_time' => time(),
-                            'update_time' => time()
-                        ]);
-                    }else{
-                        UserShopDistribution::where('shop_id', $value['shop_id'])
-                            ->inc('order_amount', $shop_percent)->update();
-                        UserShopDistribution::where('shop_id', $value['shop_id'])
-                            ->inc('order_num')->update();
-                    }
-                    User::where('id', $shop_user_msg['reference_user_id'])
-                        ->inc('earnings', $shop_percent)->update();
-                    $earnings_buy = AccountLog::where('user_id', $shop_user_msg['reference_user_id'])->order("create_time desc")->limit(1)->value('left_amount');
-                    $sn = createSn('account_log', 'log_sn', '', 4);
-                    AccountLog::create([
-                        'log_sn' => $sn,
-                        'user_id' => $shop_user_msg['reference_user_id'],
-                        'source_type' => AccountLog::billions_inc_earnings,
-                        'source_id' => $order['id'],
-                        'source_sn' => $order['order_sn'],
-                        'change_amount' => $shop_percent,
-                        'left_amount' => $earnings_buy + $shop_percent,
-                        'change_type' => 1,
-                        'remark' => '百亿返补佣金增加'
-                    ]);
-                    DistributionOrderGoods::create([
-                        'sn' => $sn,
-                        'user_id' => $shop_user_msg['reference_user_id'],
-                        'ratio' => $store_subsidy,
-                        'order_id' => $order['id'],
-                        'order_goods_id' => $value['id'],
-                        'goods_num' => $value['goods_num'],
-                        'money' => $shop_percent,
-                        'status' => 2,
-                        'create_time' => time(),
-                        'shop_id' => $value['shop_id'],
-                        'settlement_time' => time()
-                    ]);
-                }
-                $role_user_msg = Db::name("user")->where("id",$user['divide_role_user_id'])->find();
-                $state = 0;
-                if($role_user_msg != null){
-                    $state = $role_user_msg['divide_state'];
-                }
-                // 3%对公司
-                if($user['divide_role_user_id'] > 0&&$state>0 ){
-                    $divide_percent = round($value['total_pay_price'] * $other_leader / 100, 8);
-                    Order::where('id', $order['id'])
-                        ->inc('distribution_money',$divide_percent)->update();
-                    $shopDistribution_msg =  UserShopDistribution::where('shop_id', $value['shop_id'])
-                        ->find();
-                    User::where('id', $user['divide_role_user_id'])
-                        ->inc('earnings', $divide_percent)->update();
-                    $earnings_buy = AccountLog::where('user_id', $user['divide_role_user_id'])->order("create_time desc")->limit(1)->value('left_amount');
-                    $sn = createSn('account_log', 'log_sn', '', 4);
-                    AccountLog::create([
-                        'log_sn' => $sn,
-                        'user_id' => $user['divide_role_user_id'],
-                        'source_type' => AccountLog::billions_inc_earnings,
-                        'source_id' => $order['id'],
-                        'source_sn' => $order['order_sn'],
-                        'change_amount' => $divide_percent,
-                        'left_amount' => $earnings_buy + $divide_percent,
-                        'change_type' => 1,
-                        'remark' => '百亿返补对公司佣金增加'
-                    ]);
-                    DistributionOrderGoods::create([
-                        'sn' => $sn,
-                        'user_id' => $user['divide_role_user_id'],
-                        'ratio' => $other_leader,
-                        'order_id' => $order['id'],
-                        'order_goods_id' => $value['id'],
-                        'goods_num' => $value['goods_num'],
-                        'money' => $divide_percent,
-                        'status' => 2,
-                        'create_time' => time(),
-                        'shop_id' => $value['shop_id'],
-                        'settlement_time' => time()
-                    ]);
-                }
-            }
-        }
+            // 店铺推广收益
+             $shop_user_msg = Shop::where('id', $value['shop_id'] )->find();
+             if($shop_user_msg['reference_user_id'] == 0){
+                 $shop_user_msg['reference_user_id'] = $order['user_id'];
+             }
+                 $shop_u = Distribution::where('user_id', $shop_user_msg['reference_user_id'])->where('is_distribution', 1 )->find();
+                 if($shop_u!=null){
+                     $shop_percent = round($value['total_pay_price'] * $store_subsidy / 100, 8);
+                     Order::where('id', $order['id'])
+                         ->inc('distribution_money',$shop_percent)->update();
+                     $shopDistribution_msg =  UserShopDistribution::where('shop_id', $value['shop_id'])
+                         ->find();
+                     if($shopDistribution_msg == null){
+                         UserShopDistribution::create([
+                             'shop_id' => $value['shop_id'],
+                             'order_num' => 1,
+                             'order_amount' => $shop_percent,
+                             'create_time' => time(),
+                             'update_time' => time()
+                         ]);
+                     }else{
+                         UserShopDistribution::where('shop_id', $value['shop_id'])
+                             ->inc('order_amount', $shop_percent)->update();
+                         UserShopDistribution::where('shop_id', $value['shop_id'])
+                             ->inc('order_num')->update();
+                     }
+                     User::where('id', $shop_user_msg['reference_user_id'])
+                         ->inc('earnings', $shop_percent)->update();
+                     $earnings_buy = AccountLog::where('user_id', $shop_user_msg['reference_user_id'])->order("create_time desc")->limit(1)->value('left_amount');
+                     $sn = createSn('account_log', 'log_sn', '', 4);
+                     AccountLog::create([
+                         'log_sn' => $sn,
+                         'user_id' => $shop_user_msg['reference_user_id'],
+                         'source_type' => AccountLog::billions_inc_earnings,
+                         'source_id' => $order['id'],
+                         'source_sn' => $order['order_sn'],
+                         'change_amount' => $shop_percent,
+                         'left_amount' => $earnings_buy + $shop_percent,
+                         'change_type' => 1,
+                         'remark' => '百亿返补佣金增加'
+                     ]);
+                     DistributionOrderGoods::create([
+                         'sn' => $sn,
+                         'user_id' => $shop_user_msg['reference_user_id'],
+                         'ratio' => $store_subsidy,
+                         'order_id' => $order['id'],
+                         'order_goods_id' => $value['id'],
+                         'goods_num' => $value['goods_num'],
+                         'money' => $shop_percent,
+                         'status' => 2,
+                         'create_time' => time(),
+                         'shop_id' => $value['shop_id'],
+                         'settlement_time' => time()
+                     ]);
+                 }
+                 $role_user_msg = Db::name("user")->where("id",$user['divide_role_user_id'])->find();
+                 $state = 0;
+                 if($role_user_msg != null){
+                     $state = $role_user_msg['divide_state'];
+                 }
+                             // 3%对公司
+             if($user['divide_role_user_id'] > 0&&$state>0 ){
+                     $divide_percent = round($value['total_pay_price'] * $other_leader / 100, 8);
+                     Order::where('id', $order['id'])
+                         ->inc('distribution_money',$divide_percent)->update();
+                     $shopDistribution_msg =  UserShopDistribution::where('shop_id', $value['shop_id'])
+                         ->find();
+                     User::where('id', $user['divide_role_user_id'])
+                         ->inc('earnings', $divide_percent)->update();
+                     $earnings_buy = AccountLog::where('user_id', $user['divide_role_user_id'])->order("create_time desc")->limit(1)->value('left_amount');
+                     $sn = createSn('account_log', 'log_sn', '', 4);
+                     AccountLog::create([
+                         'log_sn' => $sn,
+                         'user_id' => $user['divide_role_user_id'],
+                         'source_type' => AccountLog::billions_inc_earnings,
+                         'source_id' => $order['id'],
+                         'source_sn' => $order['order_sn'],
+                         'change_amount' => $divide_percent,
+                         'left_amount' => $earnings_buy + $divide_percent,
+                         'change_type' => 1,
+                         'remark' => '百亿返补对公司佣金增加'
+                     ]);
+                     DistributionOrderGoods::create([
+                         'sn' => $sn,
+                         'user_id' => $user['divide_role_user_id'],
+                         'ratio' => $other_leader,
+                         'order_id' => $order['id'],
+                         'order_goods_id' => $value['id'],
+                         'goods_num' => $value['goods_num'],
+                         'money' => $divide_percent,
+                         'status' => 2,
+                         'create_time' => time(),
+                         'shop_id' => $value['shop_id'],
+                         'settlement_time' => time()
+                     ]);
+                 }
+             }
+         }
 
     }
     /**
@@ -2212,10 +2222,10 @@ class OrderLogic extends Logic
             return JsonServer::success('确认成功');
         }
         if($order['pay_way'] != 3){
-            return JsonServer::success('确认成功');
+             return JsonServer::success('确认成功');
         }
-
-        // 添加信用额度
+        
+          // 添加信用额度
         $xy_set = Db::name("procurement_xy_set")->where("s_id",1)->find();
         $is_p_user = Mprocurement::where("user_id",$user_id)->where("u_state",1)->find();
         $p_user_id = "";
@@ -2230,12 +2240,12 @@ class OrderLogic extends Logic
             'create_time' => date("Y-m-d")
         ]);
         $user_msg =  User::where(['id' => $user_id])->find();
-        $orderGoods = (new OrderGoods())->alias('a')
-            ->field(['a.w_price,a.set_id,a.p_id,d.trade_service_fee,d.city_id,d.province_id,a.firend_invite_code,a.id,a.shop_id,a.goods_id,a.goods_num,a.goods_price,a.total_price,a.total_pay_price,b.user_price_percent,b.user_shop_percent,b.third_percent,b.wholesale_percent,b.purchase_percent,b.issuing_percent,b.two_percent,b.city_shop_percent,b.pro_shop_percent,city_jicai_percent,pro_jicai_percent,c_ordinary_shop_percent,p_ordinary_shop_percent,caiji_percent'])
-            ->where(['order_id' => $order_id])
-            ->join('goods b', 'b.id=a.goods_id')
-            ->join('shop d', 'd.id=a.shop_id')
-            ->select();
+            $orderGoods = (new OrderGoods())->alias('a')
+                ->field(['a.w_price,a.set_id,a.p_id,d.trade_service_fee,d.city_id,d.province_id,a.firend_invite_code,a.id,a.shop_id,a.goods_id,a.goods_num,a.goods_price,a.total_price,a.total_pay_price,b.user_price_percent,b.user_shop_percent,b.third_percent,b.wholesale_percent,b.purchase_percent,b.issuing_percent,b.two_percent,b.city_shop_percent,b.pro_shop_percent,city_jicai_percent,pro_jicai_percent,c_ordinary_shop_percent,p_ordinary_shop_percent,caiji_percent'])
+                ->where(['order_id' => $order_id])
+                ->join('goods b', 'b.id=a.goods_id')
+                ->join('shop d', 'd.id=a.shop_id')
+                ->select();
         foreach($orderGoods as $key=>$value){
             $is_d = Distribution::where('user_id', $user_msg['first_leader'] )->where('is_distribution', 1 )->find();
             // 判断是否是集采会员
@@ -2244,7 +2254,7 @@ class OrderLogic extends Logic
                     $piw_price = $piw_price1=$percent = 0;
                     $p_user = Mprocurement::where("u_id",$value['p_id'])->where("u_state",1)->find();
                     if($p_user!=null){
-                        Procurementxypencil::create([
+                         Procurementxypencil::create([
                             'user_id' => $p_user['user_id'],
                             'u_id' => $value['p_id'],
                             'pencil_price' => round($value['w_price']*$xy_set['s_content'],2),
@@ -2340,10 +2350,10 @@ class OrderLogic extends Logic
                                 $jicai = round($piw_price1 * $percent/100 * $value['caiji_percent'] / 100, 2);
                                 Order::where('id', $order_id)
                                     ->inc('distribution_money',$jicai)->update();
-                                //                        UserDistribution::where('user_id', $user_id)
-                                //                            ->inc('order_amount', $jicai)->update();
-                                //                        UserDistribution::where('user_id', $user_id)
-                                //                            ->inc('order_num')->update();
+            //                        UserDistribution::where('user_id', $user_id)
+            //                            ->inc('order_amount', $jicai)->update();
+            //                        UserDistribution::where('user_id', $user_id)
+            //                            ->inc('order_num')->update();
                                 User::where('id', $user_first_msg['first_leader'])
                                     ->inc('earnings', $jicai)->update();
                                 $earnings_buy = AccountLog::where('user_id', $user_first_msg['first_leader'])->order("create_time desc")->limit(1)->value('left_amount');
@@ -2384,8 +2394,8 @@ class OrderLogic extends Logic
                             Order::where('id', $order_id)
                                 ->inc('distribution_money',$shop_percent)->update();
                             $shopDistribution_msg =  UserShopDistribution::where('shop_id', $value['shop_id'])
-                                ->find();
-                            if($shopDistribution_msg == null){
+                            ->find();
+                             if($shopDistribution_msg == null){
                                 UserShopDistribution::create([
                                     'shop_id' => $value['shop_id'],
                                     'order_num' => 1,
@@ -2399,7 +2409,7 @@ class OrderLogic extends Logic
                                 UserShopDistribution::where('shop_id', $value['shop_id'])
                                     ->inc('order_num')->update();
                             }
-
+                    
                             User::where('id', $shop_user_msg['reference_user_id'])
                                 ->inc('earnings', $shop_percent)->update();
                             $earnings_buy = AccountLog::where('user_id', $shop_user_msg['reference_user_id'])->order("create_time desc")->limit(1)->value('left_amount');
@@ -2633,8 +2643,8 @@ class OrderLogic extends Logic
                 }
 
             }else{
-                trace('cheshi', $user_id.'-'.$user_msg['first_leader']);
-
+                                trace('cheshi', $user_id.'-'.$user_msg['first_leader']);
+                
                 if($is_d != null){
                     // 推广收益
                     $first_leader_percent = round($value['total_pay_price'] * $value['user_price_percent'] / 100, 2);
@@ -2681,7 +2691,7 @@ class OrderLogic extends Logic
                         $shop_percent = round($value['total_pay_price'] * $value['user_shop_percent'] / 100, 2);
                         Order::where('id', $order_id)
                             ->inc('distribution_money',$shop_percent)->update();
-                        $shopDistribution_msg =  UserShopDistribution::where('shop_id', $value['shop_id'])
+                         $shopDistribution_msg =  UserShopDistribution::where('shop_id', $value['shop_id'])
                             ->find();
                         if($shopDistribution_msg == null){
                             UserShopDistribution::create([
@@ -2931,7 +2941,7 @@ class OrderLogic extends Logic
      * @author suny
      * @date 2021/7/13 6:23 下午
      */
-    public static function getPayWay($user_id, $client, $params)
+   public static function getPayWay($user_id, $client, $params)
     {
 
         $payModel = new Pay();
@@ -3028,7 +3038,7 @@ class OrderLogic extends Logic
      * @author suny
      * @date 2021/7/13 6:23 下午
      */
-    public static function orderTraces($id, $user_id)
+   public static function orderTraces($id, $user_id)
     {
         $order = new Order();
         $order = $order->alias('o')
@@ -3060,7 +3070,7 @@ class OrderLogic extends Logic
             $order_delivery = Delivery::where(['order_id' => $id])->field('invoice_no,shipping_name,shipping_id,mobile')->find();
 
             $express = ConfigServer::get('express', 'way');
-
+            
             //已发货
             if ($express && $order['shipping_status']) {
                 $result = Kd100Logic::detail($id);
@@ -3087,10 +3097,10 @@ class OrderLogic extends Logic
                             if ($shipping_code === 'shunfeng') {
                                 $phone = $order['mobile'];
                             }
-
+                            
                             $expressage->logistics($shipping_code, $order_delivery['invoice_no'], $phone);
                         }
-
+                     
                         $traces = $expressage->logisticsFormat();
                         //获取不到物流轨迹时
                         if ($traces == false) {
@@ -3118,7 +3128,7 @@ class OrderLogic extends Logic
                     }
                 }
             }
-
+            
             //待收货
             if ($order['order_status'] == 2) {
                 $shipment['tips'] = '商品已出库';
@@ -3161,7 +3171,7 @@ class OrderLogic extends Logic
 
         return $order_traces;
     }
-
+    
     /**
      * @notes 配送方式无需快递的
      * @param $delivery_id
diff --git a/app/api/logic/PayLogic.php b/app/api/logic/PayLogic.php
old mode 100644
new mode 100755
index d611ca6b..17215d57
--- a/app/api/logic/PayLogic.php
+++ b/app/api/logic/PayLogic.php
@@ -343,7 +343,7 @@ class PayLogic extends Logic
         if (isset($order['pay_status']) && $order['pay_status'] == PayEnum::ISPAID) {
             return JsonServer::error('订单已支付');
         }
-        $xy_price = Procurementxy::where("user_id",$order['user_id'])->where('xy_state',1)->find();
+       $xy_price = Procurementxy::where("user_id",$order['user_id'])->where('xy_state',1)->find();
         if($xy_price == null){
             return JsonServer::error('暂无额度，无法使用');
         }elseif($xy_price['xy_y_state']!=0){
@@ -370,6 +370,7 @@ class PayLogic extends Logic
             return JsonServer::error('额度不足');
         }
 
+
         // 积分订单
         if($form == 'integral') {
             $result = self::payIntegralOrder($order);
@@ -573,12 +574,13 @@ class PayLogic extends Logic
                             foreach($procurementxyprice as $key=>$value){
                                 $allprice+=$value['xp_aprice']+$value['xp_interest'];
                             }
-//                            $allprice = 0.01;
+                            $allprice = 0.01;
                             $order['xy_y_price'] = $allprice;
                         }else{
                             $procurementxyprice = Procurementxyprice::where("ap_id",$procurementxyallprice['ap_id'])->where("xp_state",0)->order("xp_price_time asc")->limit(1)->find();
                             if($procurementxyprice!=null){
-                                $order['xy_y_price'] = $procurementxyprice['xp_aprice'];
+                                // $order['xy_y_price'] = $procurementxyprice['xp_aprice'];
+                                $order['xy_y_price'] = 0.01;
                             }else{
                                 return JsonServer::error('查无数据');
                             }
@@ -587,8 +589,10 @@ class PayLogic extends Logic
                         return JsonServer::error('暂无还款');
                     }
                 }else{
-                    $order['xy_y_price'] = $o['xy_y_price'];
+                    // $order['xy_y_price'] = $o['xy_y_price'];
+                    $order['xy_y_price'] = 0.01;
                 }
+               
                 $order['user_id'] = $order_id;
                 $order['order_sn'] = time().'xy123456';
                 $RpayModel = new Procurementxyrpay();
@@ -652,7 +656,26 @@ class PayLogic extends Logic
         }
         return JsonServer::success('微信支付发起成功', $res, 1);
     }
-
+//本地商家支付
+    public static function localWxPay($user_id,$post,$client){
+        $res = WeChatPayServer::localserverWxPay($user_id,$post, $client);
+        if (false === $res) {
+            return JsonServer::error(WeChatPayServer::getError());
+        }
+        if ((is_object($res) || is_string($res)) && $client != Client_::pc) {
+            $res = (array)($res);
+        }
+        if (is_string($res)) {
+            $data = [
+                'code' => 1,
+                'msg' => '微信支付发起成功',
+                'show' => 0,
+                'data' => $res
+            ];
+            return json($data);
+        }
+        return JsonServer::success('微信支付发起成功', $res, 1);
+    }
     /**
      * @notes 支付宝支付
      * @param $order_id
diff --git a/app/api/logic/PcLogic.php b/app/api/logic/PcLogic.php
old mode 100644
new mode 100755
index 6dca34fb..50490cbb
--- a/app/api/logic/PcLogic.php
+++ b/app/api/logic/PcLogic.php
@@ -52,7 +52,7 @@ class PcLogic extends Logic
         if ($user_id) {
             $cart_num = Db::name('cart')->where(['user_id' => $user_id])->sum('goods_num');
             $coupon_num = Db::name('coupon_list')->where(['user_id' => $user_id, 'del' => 0, 'status' => 0])->count();
-            $nickname = Db::name('procurement')->where(['id' => $user_id])->value('nickname');
+            $nickname = Db::name('user')->where(['id' => $user_id])->value('nickname');
         }
 
         return [
@@ -160,7 +160,7 @@ class PcLogic extends Logic
             'sex' => $post['sex'],
             'update_time' => time(),
         ];
-        Db::name('procurement')->where(['id' => $post['user_id']])->update($data);
+        Db::name('user')->where(['id' => $post['user_id']])->update($data);
         return true;
     }
 
diff --git a/app/api/logic/PolicyLogic.php b/app/api/logic/PolicyLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/RechargeLogic.php b/app/api/logic/RechargeLogic.php
old mode 100644
new mode 100755
index 9c2a82d2..2bbe6e63
--- a/app/api/logic/RechargeLogic.php
+++ b/app/api/logic/RechargeLogic.php
@@ -2,7 +2,6 @@
 namespace app\api\logic;
 
 use app\common\basics\Logic;
-use app\common\model\BalanceWithdrawApply;
 use app\common\model\RechargeTemplate;
 use app\common\model\RechargeOrder;
 use app\common\server\ConfigServer;
@@ -10,6 +9,7 @@ use app\common\enum\PayEnum;
 use think\facade\Db;
 use app\common\logic\AccountLogLogic;
 use app\common\model\AccountLog;
+use app\common\model\BalanceWithdrawApply;
 
 class RechargeLogic extends Logic
 {
@@ -49,7 +49,7 @@ class RechargeLogic extends Logic
                 $template = RechargeTemplate::where(['del'=>0,'money'=>$post['money']])
                     ->field('id,money,give_money')
                     ->findOrEmpty();
-
+     
                 $money = $post['money'];
                 $give_money = 0;
                 if(!$template->isEmpty()){
@@ -85,24 +85,24 @@ class RechargeLogic extends Logic
             return false;
         }
     }
-
-    /*卡密核销逻辑*/
-    public static function kamihexiao($user_id,$post)
+	
+	/*卡密核销逻辑*/
+	public static function kamihexiao($user_id,$post)
     {
         try{
-
-            //var_dump($post);
-            $where = $post;
-            $where["status"] = 0; //未核销
-            $card = Db::name("card")->where($where)->find();
-            if(!$card){
-                self::$error = "卡号或者密码有误！";
-                return false;
-            }
-
-            Db::name("card")->where("id",$card["id"])->update(["status"=>1,"update_time"=>time()]); //设置该卡为已核销
-
-            $money = $card["money"];
+            
+			//var_dump($post);
+			$where = $post;
+			$where["status"] = 0; //未核销
+			$card = Db::name("card")->where($where)->find();
+			if(!$card){
+				self::$error = "卡号或者密码有误！";
+            	return false;
+			}
+			
+			Db::name("card")->where("id",$card["id"])->update(["status"=>1,"update_time"=>time()]); //设置该卡为已核销
+            
+			$money = $card["money"];
             //赠送的积分和成长值
 //            $growth = $money * $give_growth;
 //            $growth = $growth > 0 ? intval($growth) : 0;
@@ -118,12 +118,12 @@ class RechargeLogic extends Logic
                 'give_money'    => 0,
                 'give_growth'   => 0,
                 'create_time'   => time(),
-                'pay_time'      => time(),
-                'transaction_id'=> $card["card_number"],
+				'pay_time'      => time(),
+				'transaction_id'=> $card["card_number"],
             ];
 
             $id = Db::name('recharge_order')->insertGetId($add_order);
-            Db::name('user')->where("id",$user_id)->inc("user_money",$money)->update(); //增加用户余额
+			Db::name('user')->where("id",$user_id)->inc("user_money",$money)->update(); //增加用户余额
             if($id){
                 return Db::name('recharge_order')->where(['id'=>$id])->field('id,order_sn,give_growth')->find();
             }
@@ -133,7 +133,7 @@ class RechargeLogic extends Logic
             return false;
         }
     }
-
+	
 
     public static function rechargeRecord($get)
     {
@@ -147,10 +147,10 @@ class RechargeLogic extends Logic
             ->select()
             ->toArray();
         $count = RechargeOrder::where([
-            'user_id' => $get['user_id'],
-            'pay_status' => PayEnum::ISPAID
-        ])
-        ->count();
+                'user_id' => $get['user_id'],
+                'pay_status' => PayEnum::ISPAID
+            ])
+            ->count();
 
         foreach($list as &$item) {
             if($item['give_money'] > 0) {
@@ -171,7 +171,7 @@ class RechargeLogic extends Logic
 
         return $result;
     }
-
+    
     /**
      * 提现记录
      */
@@ -186,6 +186,10 @@ class RechargeLogic extends Logic
         ->select()
         ->toArray();
 
+        $count = BalanceWithdrawApply::where([
+            'user_id' => $get['user_id']
+        ])->count();
+        
         foreach ($list as &$v) {
             if (!is_null($v['description'])) {
                 $v['desc'] = $v['description'] ?  '审核失败：' . $v['description'] :  '审核失败,金额已退回佣金账户';
@@ -193,11 +197,7 @@ class RechargeLogic extends Logic
                 $v['desc'] = '提现￥' . number_format($v['money'], 2) . ', 手续费: ' . ($v['poundage'] * 100) . '%, 实际到账 ￥' . $v['left_money'];
             }
         }
-
-        $count = BalanceWithdrawApply::where([
-            'user_id' => $get['user_id']
-        ])->count();
-
+        
         $result = [
             'count' => $count,
             'lists' => $list,
diff --git a/app/api/logic/SearchRecordLogic.php b/app/api/logic/SearchRecordLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/SeckillGoodsLogic.php b/app/api/logic/SeckillGoodsLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/SeckillLogic.php b/app/api/logic/SeckillLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/ShareLogic.php b/app/api/logic/ShareLogic.php
old mode 100644
new mode 100755
index ab2fed1e..4c825eac
--- a/app/api/logic/ShareLogic.php
+++ b/app/api/logic/ShareLogic.php
@@ -34,7 +34,7 @@ class ShareLogic extends Logic
      * @author suny
      * @date 2021/7/13 6:25 下午
      */
-    public static function shareGoods($user_id, $goods_id, $url,$p_id,$set_id, $client)
+    public static function shareGoods($user_id, $goods_id, $url, $client)
     {
 
         $qr_code_logic = new QrCodeLogic();
@@ -57,7 +57,7 @@ class ShareLogic extends Logic
                     $url_type = 'url';
                     $url = url($url, [], '', true) . '?' . http_build_query(['id' => $goods_id, 'invite_code' => $user['distribution_code'], 'isapp' => 1]);
             }
-            $result = $qr_code_logic->makeGoodsPoster($user, $goods, $url, $url_type,$p_id,$set_id);
+            $result = $qr_code_logic->makeGoodsPoster($user, $goods, $url, $url_type);
         }
         return $result;
     }
@@ -145,7 +145,7 @@ class ShareLogic extends Logic
     public static function shareBargain($user_id, $id, $url, $client)
     {
 
-        $user = Db::name('procurement')->where(['id' => $user_id])->find();
+        $user = Db::name('user')->where(['id' => $user_id])->find();
         $client = Client_::h5;
         switch ($client) {
             case Client_::mnp: //小程序
@@ -183,36 +183,24 @@ class ShareLogic extends Logic
         $type = $get['type'] ?? 0;
         $scene = null;
         $extra = [];
-        if(isset($get['p_id'])){
-            $p_id= $get['p_id'];
-        }else{
-            $p_id= 0;
-        }
-        if(isset($get['set'])){
-            $set_id = $get['set'];
-        }else{
-            $set_id= 0;
-        }
-        if($p_id!=0){
-            $scene = 'id='.$p_id.'&set='.$set_id;
-        }else{
-            if(2 != $type){
-                //用户分销码
-                $distribution_code = User::where(['id' => $user_id])->value('distribution_code');
-                $scene = 'invite_code='.$distribution_code;
 
-                if(1 == $type){
-                    $scene .= '&id='.$get['id'];
-                }
-            } else {
-                $launch = BargainLaunch::where(['id'=>$get['id']])->value('bargain_id');
-                $extra = Bargain::where(['id' => $launch])
-                    ->field('share_title,share_intro')
-                    ->find()->toArray();
+        if(2 != $type){
+            //用户分销码
+            $distribution_code = User::where(['id' => $user_id])->value('distribution_code');
+            $scene = 'invite_code='.$distribution_code;
 
-                $scene = 'id='.$get['id'];
+            if(1 == $type){
+                $scene .= '&id='.$get['id'];
             }
+        } else {
+            $launch = BargainLaunch::where(['id'=>$get['id']])->value('bargain_id');
+            $extra = Bargain::where(['id' => $launch])
+                ->field('share_title,share_intro')
+                ->find()->toArray();
+
+            $scene = 'id='.$get['id'];
         }
+
         $param = [
             'page'      => $get['url'],
             'scene'     => $scene
diff --git a/app/api/logic/ShopApplyLogic.php b/app/api/logic/ShopApplyLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/ShopCategoryLogic.php b/app/api/logic/ShopCategoryLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/ShopFollowLogic.php b/app/api/logic/ShopFollowLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/ShopGoodsCategoryLogic.php b/app/api/logic/ShopGoodsCategoryLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/ShopLogic.php b/app/api/logic/ShopLogic.php
old mode 100644
new mode 100755
index c5e484ed..f4044ddf
--- a/app/api/logic/ShopLogic.php
+++ b/app/api/logic/ShopLogic.php
@@ -100,7 +100,7 @@ class ShopLogic extends Logic
                     $set_price_type = 3;
                 }
                 if ($set['set_pro'] != 0) {
-//                    $set_price_type = 1;
+                    // $set_price_type = 1;
                     if ($set['set_pro_type'] == 1) {
                         $shop['goods_list'][$key]['purchase_price'] = round($value['purchase_price'] * (100 + $set['set_pro']) / 100, 2);
                     }
@@ -109,7 +109,7 @@ class ShopLogic extends Logic
                     }
                 }
                 if ($set['set_issued'] != 0) {
-//                    $set_price_type = 2;
+                    // $set_price_type = 2;
                     if ($set['set_issued_type'] == 1) {
                         $shop['goods_list'][$key]['issuing_price'] = round($value['issuing_price'] * (100 + $set['set_issued']) / 100, 2);
                     }
@@ -118,7 +118,7 @@ class ShopLogic extends Logic
                     }
                 }
                 if ($set['set_wholesale'] != 0) {
-//                    $set_price_type = 3;
+                    // $set_price_type = 3;
                     if ($set['set_wholesale_type'] == 1) {
                         $shop['goods_list'][$key]['wholesale_price'] = round($value['wholesale_price'] * (100 + $set['set_wholesale']) / 100, 2);
                     }
@@ -205,7 +205,7 @@ class ShopLogic extends Logic
         }
         $set_price_type = 0;
         if($set != null){
-            if($set['price_type']==1){
+              if($set['price_type']==1){
                 $set_price_type = 1;
             }
             if($set['price_type']==2){
@@ -214,15 +214,15 @@ class ShopLogic extends Logic
             if($set['price_type']==3){
                 $set_price_type = 3;
             }
-//            if ($set['set_pro'] != 0) {
-//                $set_price_type = 1;
-//            }
-//            if ($set['set_issued'] != 0) {
-//                $set_price_type = 2;
-//            }
-//            if ($set['set_wholesale'] != 0) {
-//                $set_price_type = 3;
-//            }
+            // if ($set['set_pro'] != 0) {
+            //     $set_price_type = 1;
+            // }
+            // if ($set['set_issued'] != 0) {
+            //     $set_price_type = 2;
+            // }
+            // if ($set['set_wholesale'] != 0) {
+            //     $set_price_type = 3;
+            // }
         }
         $list = Shop::field('id,type,name,logo,background,visited_num,cover,banner')
             ->where($where)
@@ -311,7 +311,6 @@ class ShopLogic extends Logic
             'page_no' => $get['page_no'],
             'page_isze' => $get['page_size']
         ];
-
         return $data;
     }
 
@@ -400,7 +399,7 @@ class ShopLogic extends Logic
         }
         $set_price_type = 0;
         if($set != null){
-            if($set['price_type']==1){
+              if($set['price_type']==1){
                 $set_price_type = 1;
             }
             if($set['price_type']==2){
@@ -409,15 +408,15 @@ class ShopLogic extends Logic
             if($set['price_type']==3){
                 $set_price_type = 3;
             }
-//            if ($set['set_pro'] != 0) {
-//                $set_price_type = 1;
-//            }
-//            if ($set['set_issued'] != 0) {
-//                $set_price_type = 2;
-//            }
-//            if ($set['set_wholesale'] != 0) {
-//                $set_price_type = 3;
-//            }
+            // if ($set['set_pro'] != 0) {
+            //     $set_price_type = 1;
+            // }
+            // if ($set['set_issued'] != 0) {
+            //     $set_price_type = 2;
+            // }
+            // if ($set['set_wholesale'] != 0) {
+            //     $set_price_type = 3;
+            // }
         }
 
         foreach($list as &$shop) {
diff --git a/app/api/logic/SignLogic.php b/app/api/logic/SignLogic.php
old mode 100644
new mode 100755
index 656e8be6..fb74d64e
--- a/app/api/logic/SignLogic.php
+++ b/app/api/logic/SignLogic.php
@@ -74,7 +74,7 @@ class SignLogic extends Logic
         $integral_tips = self::getInegralTips($user_id, $user['today_sign'], $data['today_sign_integral']);
 
         return [
-            'procurement' => $user,
+            'user' => $user,
             'sign_list' => $data['days_list'],
             'integral_tips' => $integral_tips,
         ];
diff --git a/app/api/logic/SubscribeLogic.php b/app/api/logic/SubscribeLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/TeamLogic.php b/app/api/logic/TeamLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/UserAddressLogic.php b/app/api/logic/UserAddressLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/UserLogic.php b/app/api/logic/UserLogic.php
old mode 100644
new mode 100755
index d3a852a5..65cb41fc
--- a/app/api/logic/UserLogic.php
+++ b/app/api/logic/UserLogic.php
@@ -36,7 +36,7 @@ class UserLogic extends Logic
         //待支付
         $user->wait_pay = Order::where(['del'=>0,'user_id'=>$user_id,'order_status'=>Order::STATUS_WAIT_PAY,'pay_status'=>0])->count();
         //待发货
-        $a = 0;
+          $a = 0;
         $order_msg = Order::where(['del'=>0,'user_id'=>$user_id,'order_status'=>Order::STATUS_WAIT_DELIVERY,'pay_status'=>1])->select();
         foreach($order_msg as $key=>$value){
             $order_after_sale = AfterSale::where(['order_id'=>$value['id'],'del'=>0])->find();
@@ -45,7 +45,7 @@ class UserLogic extends Logic
             }
         }
         $user->wait_delivery = $a;
-//        $user->wait_delivery = Order::where(['del'=>0,'user_id'=>$user_id,'order_status'=>Order::STATUS_WAIT_DELIVERY,'pay_status'=>1])->count();
+        // $user->wait_delivery = Order::where(['del'=>0,'user_id'=>$user_id,'order_status'=>Order::STATUS_WAIT_DELIVERY,'pay_status'=>1])->count();
         //待收货
         $user->wait_take = Order::where(['del'=>0,'user_id'=>$user_id,'order_status'=>Order::STATUS_WAIT_RECEIVE,'pay_status'=>1])->count();
         //待评论
@@ -90,11 +90,10 @@ class UserLogic extends Logic
         $user->visible(['id','xp_price_state','nickname','sn','avatar', 'mobile', 'hasPayPassword','next_level_tips','user_money','total_order_amount','total_recharge_amount',
             'coupon','user_integral','level','wait_pay','wait_take','wait_delivery',
             'wait_comment','after_sale', 'distribution_setting', 'distribution_code', 'notice_num', 'collect','level_name','vip','is_new_user']);
+            $user['xp_price_state'] = 2;
         $user = $user->toArray();
-        $user['xp_price_state'] = 2;
         $xy = Procurementxy::where(['user_id' => $user_id, 'xy_state' => 1])->find();
         if($xy!=null){
-
             $user['xy_price'] = $xy['xy_price'];
             $user['xy_ap_state'] = $xy['xy_ap_state'];
         }
@@ -254,6 +253,16 @@ class UserLogic extends Logic
         }
         $info = $info->toArray();
         $info['open_racharge'] = ConfigServer::get('recharge','open_racharge',0);
+        
+        // 提现规则
+        $info['rule'] = '
+            <p>
+                <b>规则</b>
+            </p> 
+            <p>1.&nbsp;此余额提现需要扣除50%的手续费</p> 
+            <p>2.&nbsp;此余额不能参与返补</p> 
+            <p>3.&nbsp;此余额不能参与8折</p>
+        ';
         return $info;
     }
 
diff --git a/app/api/logic/WechatLogic.php b/app/api/logic/WechatLogic.php
old mode 100644
new mode 100755
diff --git a/app/api/logic/WithdrawLogic.php b/app/api/logic/WithdrawLogic.php
old mode 100644
new mode 100755
index b2385bde..d620ead7
--- a/app/api/logic/WithdrawLogic.php
+++ b/app/api/logic/WithdrawLogic.php
@@ -28,7 +28,7 @@ class WithdrawLogic extends Logic
      * @author suny
      * @date 2021/7/13 6:26 下午
      */
-    public static function config($user_id)
+    public static function config($user_id, $hide = '')
     {
 
         $user = User::where('id', $user_id)->find();
@@ -42,6 +42,7 @@ class WithdrawLogic extends Logic
         ];
 
         $types = ConfigServer::get('withdraw', 'type', [2]); //提现方式,若未设置默认为提现方式为钱包
+
         // 封装提现方式
         $config['type'] = [];
         if ($types) {
@@ -52,10 +53,15 @@ class WithdrawLogic extends Logic
                 ];
             }
         }
+
         $a = $config['type'][0];
         $config['type'][0] = $config['type'][1];
         $config['type'][1] = $config['type'][2];
-        $config['type'][2] = $a;
+
+        if ($hide == 'balance') {
+            unset($config['type'][2]);
+        }
+
         return $config;
     }
 
diff --git a/app/api/middleware.php b/app/api/middleware.php
old mode 100644
new mode 100755
diff --git a/app/api/server/UserServer.php b/app/api/server/UserServer.php
old mode 100644
new mode 100755
index 154263ef..f6d5f4ee
--- a/app/api/server/UserServer.php
+++ b/app/api/server/UserServer.php
@@ -68,9 +68,9 @@ class UserServer
             } else {
                 if ($config['default'] == 'local') {
                     $file_name = md5($openid . $time) . '.jpeg';
-                    $avatar = download_file($avatar_url, 'uploads/procurement/avatar/', $file_name);
+                    $avatar = download_file($avatar_url, 'uploads/user/avatar/', $file_name);
                 } else {
-                    $avatar = 'uploads/procurement/avatar/' . md5($openid . $time) . '.jpeg';
+                    $avatar = 'uploads/user/avatar/' . md5($openid . $time) . '.jpeg';
                     $StorageDriver = new StorageDriver($config);
                     if (!$StorageDriver->fetch($avatar_url, $avatar)) {
                         throw new Exception( '头像保存失败:'. $StorageDriver->getError());
@@ -188,9 +188,9 @@ class UserServer
                 $avatar = '';     //头像路径
                 if ($config['default'] == 'local') {
                     $file_name = md5($openid . $time) . '.jpeg';
-                    $avatar = download_file($avatar_url, 'uploads/procurement/avatar/', $file_name);
+                    $avatar = download_file($avatar_url, 'uploads/user/avatar/', $file_name);
                 } else {
-                    $avatar = 'uploads/procurement/avatar/' . md5($openid . $time) . '.jpeg';
+                    $avatar = 'uploads/user/avatar/' . md5($openid . $time) . '.jpeg';
                     $StorageDriver = new StorageDriver($config);
                     if (!$StorageDriver->fetch($avatar_url, $avatar)) {
                         throw new Exception( '头像保存失败:'. $StorageDriver->getError());
diff --git a/app/api/validate/AfterSaleValidate.php b/app/api/validate/AfterSaleValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/BalanceWithdrawValidate.php b/app/api/validate/BalanceWithdrawValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/BargainValidate.php b/app/api/validate/BargainValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/BillionsWithdrawValidate.php b/app/api/validate/BillionsWithdrawValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/CartValidate.php b/app/api/validate/CartValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/ChangeMobileValidate.php b/app/api/validate/ChangeMobileValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/ChangeUserInfo.php b/app/api/validate/ChangeUserInfo.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/CommunityArticleValidate.php b/app/api/validate/CommunityArticleValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/CommunityCommentValidate.php b/app/api/validate/CommunityCommentValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/CouponValidate.php b/app/api/validate/CouponValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/DistributionValidate.php b/app/api/validate/DistributionValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/GoodsCommentValidate.php b/app/api/validate/GoodsCommentValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/IntegralGoodsValidate.php b/app/api/validate/IntegralGoodsValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/IntegralOrderValidate.php b/app/api/validate/IntegralOrderValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/IntegralPlaceOrderValidate.php b/app/api/validate/IntegralPlaceOrderValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/LoginPasswordValidate.php b/app/api/validate/LoginPasswordValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/LoginValidate.php b/app/api/validate/LoginValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/MakeMnQrcode.php b/app/api/validate/MakeMnQrcode.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/OaLoginValidate.php b/app/api/validate/OaLoginValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/OrderInvoiceValidate.php b/app/api/validate/OrderInvoiceValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/OrderValidate.php b/app/api/validate/OrderValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/PlaceOrderInvoiceValidate.php b/app/api/validate/PlaceOrderInvoiceValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/RechargeValidate.php b/app/api/validate/RechargeValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/RegisterValidate.php b/app/api/validate/RegisterValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/SetWechatUserValidate.php b/app/api/validate/SetWechatUserValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/ShopApplyValidate.php b/app/api/validate/ShopApplyValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/SignValidate.php b/app/api/validate/SignValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/SmsSend.php b/app/api/validate/SmsSend.php
old mode 100644
new mode 100755
index 9cfb1520..020ebc78
--- a/app/api/validate/SmsSend.php
+++ b/app/api/validate/SmsSend.php
@@ -43,7 +43,7 @@ class SmsSend extends Validate
     {
         if($data['client'] == Client_::pc && $data['key'] == 'BGSJHM'){
             $data['new_mobile'] =  $data['mobile'];
-            $mobile = Db::name('procurement')->where(['id' => $data['user_id']])->value('mobile');
+            $mobile = Db::name('user')->where(['id' => $data['user_id']])->value('mobile');
             $data['mobile'] =  $mobile;
         }
         $user = User::where(['mobile' => $data['mobile'], 'del' => 0])->findOrEmpty();
diff --git a/app/api/validate/TeamValidate.php b/app/api/validate/TeamValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/TokenValidate.php b/app/api/validate/TokenValidate.php
old mode 100644
new mode 100755
index 98929ca3..5c3ab2b8
--- a/app/api/validate/TokenValidate.php
+++ b/app/api/validate/TokenValidate.php
@@ -26,7 +26,7 @@ use app\common\model\user\User;
 class TokenValidate extends Validate
 {
     protected $rule = [
-        'token' => 'require|valid|procurement',
+        'token' => 'require|valid|user',
     ];
 
     /**
diff --git a/app/api/validate/UpdateUserValidate.php b/app/api/validate/UpdateUserValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/UserAddressValidate.php b/app/api/validate/UserAddressValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/WechatMobileValidate.php b/app/api/validate/WechatMobileValidate.php
old mode 100644
new mode 100755
diff --git a/app/api/validate/WithdrawValidate.php b/app/api/validate/WithdrawValidate.php
old mode 100644
new mode 100755
diff --git a/app/common.php b/app/common.php
old mode 100644
new mode 100755
diff --git a/app/common/HotList.php b/app/common/HotList.php
new file mode 100755
index 00000000..f7fb481c
--- /dev/null
+++ b/app/common/HotList.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace app\common\model;
+
+use app\common\basics\Models;
+use app\common\model\goods\Goods;
+
+class HotList extends Models
+{
+    protected $table = 'ls_hot_list';
+
+    public function goods()
+    {
+        return $this->belongsTo(Goods::class,'goods_id', 'id')->field('id, name, image');
+    }
+}
\ No newline at end of file
diff --git a/app/common/basics/AdminBase.php b/app/common/basics/AdminBase.php
old mode 100644
new mode 100755
diff --git a/app/common/basics/Api.php b/app/common/basics/Api.php
old mode 100644
new mode 100755
diff --git a/app/common/basics/IndexBase.php b/app/common/basics/IndexBase.php
old mode 100644
new mode 100755
diff --git a/app/common/basics/KefuBase.php b/app/common/basics/KefuBase.php
old mode 100644
new mode 100755
diff --git a/app/common/basics/Logic.php b/app/common/basics/Logic.php
old mode 100644
new mode 100755
diff --git a/app/common/basics/Models.php b/app/common/basics/Models.php
old mode 100644
new mode 100755
diff --git a/app/common/basics/ShopApi.php b/app/common/basics/ShopApi.php
old mode 100644
new mode 100755
diff --git a/app/common/basics/ShopBase.php b/app/common/basics/ShopBase.php
old mode 100644
new mode 100755
diff --git a/app/common/basics/Validate.php b/app/common/basics/Validate.php
old mode 100644
new mode 100755
diff --git a/app/common/cache/CacheBase.php b/app/common/cache/CacheBase.php
old mode 100644
new mode 100755
diff --git a/app/common/cache/CommunityArticleCache.php b/app/common/cache/CommunityArticleCache.php
old mode 100644
new mode 100755
diff --git a/app/common/cache/ExportCache.php b/app/common/cache/ExportCache.php
old mode 100644
new mode 100755
diff --git a/app/common/cache/RegionCache.php b/app/common/cache/RegionCache.php
old mode 100644
new mode 100755
diff --git a/app/common/command/AwardIntegral.php b/app/common/command/AwardIntegral.php
old mode 100644
new mode 100755
diff --git a/app/common/command/BargainClose.php b/app/common/command/BargainClose.php
old mode 100644
new mode 100755
diff --git a/app/common/command/Crontab.php b/app/common/command/Crontab.php
old mode 100644
new mode 100755
diff --git a/app/common/command/DistributionOrder.php b/app/common/command/DistributionOrder.php
old mode 100644
new mode 100755
diff --git a/app/common/command/OrderClose.php b/app/common/command/OrderClose.php
old mode 100644
new mode 100755
diff --git a/app/common/command/OrderFinish.php b/app/common/command/OrderFinish.php
old mode 100644
new mode 100755
index 16cff867..285708bb
--- a/app/common/command/OrderFinish.php
+++ b/app/common/command/OrderFinish.php
@@ -37,8 +37,11 @@ class OrderFinish extends Command
                 ['del', '=', 0]
             ])->whereRaw("shipping_time+$finish_limit < $time")
               ->select()->toArray();
+              
+              
 
             foreach ($orders as $order) {
+                //Log::write('自动确认收货订单:'.$order["id"]);
                 $model->where(['id' => $order['id']])
                     ->update([
                         'order_status'      => OrderEnum::ORDER_STATUS_COMPLETE,
diff --git a/app/common/command/Password.php b/app/common/command/Password.php
old mode 100644
new mode 100755
diff --git a/app/common/command/TeamEnd.php b/app/common/command/TeamEnd.php
old mode 100644
new mode 100755
diff --git a/app/common/command/UserDistribution.php b/app/common/command/UserDistribution.php
old mode 100644
new mode 100755
diff --git a/app/common/command/WechatLiveGoods.php b/app/common/command/WechatLiveGoods.php
old mode 100644
new mode 100755
diff --git a/app/common/command/WechatLiveRoom.php b/app/common/command/WechatLiveRoom.php
old mode 100644
new mode 100755
diff --git a/app/common/command/WechatMerchantTransfer.php b/app/common/command/WechatMerchantTransfer.php
old mode 100644
new mode 100755
diff --git a/app/common/command/WechatMiNiCheckPayOrder.php b/app/common/command/WechatMiNiCheckPayOrder.php
old mode 100644
new mode 100755
index 4429af98..4afe5614
--- a/app/common/command/WechatMiNiCheckPayOrder.php
+++ b/app/common/command/WechatMiNiCheckPayOrder.php
@@ -38,7 +38,7 @@ class WechatMiNiCheckPayOrder extends Command
         try {
             $config = WeChatServer::getPayConfigBySource(1)['config'];
             $app = Factory::payment($config);
-
+    
             RechargeOrder::where('pay_status', PayEnum::UNPAID)->chunk(5, function ($orders) use ($app) {
                 foreach($orders as $order){
                     $result = $app->order->queryByOutTradeNumber($order['order_sn'] . $this->prefix);
@@ -48,7 +48,7 @@ class WechatMiNiCheckPayOrder extends Command
                         $update_data['pay_status'] = PayEnum::ISPAID;
                         $update_data['transaction_id'] = isset($result['transaction_id']) ? $result['transaction_id'] : '';
                         $order->where('order_sn', $order->order_sn)->update($update_data);
-
+    
                         $user = User::find($order['user_id']);
                         $total_money = $order['order_amount'] + $order['give_money'];
                         $total_integral = $order['give_integral'];
@@ -57,14 +57,14 @@ class WechatMiNiCheckPayOrder extends Command
                         $user->user_growth = ['inc', $order['give_growth']];
                         $user->total_recharge_amount = ['inc', $total_money];
                         $user->save();
-
+    
                         //记录余额
                         $total_money > 0 && AccountLogLogic::AccountRecord($user->id, $total_money, 1, AccountLog::recharge_money, '', $order['id'], $order['order_sn']);
                         //记录积分
                         $total_integral > 0 && AccountLogLogic::AccountRecord($user->id, $total_integral, 1, AccountLog::recharge_give_integral);
                         //记录成长值
                         $order['give_growth'] > 0 && AccountLogLogic::AccountRecord($user->id, $order['give_growth'], 1, AccountLog::recharge_give_growth);
-
+    
                         // 余额充值参与百亿补贴
                         self::recharge_billions($order, $order['user_id']);
                     }
@@ -162,7 +162,7 @@ class WechatMiNiCheckPayOrder extends Command
                             $ufl = round($ufl+$v['subsidy_price']-$v['order_price'],6);
                         }else{
                             $subsidy_price_sum = round($v['subsidy_price']+$ufl,6);
-                            Db::name("user_billions")->where("billions_id",$v['billions_id'])->update(['subsidy_price'=>$subsidy_price_sum]);
+                             Db::name("user_billions")->where("billions_id",$v['billions_id'])->update(['subsidy_price'=>$subsidy_price_sum]);
                             // Db::name("user_billions")->where("billions_id",$v['billions_id'])->inc("subsidy_price",$ufl)->update();
                             $ufl = 0;
                         }
@@ -211,7 +211,7 @@ class WechatMiNiCheckPayOrder extends Command
                 }
             }
         }
-        $billion_arr = $billion_arr_id = "";
+         $billion_arr = $billion_arr_id = "";
         foreach($billions_msg as $k=>$v){
             if($k + 1 <= $user_start_num){
                 //       var_dump($v['order_price']);
@@ -290,7 +290,7 @@ class WechatMiNiCheckPayOrder extends Command
                     }
 
                 }else{
-                    $subp = round($v['subsidy_price']+$arr[$k],6);
+                     $subp = round($v['subsidy_price']+$arr[$k],6);
                     $billion_arr.="  when ".$v['billions_id']." then '".$subp."'";
                     $billion_arr_id.=$v['billions_id'].",";
                     // Db::name("user_billions")->where("billions_id", $v['billions_id'])->inc("subsidy_price", $arr[$k])->update();
@@ -369,14 +369,14 @@ class WechatMiNiCheckPayOrder extends Command
                         }
                     }
                 }else{
-                    $subp =  round($v['subsidy_price']+$arr1[$k-$user_start_num],6);
-                    $billion_arr.="  when ".$v['billions_id']." then '".$subp."'";
-                    $billion_arr_id.=$v['billions_id'].",";
+                     $subp =  round($v['subsidy_price']+$arr1[$k-$user_start_num],6);
+                     $billion_arr.="  when ".$v['billions_id']." then '".$subp."'";
+                      $billion_arr_id.=$v['billions_id'].",";
                     // Db::name("user_billions")->where("billions_id",$v['billions_id'])->inc("subsidy_price",$arr1[$k-$user_start_num])->update();
                 }
             }
         }
-        $billion_arr_id = explode(",",$billion_arr_id);
+         $billion_arr_id = explode(",",$billion_arr_id);
         array_pop($billion_arr_id);
         // print_r("<pre>");
         // var_dump($billion_arr_id);die;
diff --git a/app/common/enum/ActivityAreaEnum.php b/app/common/enum/ActivityAreaEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/AdEnum.php b/app/common/enum/AdEnum.php
old mode 100644
new mode 100755
index e2b5f3ce..6ee87a24
--- a/app/common/enum/AdEnum.php
+++ b/app/common/enum/AdEnum.php
@@ -61,7 +61,7 @@ class AdEnum{
                 ],
                 [
                     'name'      => '个人中心',
-                    'path'      => '/pages/procurement/procurement',
+                    'path'      => '/pages/user/user',
                     'is_tab'    => 1,
                 ],
                 [
diff --git a/app/common/enum/AfterSaleEnum.php b/app/common/enum/AfterSaleEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/BargainEnum.php b/app/common/enum/BargainEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/CardEnum.php b/app/common/enum/CardEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/ChatMsgEnum.php b/app/common/enum/ChatMsgEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/ChatRecordEnum.php b/app/common/enum/ChatRecordEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/ClientEnum.php b/app/common/enum/ClientEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/CommunityArticleEnum.php b/app/common/enum/CommunityArticleEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/CommunityCommentEnum.php b/app/common/enum/CommunityCommentEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/CommunityLikeEnum.php b/app/common/enum/CommunityLikeEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/DecorationEnum.php b/app/common/enum/DecorationEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/DistributionOrderGoodsEnum.php b/app/common/enum/DistributionOrderGoodsEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/FileEnum.php b/app/common/enum/FileEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/FootprintEnum.php b/app/common/enum/FootprintEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/FreightEnum.php b/app/common/enum/FreightEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/GoodsEnum.php b/app/common/enum/GoodsEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/IntegralGoodsEnum.php b/app/common/enum/IntegralGoodsEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/IntegralOrderEnum.php b/app/common/enum/IntegralOrderEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/JicaiEnum.php b/app/common/enum/JicaiEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/KefuEnum.php b/app/common/enum/KefuEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/LiveGoodsEnum.php b/app/common/enum/LiveGoodsEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/LiveRoomEnum.php b/app/common/enum/LiveRoomEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/LocalLifeICBCEnum.php b/app/common/enum/LocalLifeICBCEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/MenuEnum.php b/app/common/enum/MenuEnum.php
old mode 100644
new mode 100755
index 0dcab73c..ef1abe52
--- a/app/common/enum/MenuEnum.php
+++ b/app/common/enum/MenuEnum.php
@@ -116,7 +116,7 @@ class MenuEnum{
             'is_tab'        => 0,
             'link_type'     => 1,
         ],
-        //新品推荐
+         //新品推荐
         [
             'index'         => 113,
             'name'          => '新品推荐',
@@ -198,7 +198,7 @@ class MenuEnum{
             'is_tab'        => 1,
             'link_type'     => 1,
         ],
-        //积分商城
+		//积分商城
         [
             'index'         => 121,
             'name'          => '卡密核销',
@@ -364,7 +364,7 @@ class MenuEnum{
             'link_type'     => 1,
             'menu_type'     => 1,
         ],
-        [
+         [
             'index'         => 218,
             'name'          => '兑换大厅',
             'link'          => '/bundle_b/pages/exchange/exchange',
diff --git a/app/common/enum/NoticeEnum.php b/app/common/enum/NoticeEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/OrderEnum.php b/app/common/enum/OrderEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/OrderGoodsEnum.php b/app/common/enum/OrderGoodsEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/OrderInvoiceEnum.php b/app/common/enum/OrderInvoiceEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/OrderLogEnum.php b/app/common/enum/OrderLogEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/OrderRefundEnum.php b/app/common/enum/OrderRefundEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/PayEnum.php b/app/common/enum/PayEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/PrinterEnum.php b/app/common/enum/PrinterEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/RechargeOrderEnum.php b/app/common/enum/RechargeOrderEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/ShopEnum.php b/app/common/enum/ShopEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/SmsEnum.php b/app/common/enum/SmsEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/TeamEnum.php b/app/common/enum/TeamEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/TreatyEnum.php b/app/common/enum/TreatyEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/VerificationEnum.php b/app/common/enum/VerificationEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/WechatErrorEnum.php b/app/common/enum/WechatErrorEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/enum/WithdrawEnum.php b/app/common/enum/WithdrawEnum.php
old mode 100644
new mode 100755
index b8fad6d7..e9d74521
--- a/app/common/enum/WithdrawEnum.php
+++ b/app/common/enum/WithdrawEnum.php
@@ -36,7 +36,6 @@ class WithdrawEnum
     public static function getTypeDesc($status = true)
     {
         $desc = [
-
             self::TYPE_WECHAT_CHANGE => '微信零钱',
             self::TYPE_BANK => '银行卡',
             self::TYPE_BALANCE => '东龙汇余额账户',
diff --git a/app/common/enum/WithdrawalEnum.php b/app/common/enum/WithdrawalEnum.php
old mode 100644
new mode 100755
diff --git a/app/common/exception/WechatException.php b/app/common/exception/WechatException.php
old mode 100644
new mode 100755
diff --git a/app/common/http/middleware/BaseMiddleware.php b/app/common/http/middleware/BaseMiddleware.php
old mode 100644
new mode 100755
diff --git a/app/common/listener/AfterCancelOrder.php b/app/common/listener/AfterCancelOrder.php
old mode 100644
new mode 100755
diff --git a/app/common/listener/Footprint.php b/app/common/listener/Footprint.php
old mode 100644
new mode 100755
diff --git a/app/common/listener/Notice.php b/app/common/listener/Notice.php
old mode 100644
new mode 100755
diff --git a/app/common/listener/Printer.php b/app/common/listener/Printer.php
old mode 100644
new mode 100755
diff --git a/app/common/listener/ShopStat.php b/app/common/listener/ShopStat.php
old mode 100644
new mode 100755
diff --git a/app/common/listener/UpdateCollect.php b/app/common/listener/UpdateCollect.php
old mode 100644
new mode 100755
diff --git a/app/common/listener/UserStat.php b/app/common/listener/UserStat.php
old mode 100644
new mode 100755
diff --git a/app/common/listener/websocket/Chat.php b/app/common/listener/websocket/Chat.php
old mode 100644
new mode 100755
index cccfd7d7..9177f9ef
--- a/app/common/listener/websocket/Chat.php
+++ b/app/common/listener/websocket/Chat.php
@@ -184,7 +184,7 @@ class Chat
         }
 
         $is_read = 1;
-        if ($data['from_type'] == 'procurement') {
+        if ($data['from_type'] == 'user') {
             $is_read = 0;
         }
 
diff --git a/app/common/listener/websocket/Close.php b/app/common/listener/websocket/Close.php
old mode 100644
new mode 100755
index a9e82a3f..b72ec09a
--- a/app/common/listener/websocket/Close.php
+++ b/app/common/listener/websocket/Close.php
@@ -20,7 +20,7 @@ class Close
         // 当前fd信息
         $data = $handleClass->getDataByFd($fd);
 
-        if (!empty($data) && $data['type'] == 'procurement') {
+        if (!empty($data) && $data['type'] == 'user') {
             $relation = ChatRelation::where([
                 'user_id' => $data['uid'],
                 'shop_id' => $data['shop_id']
diff --git a/app/common/listener/websocket/Login.php b/app/common/listener/websocket/Login.php
old mode 100644
new mode 100755
index d6f13af3..b7bfd72f
--- a/app/common/listener/websocket/Login.php
+++ b/app/common/listener/websocket/Login.php
@@ -32,11 +32,11 @@ class Login
             return $this->response->error('参数缺失');
         }
 
-        if (!in_array($type, ['procurement', 'kefu'])) {
+        if (!in_array($type, ['user', 'kefu'])) {
             return $this->response->error('类型错误');
         }
 
-        if ('procurement' == $type) {
+        if ('user' == $type) {
             // 查询用户信息
             $user = (new User())->alias('u')
                 ->field('u.id, u.sn, u.nickname, u.avatar, u.mobile, u.level, u.group_id, u.sex, u.disable, u.del')
diff --git a/app/common/listener/websocket/Read.php b/app/common/listener/websocket/Read.php
old mode 100644
new mode 100755
diff --git a/app/common/listener/websocket/Start.php b/app/common/listener/websocket/Start.php
old mode 100644
new mode 100755
diff --git a/app/common/listener/websocket/Transfer.php b/app/common/listener/websocket/Transfer.php
old mode 100644
new mode 100755
index d8720d80..316d4a11
--- a/app/common/listener/websocket/Transfer.php
+++ b/app/common/listener/websocket/Transfer.php
@@ -38,7 +38,7 @@ class Transfer
         $shop_id = $old_kefu['shop_id'];
 
         // 当前用户
-        $user_fd = $handleClass->getFdByUid($request_data['user_id'], 'procurement');
+        $user_fd = $handleClass->getFdByUid($request_data['user_id'], 'user');
         $user_id = $request_data['user_id'] ?? 0;
 
         // 新客服的 fd
@@ -74,7 +74,7 @@ class Transfer
                 'from_id' => $new_kefu['id'],
                 'from_type' => 'kefu',
                 'to_id' => $user_id,
-                'to_type' => 'procurement',
+                'to_type' => 'user',
                 'msg' => '客服(' . $new_kefu['nickname'] . ')为您服务',
                 'msg_type' => ChatMsgEnum::TYPE_TEXT,
                 'is_read' => 1,
@@ -122,7 +122,7 @@ class Transfer
         // 通知新客服转接成功
         $handleClass->pushData($new_kefu_fd, 'transfer', [
             'status' => 'get_success',
-            'procurement' => $relation,
+            'user' => $relation,
         ]);
     }
 }
\ No newline at end of file
diff --git a/app/common/listener/websocket/UserOnline.php b/app/common/listener/websocket/UserOnline.php
old mode 100644
new mode 100755
index 15f1f2ba..b063d804
--- a/app/common/listener/websocket/UserOnline.php
+++ b/app/common/listener/websocket/UserOnline.php
@@ -24,7 +24,7 @@ class UserOnline
         // 接收人信息
         $to_id = $params['data']['kefu_id'] ?? 0;
 
-        if (empty($user['type'] || $user['type'] != 'procurement' || empty($to_id))) {
+        if (empty($user['type'] || $user['type'] != 'user' || empty($to_id))) {
             return true;
         }
 
diff --git a/app/common/logic/AccountLogLogic.php b/app/common/logic/AccountLogLogic.php
old mode 100644
new mode 100755
diff --git a/app/common/logic/AfterSaleLogLogic.php b/app/common/logic/AfterSaleLogLogic.php
old mode 100644
new mode 100755
diff --git a/app/common/logic/ChatLogic.php b/app/common/logic/ChatLogic.php
old mode 100644
new mode 100755
index b9edee62..46398613
--- a/app/common/logic/ChatLogic.php
+++ b/app/common/logic/ChatLogic.php
@@ -53,7 +53,7 @@ class ChatLogic extends Logic
      */
     public static function getOnlineUser()
     {
-        $key = self::getChatPrefix() . 'procurement';
+        $key = self::getChatPrefix() . 'user';
         return (new Redis())->getSmembersArray($key);
     }
 
@@ -112,7 +112,7 @@ class ChatLogic extends Logic
                 }
             }
 
-            if ($item['from_type'] == 'procurement') {
+            if ($item['from_type'] == 'user') {
                 $user_id = $item['from_id'];
                 if (isset($user[$user_id])) {
                     $item['from_nickname'] = $user[$user_id]['nickname'] ?? '';
diff --git a/app/common/logic/CommonLogic.php b/app/common/logic/CommonLogic.php
old mode 100644
new mode 100755
diff --git a/app/common/logic/CommunityArticleLogic.php b/app/common/logic/CommunityArticleLogic.php
old mode 100644
new mode 100755
diff --git a/app/common/logic/DistributionLogic.php b/app/common/logic/DistributionLogic.php
old mode 100644
new mode 100755
diff --git a/app/common/logic/ExpressLogic.php b/app/common/logic/ExpressLogic.php
old mode 100644
new mode 100755
diff --git a/app/common/logic/FreightLogic.php b/app/common/logic/FreightLogic.php
old mode 100644
new mode 100755
diff --git a/app/common/logic/GoodsVirtualLogic.php b/app/common/logic/GoodsVirtualLogic.php
old mode 100644
new mode 100755
diff --git a/app/common/logic/IntegralOrderRefundLogic.php b/app/common/logic/IntegralOrderRefundLogic.php
old mode 100644
new mode 100755
diff --git a/app/common/logic/MessageNoticeLogic.php b/app/common/logic/MessageNoticeLogic.php
old mode 100644
new mode 100755
diff --git a/app/common/logic/OrderLogLogic.php b/app/common/logic/OrderLogLogic.php
old mode 100644
new mode 100755
diff --git a/app/common/logic/OrderRefundLogic.php b/app/common/logic/OrderRefundLogic.php
old mode 100644
new mode 100755
index 36cd5aec..ecd1985f
--- a/app/common/logic/OrderRefundLogic.php
+++ b/app/common/logic/OrderRefundLogic.php
@@ -158,7 +158,8 @@ class OrderRefundLogic
         $data = [
             'transaction_id' => $order['transaction_id'],
             'refund_sn' => $refund_log['refund_sn'],
-            'total_fee' => intval(strval($total_fee * 100)),//订单金额,单位为分
+            // 'total_fee' => intval(strval($total_fee * 100)),//订单金额,单位为分
+            'total_fee' => intval(strval($order['order_amount'] * 100)),//订单金额,单位为分
             'refund_fee' => intval(strval($refund_log['refund_amount'] * 100)),//退款金额
         ];
 
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
old mode 100644
new mode 100755
index 7fad8edd..9bccbb12
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -32,9 +32,8 @@ use app\common\model\{AccountLog,
     integral\IntegralOrder,
     order\OrderGoods,
     RechargeOrder,
-    shop\Shop,
     user\UserDistribution,
-    user\UserShopDistribution};
+    shop\Shop};
 use app\common\enum\OrderEnum;
 use app\common\enum\OrderLogEnum;
 use app\common\enum\PayEnum;
@@ -332,7 +331,7 @@ class PayNotifyLogic
      */
     private static function recharge($order_sn, $extra = [])
     {
-        /* 会有定时任务检索订单状态，所以在时间上可能会前后不一致，因此需要做个过滤 */
+        Log::write('微信支付异步回调: ' . $order_sn);
         $new = time();
         $recharge_order = new RechargeOrder();
         $order = $recharge_order->where(['order_sn' => $order_sn])->find();
@@ -363,11 +362,11 @@ class PayNotifyLogic
         }
     }
 
-    private static function recharge_billions($order, $user_id)
+   private static function recharge_billions($order, $user_id)
     {
         $user_subsidy = 2; // 自我补贴
         $all_user_subsidy = 20; //全用户获取的比例
-        $user_start_num = 5; // 补贴前几位数量
+        $user_start_num = 1; // 补贴前几位数量
         $user_start_subsidy = 30; //补贴前几位比例 全用户比例中扣除
         $user_end_subsidy = 70; //补贴剩余部分比例
         $user_first_leader = 30; // 推广者排队补贴
@@ -386,14 +385,14 @@ class PayNotifyLogic
         $data['order_id'] = $order['id'];
         $data['dtime'] = date("Y-m-d H:i:s");
         $data['type'] = 2; // 类型是充值
-        $data['subsidy_price'] = round($order['order_amount'] * $user_subsidy / 100,5);
+        $data['subsidy_price'] = round($order['order_amount'] * $user_subsidy / 100,8);
         $res = Db::name("user_billions")->save($data);
-        $billions_msg = Db::name("user_billions")->where("state",0)->select()->toArray();
+        
         $subsidy = $order['order_amount'] * $all_user_subsidy / 100;
 
         if($is_d != null){
-            $ufl =  round($subsidy*$user_first_leader/100,5);
-            $subsidy_ufl = round($subsidy - $ufl,5);
+            $ufl =  round($subsidy*$user_first_leader/100,8);
+            $subsidy_ufl = round($subsidy - $ufl,8);
             $first_billions_msg = Db::name("user_billions")->where("user_id",$user['first_leader'])->where("state",0)->select()->toArray();
             if(count($first_billions_msg) > 0){
                 foreach($first_billions_msg as $k=>$v){
@@ -447,17 +446,20 @@ class PayNotifyLogic
                                 return -3;
                             }
                             // 剩余金额
-                            $ufl = round($ufl+$v['subsidy_price']-$v['order_price'],5);
+                            $ufl = round($ufl+$v['subsidy_price']-$v['order_price'],8);
                         }else{
-                            Db::name("user_billions")->where("billions_id",$v['billions_id'])->inc("subsidy_price",$ufl)->update();
+                            $subsidy_price_sum = round($v['subsidy_price']+$ufl,8);
+                             Db::name("user_billions")->where("billions_id",$v['billions_id'])->update(['subsidy_price'=>$subsidy_price_sum]);
+                            // Db::name("user_billions")->where("billions_id",$v['billions_id'])->inc("subsidy_price",$ufl)->update();
                             $ufl = 0;
                         }
                     }
 
                 }
-                $subsidy = round($subsidy_ufl + $ufl,5);
+                $subsidy = round($subsidy_ufl + $ufl,8);
             }
         }
+        $billions_msg = Db::name("user_billions")->where("state",0)->select()->toArray();
 //             $first_msg = Db::name("user_billions")->where("user_id",$user['first_leader'])->where("state",0)->select()->toArray();
         $count = count($billions_msg);
         $arr = $arr1 = array();
@@ -465,8 +467,8 @@ class PayNotifyLogic
         // 数量超出前几位补贴用户
         if($count > $user_start_num) {
             $start_subsidy = $subsidy * $user_start_subsidy / 100;
-            $average = round($start_subsidy / $user_start_num, 5);
-            $last = round($start_subsidy - $average * ($user_start_num - 1), 5);
+            $average = round($start_subsidy / $user_start_num, 8);
+            $last = round($start_subsidy - $average * ($user_start_num - 1), 8);
             for ($i = 0; $i < $user_start_num; $i++) {
                 if ($i + 1 == $user_start_num) {
                     $arr[$i] = $last;
@@ -475,20 +477,20 @@ class PayNotifyLogic
                 }
             }
             // 剩余人数补贴
-            $end_average = round(($subsidy - $start_subsidy)/ ($count-$user_start_num), 5);
-            $end_last = round($subsidy - $start_subsidy - $end_average * ($count-$user_start_num - 1), 5);
+            $end_average = round(($subsidy - $start_subsidy)/ ($count-$user_start_num), 8);
+            $end_last = round($subsidy - $start_subsidy - $end_average * ($count-$user_start_num - 1), 8);
             for ($y = 0; $y < $count-$user_start_num; $y++) {
                 if ($y + 1 == $count-$user_start_num) {
-                    $arr1[$y] = $end_average;
-                } else {
                     $arr1[$y] = $end_last;
+                } else {
+                    $arr1[$y] = $end_average;
                 }
             }
         }else{
             $user_start_num = $count;
             // 数量不超出前几位补贴用户，按全部金额计算
-            $average = round($subsidy/$count, 5);
-            $last = round($subsidy - $average * ($count - 1), 5);
+            $average = round($subsidy/$count, 8);
+            $last = round($subsidy - $average * ($count - 1), 8);
             for ($i = 0; $i < $count; $i++) {
                 if ($i + 1 == $count) {
                     $arr[$i] = $last;
@@ -497,6 +499,7 @@ class PayNotifyLogic
                 }
             }
         }
+         $billion_arr = $billion_arr_id = "";
         foreach($billions_msg as $k=>$v){
             if($k + 1 <= $user_start_num){
                 //       var_dump($v['order_price']);
@@ -555,26 +558,31 @@ class PayNotifyLogic
 
                     // 剩余数量
                     $residue_count = $user_start_num - $k - 1;
-                    // 剩余金额
-                    $residue_price = round($arr[$k]+$v['subsidy_price']-$v['order_price'],5);
-                    foreach($arr as $k1=>$v1){
-                        if($k1 > $k){
-                            $residue_price+=$arr[$k1];
-                        }
-                    }
-                    $average = round($residue_price/$residue_count,5);
-                    $last = round($residue_price - $average*($residue_count-1),5);
-                    foreach($arr as $k1=>$v1){
-                        if($k1+1 == $user_start_num){
-                            $arr[$k1] = $last;
-                        }else{
+                    if($residue_count!=0){
+                         // 剩余金额
+                        $residue_price = round($arr[$k]+$v['subsidy_price']-$v['order_price'],8);
+                        foreach($arr as $k1=>$v1){
                             if($k1 > $k){
-                                $arr[$k1] = $average;
+                                $residue_price+=$arr[$k1];
+                            }
+                        }
+                        $average = round($residue_price/$residue_count,8);
+                        $last = round($residue_price - $average*($residue_count-1),8);
+                        foreach($arr as $k1=>$v1){
+                            if($k1+1 == $user_start_num){
+                                $arr[$k1] = $last;
+                            }else{
+                                if($k1 > $k){
+                                    $arr[$k1] = $average;
+                                }
                             }
                         }
                     }
 
                 }else{
+                    //  $subp = round($v['subsidy_price']+$arr[$k],6);
+                    // $billion_arr.="  when ".$v['billions_id']." then '".$subp."'";
+                    // $billion_arr_id.=$v['billions_id'].",";
                     Db::name("user_billions")->where("billions_id", $v['billions_id'])->inc("subsidy_price", $arr[$k])->update();
                 }
             }else{
@@ -632,32 +640,49 @@ class PayNotifyLogic
 
                     // 剩余数量
                     $residue_count = $count-$user_start_num - $k+$user_start_num - 1;
-                    // 剩余金额
-                    $residue_price = round($arr1[$k-$user_start_num]+$v['subsidy_price']-$v['order_price'],5);
-                    foreach($arr1 as $k1=>$v1){
-                        if($k1 > $k - $user_start_num){
-                            $residue_price+=$arr1[$k1];
+                    if($residue_count!=0){
+                           // 剩余金额
+                        $residue_price = round($arr1[$k-$user_start_num]+$v['subsidy_price']-$v['order_price'],8);
+                        foreach($arr1 as $k1=>$v1){
+                            if($k1 > $k - $user_start_num){
+                                $residue_price+=$arr1[$k1];
+                            }
                         }
-                    }
-                    $average = round($residue_price/$residue_count,5);
-                    $last = round($residue_price - $average*($residue_count-1),5);
-                    foreach($arr1 as $k1=>$v1){
-                        if($k1+1 == $count-$user_start_num){
-                            $arr1[$k1] = $last;
-                        }else{
-                            if($k1 > $k){
-                                $arr[$k1] = $average;
+                        $average = round($residue_price/$residue_count,8);
+                        $last = round($residue_price - $average*($residue_count-1),8);
+                        foreach($arr1 as $k1=>$v1){
+                            if($k1+1 == $count-$user_start_num){
+                                $arr1[$k1] = $last;
+                            }else{
+                                if($k1 > $k){
+                                    $arr[$k1] = $average;
+                                }
                             }
                         }
                     }
+                 
                 }else{
+                    //  $subp =  round($v['subsidy_price']+$arr1[$k-$user_start_num],6);
+                    //  $billion_arr.="  when ".$v['billions_id']." then '".$subp."'";
+                    //   $billion_arr_id.=$v['billions_id'].",";
                     Db::name("user_billions")->where("billions_id",$v['billions_id'])->inc("subsidy_price",$arr1[$k-$user_start_num])->update();
                 }
             }
         }
+        //  $billion_arr_id = explode(",",$billion_arr_id);
+        // array_pop($billion_arr_id);
+        // // print_r("<pre>");
+        // // var_dump($billion_arr_id);die;
+        // $billion_arr_id = implode(",",$billion_arr_id);
+        // $sql = "UPDATE `ls_user_billions` 
+        // SET subsidy_price = CASE billions_id
+        //     $billion_arr
+        // END
+        // WHERE billions_id IN ($billion_arr_id)";
+        // $query = Db::query($sql);
         if($is_d!=null){
             if($user['first_leader']>0){
-                $first_leader_percent = round($order['order_amount'] * $first_leader / 100, 5);
+                $first_leader_percent = round($order['order_amount'] * $first_leader / 100, 8);
 //                    Order::where('id', $order['id'])
 //                        ->inc('distribution_money',$first_leader_percent)->update();
                 UserDistribution::where('user_id', $user['first_leader'])
@@ -702,7 +727,7 @@ class PayNotifyLogic
             }
             // 3%对公司
             if($user['divide_role_user_id'] > 0&&$state>0 ){
-                $divide_percent = round($order['order_amount'] * $other_leader / 100, 5);
+                $divide_percent = round($order['order_amount'] * $other_leader / 100, 8);
 //                Order::where('id', $order['id'])
 //                    ->inc('distribution_money',$divide_percent)->update();
 //                $shopDistribution_msg =  UserShopDistribution::where('shop_id', $value['shop_id'])
@@ -792,6 +817,7 @@ class PayNotifyLogic
                 '', $order['id'], $order['order_sn']
             );
         }
+
     }
 
 
diff --git a/app/common/logic/PaymentLogic.php b/app/common/logic/PaymentLogic.php
old mode 100644
new mode 100755
diff --git a/app/common/logic/QrCodeLogic.php b/app/common/logic/QrCodeLogic.php
old mode 100644
new mode 100755
index 0bb795f5..e9ef4f87
--- a/app/common/logic/QrCodeLogic.php
+++ b/app/common/logic/QrCodeLogic.php
@@ -17,7 +17,6 @@
 // | author: likeshop.cn.team
 // +----------------------------------------------------------------------
 namespace app\common\logic;
-use app\common\model\procurement\Procurementset;
 use app\common\model\RechargeTemplate;
 use app\common\server\ConfigServer;
 use app\common\server\FileServer;
@@ -82,7 +81,7 @@ class QrCodeLogic
         ];
     }
     //生成商品分享图
-    public function makeGoodsPoster($user,$goods,$url,$url_type,$p_id,$set_id){
+    public function makeGoodsPoster($user,$goods,$url,$url_type){
 
         try {
             $save_dir = ROOT_PATH .'/uploads/qr_code/goods_share/';
@@ -109,19 +108,6 @@ class QrCodeLogic
             //生成二维码
             if($url_type == 'path'){
                 $scene = 'id='.$goods['id'].'&invite_code='.$user['distribution_code'];
-                if(isset($get['p_id'])){
-                    $p_id= $get['p_id'];
-                }else{
-                    $p_id= 0;
-                }
-                if(isset($get['set'])){
-                    $set_id = $get['set'];
-                }else{
-                    $set_id= 0;
-                }
-                if($p_id != 0){
-                    $scene = 'id='.$p_id.'&set='.$set_id;
-                }
                 $result = $this->makeMnpQrcode($scene,$url,$qr_src,$save_dir);
                 if(true !== $result){
                     return JsonServer::error('微信配置错误：'.$result);
@@ -176,51 +162,7 @@ class QrCodeLogic
 
             //合成价格
             $qr_code_logic->writeText($share_background_img, '￥', $poster_config['price_symbol']);
-            if($set_id != 0){
-                $set = Procurementset::where("set_id",$set_id)->where("set_state",1)->find();
-                if($set != null) {
-                    if ($set['set_pro'] != 0) {
-                        if ($set['set_pro_type'] == 1) {
-                            $goods['purchase_price'] = round($goods['purchase_price'] * (100 + $set['set_pro']) / 100, 2);
-                        }
-                        if ($set['set_pro_type'] == 3) {
-                            if ($goods['purchase_price'] > 0) {
-                                $goods['purchase_price'] = round($goods['purchase_price'] + $set['set_pro'], 2);
-                            } else {
-                                $goods['purchase_price'] = "0.00";
-                            }
-                        }
-                        $qr_code_logic->writeText($share_background_img, floatval($goods['purchase_price']), $poster_config['price']);
-                    }
-                    if ($set['set_issued'] != 0) {
-                        if ($set['set_issued_type'] == 1) {
-                            $goods['issuing_price'] = round($goods['issuing_price'] * (100 + $set['set_issued']) / 100, 2);
-                        }
-                        if ($set['set_issued_type'] == 3) {
-                            if ($goods['issuing_price'] > 0) {
-                                $goods['issuing_price'] = round($goods['issuing_price'] + $set['set_issued'], 2);
-                            } else {
-                                $goods['issuing_price'] = "0.00";
-                            }
-                        }
-                        $qr_code_logic->writeText($share_background_img, floatval($goods['issuing_price']), $poster_config['price']);
-                    }
-                    if ($set['set_wholesale'] != 0) {
-                        if ($set['set_wholesale_type'] == 1) {
-                            $goods['wholesale_price'] = round($goods['wholesale_price'] * (100 + $set['set_wholesale']) / 100, 2);
-                        }
-                        if ($set['set_wholesale_type'] == 3) {
-                            if ($goods['wholesale_price'] > 0) {
-                                $goods['wholesale_price'] = round($goods['wholesale_price'] + $set['set_wholesale'], 2);
-
-                            }
-                        }
-                        $qr_code_logic->writeText($share_background_img, floatval($goods['wholesale_price']), $poster_config['price']);
-                    }
-                }
-            }else{
-                $qr_code_logic->writeText($share_background_img, floatval($goods['min_price']), $poster_config['price']);
-            }
+            $qr_code_logic->writeText($share_background_img, floatval($goods['min_price']), $poster_config['price']);
 
             //合成商品标题
             $goods_name = auto_adapt($poster_config['title']['font_size'], 0, $poster_config['title']['font_face'], $goods['name'], $poster_config['title']['w'],$poster_config['title']['y'],getimagesize($background_img));
diff --git a/app/common/logic/RegionLogic.php b/app/common/logic/RegionLogic.php
old mode 100644
new mode 100755
diff --git a/app/common/logic/SmsLogic.php b/app/common/logic/SmsLogic.php
old mode 100644
new mode 100755
diff --git a/app/common/logic/SystemNoticeLogic.php b/app/common/logic/SystemNoticeLogic.php
old mode 100644
new mode 100755
diff --git a/app/common/logic/expressage/Kd100Logic.php b/app/common/logic/expressage/Kd100Logic.php
old mode 100644
new mode 100755
diff --git a/app/common/model/AccountLog.php b/app/common/model/AccountLog.php
old mode 100644
new mode 100755
index 8b625cdd..f192fbd4
--- a/app/common/model/AccountLog.php
+++ b/app/common/model/AccountLog.php
@@ -56,6 +56,7 @@ class AccountLog extends Models
     const billions_inc_earnings = 406;//百亿返补佣金增加
     const recharge_billions_inc_earnings = 407;//充值百亿返补佣金增加
     const recharge_billions_inc_balance = 408;//充值百亿返补本地余额增加
+
     const money_change = [      //余额变动类型
         self::admin_add_money,self::admin_reduce_money,self::recharge_money,self::balance_pay_order,self::cancel_order_refund,self::after_sale_refund
         , self::withdraw_to_balance,self::user_transfer_inc_balance, self::user_transfer_dec_balance, self::integral_order_dec_balance, self::integral_order_inc_balance
@@ -79,8 +80,8 @@ class AccountLog extends Models
         self::admin_inc_earnings,  //后台增加佣金
         self::admin_reduce_earnings,  //后台减少佣金
         self::shop_reduce_wallet,  //商户佣金减少
-        self::baiyibutie,  //百亿补贴
-        self::billions_inc_earnings//百亿返贴
+          self::baiyibutie,  //百亿补贴
+          self::billions_inc_earnings//百亿返贴
     ];
 
     public static function getAcccountDesc($from = true){
@@ -104,7 +105,7 @@ class AccountLog extends Models
             self::cancel_order_refund           => '取消订单退回余额',
             self::after_sale_refund             => '售后退回余额',
             self::baiyibutie     => '百亿补贴结算获得佣金',
-            self::billions_inc_earnings     => '百亿返补佣金增加',
+             self::billions_inc_earnings     => '百亿返补佣金增加',
             self::withdraw_to_balance           => '佣金提现',
             self::withdraw_dec_earnings         => '提现扣减佣金',
             self::withdraw_back_earnings        => '拒绝提现返还佣金',
diff --git a/app/common/model/ActivityAreaGoods.php b/app/common/model/ActivityAreaGoods.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Ad.php b/app/common/model/Ad.php
old mode 100644
new mode 100755
index c5fae9b9..e5a217a6
--- a/app/common/model/Ad.php
+++ b/app/common/model/Ad.php
@@ -35,7 +35,7 @@ class Ad extends Models
                 ],
                 [
                     'name'      => '个人中心',
-                    'path'      => '/pages/procurement/procurement',
+                    'path'      => '/pages/user/user',
                     'is_tab'    => 1,
                 ],
             ],
@@ -57,7 +57,7 @@ class Ad extends Models
                 ],
                 [
                     'name'      => '我的订单',
-                    'path'      => '/procurement/order',
+                    'path'      => '/user/order',
                     'is_tab'    => 0,
                 ],
                 [
diff --git a/app/common/model/AdPosition.php b/app/common/model/AdPosition.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Admin.php b/app/common/model/Admin.php
old mode 100644
new mode 100755
diff --git a/app/common/model/AfterSale.php b/app/common/model/AfterSale.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Auth.php b/app/common/model/Auth.php
old mode 100644
new mode 100755
diff --git a/app/common/model/BalanceWithdrawApply.php b/app/common/model/BalanceWithdrawApply.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Card.php b/app/common/model/Card.php
old mode 100644
new mode 100755
index b03ec078..4bbc8107
--- a/app/common/model/Card.php
+++ b/app/common/model/Card.php
@@ -21,7 +21,7 @@ class Card extends Models
      * @author suny
      * @date 2021/7/13 6:45 下午
      */
-//    public function procurement()
+//    public function user()
 //    {
 //
 //        return $this->hasOne(User::class, 'id', 'user_id')
diff --git a/app/common/model/Cart.php b/app/common/model/Cart.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Client_.php b/app/common/model/Client_.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Config.php b/app/common/model/Config.php
old mode 100644
new mode 100755
diff --git a/app/common/model/CouponList.php b/app/common/model/CouponList.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Delivery.php b/app/common/model/Delivery.php
old mode 100644
new mode 100755
diff --git a/app/common/model/DevPay.php b/app/common/model/DevPay.php
old mode 100644
new mode 100755
diff --git a/app/common/model/DevRegion.php b/app/common/model/DevRegion.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Express.php b/app/common/model/Express.php
old mode 100644
new mode 100755
diff --git a/app/common/model/File.php b/app/common/model/File.php
old mode 100644
new mode 100755
diff --git a/app/common/model/FileCate.php b/app/common/model/FileCate.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Footprint.php b/app/common/model/Footprint.php
old mode 100644
new mode 100755
diff --git a/app/common/model/FootprintRecord.php b/app/common/model/FootprintRecord.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Freight.php b/app/common/model/Freight.php
old mode 100644
new mode 100755
index 0095a637..6f176d1d
--- a/app/common/model/Freight.php
+++ b/app/common/model/Freight.php
@@ -87,11 +87,16 @@ class Freight extends Models
                 $freight_config_item = $value;
             }
             if ($district_check == false && $city_check == false && $province_check == false) {
-                if ($value['region'] == 'all') {
-                    $freight_config_item = $value;
-                }
+                // if ($value['region'] == 'all') {
+                //     $freight_config_item = $value;
+                // }
+                $freight_config_item = $value;
+               
             }
         }
+        // dump($freight_config);
+        //  dump($freight_config_item);
+        // die;
         $charge_way = $this->where('id', $freight_id)->value('charge_way');
         $price = 0;//运费
         switch ($charge_way) {
@@ -105,13 +110,20 @@ class Freight extends Models
                 $unified_num = $num;
                 break;
         }
+       
+        if ($freight_config_item['first_unit'] == 0 && $freight_config_item['continue_unit'] == 0) {
+            return $price;
+        }
+        
         if ($unified_num <= $freight_config_item['first_unit']) {//小于首件数
             $price = $freight_config_item['first_money'];
         }
+        
         if ($unified_num > $freight_config_item['first_unit']) {//大于首件数 计算公式=(((商品数量-首件数)/续件数)*续件费用)+首件费用
             $continue_unit = ceil(($unified_num - $freight_config_item['first_unit']) / $freight_config_item['continue_unit']);//续件数向上取整
             $price = ($continue_unit * $freight_config_item['continue_money']) + $freight_config_item['first_money'];
         }
+        
         return $price;
     }
 }
\ No newline at end of file
diff --git a/app/common/model/FreightConfig.php b/app/common/model/FreightConfig.php
old mode 100644
new mode 100755
diff --git a/app/common/model/HotList.php b/app/common/model/HotList.php
old mode 100644
new mode 100755
diff --git a/app/common/model/LocalStore.php b/app/common/model/LocalStore.php
old mode 100644
new mode 100755
diff --git a/app/common/model/LocalStoreOrder.php b/app/common/model/LocalStoreOrder.php
old mode 100644
new mode 100755
diff --git a/app/common/model/MallNews.php b/app/common/model/MallNews.php
old mode 100644
new mode 100755
diff --git a/app/common/model/MallNewsFile.php b/app/common/model/MallNewsFile.php
old mode 100644
new mode 100755
diff --git a/app/common/model/MenuDecorate.php b/app/common/model/MenuDecorate.php
old mode 100644
new mode 100755
diff --git a/app/common/model/NewGoods.php b/app/common/model/NewGoods.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Notice.php b/app/common/model/Notice.php
old mode 100644
new mode 100755
diff --git a/app/common/model/NoticeSetting.php b/app/common/model/NoticeSetting.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Pay.php b/app/common/model/Pay.php
old mode 100644
new mode 100755
diff --git a/app/common/model/RechargeOrder.php b/app/common/model/RechargeOrder.php
old mode 100644
new mode 100755
diff --git a/app/common/model/RechargeTemplate.php b/app/common/model/RechargeTemplate.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Role.php b/app/common/model/Role.php
old mode 100644
new mode 100755
diff --git a/app/common/model/RoleAuthIndex.php b/app/common/model/RoleAuthIndex.php
old mode 100644
new mode 100755
diff --git a/app/common/model/SearchRecord.php b/app/common/model/SearchRecord.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Session.php b/app/common/model/Session.php
old mode 100644
new mode 100755
diff --git a/app/common/model/ShopSession.php b/app/common/model/ShopSession.php
old mode 100644
new mode 100755
diff --git a/app/common/model/SmsLog.php b/app/common/model/SmsLog.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Test.php b/app/common/model/Test.php
old mode 100644
new mode 100755
diff --git a/app/common/model/Treaty.php b/app/common/model/Treaty.php
old mode 100644
new mode 100755
diff --git a/app/common/model/UserBillionsRechargeBalance.php b/app/common/model/UserBillionsRechargeBalance.php
old mode 100644
new mode 100755
index 72bc394a..e85dc583
--- a/app/common/model/UserBillionsRechargeBalance.php
+++ b/app/common/model/UserBillionsRechargeBalance.php
@@ -6,5 +6,5 @@ use app\common\basics\Models;
 
 class UserBillionsRechargeBalance  extends Models
 {
-    protected $table = 'ls_user_recharge_balance';
+    protected $table = 'ls_user_billions_recharge_balance';
 }
\ No newline at end of file
diff --git a/app/common/model/Withdraw.php b/app/common/model/Withdraw.php
old mode 100644
new mode 100755
diff --git a/app/common/model/WithdrawApply.php b/app/common/model/WithdrawApply.php
old mode 100644
new mode 100755
diff --git a/app/common/model/activity_area/ActivityArea.php b/app/common/model/activity_area/ActivityArea.php
old mode 100644
new mode 100755
diff --git a/app/common/model/activity_area/ActivityAreaGoods.php b/app/common/model/activity_area/ActivityAreaGoods.php
old mode 100644
new mode 100755
diff --git a/app/common/model/after_sale/AfterSale.php b/app/common/model/after_sale/AfterSale.php
old mode 100644
new mode 100755
diff --git a/app/common/model/after_sale/AfterSaleLog.php b/app/common/model/after_sale/AfterSaleLog.php
old mode 100644
new mode 100755
diff --git a/app/common/model/bargain/Bargain.php b/app/common/model/bargain/Bargain.php
old mode 100644
new mode 100755
diff --git a/app/common/model/bargain/BargainItem.php b/app/common/model/bargain/BargainItem.php
old mode 100644
new mode 100755
diff --git a/app/common/model/bargain/BargainKnife.php b/app/common/model/bargain/BargainKnife.php
old mode 100644
new mode 100755
diff --git a/app/common/model/bargain/BargainLaunch.php b/app/common/model/bargain/BargainLaunch.php
old mode 100644
new mode 100755
index 8445c80f..cf69eeca
--- a/app/common/model/bargain/BargainLaunch.php
+++ b/app/common/model/bargain/BargainLaunch.php
@@ -116,7 +116,7 @@ class BargainLaunch extends Models
 
 //    //显示用户头像
 //    public function getAvatarAttr($value,$data){
-//        return UrlServer::getFileUrl($data['procurement']['avatar']);
+//        return UrlServer::getFileUrl($data['user']['avatar']);
 //    }
 
 
@@ -431,9 +431,9 @@ class BargainLaunch extends Models
 
             $list[] = [
                 'id' => $knife['id'],
-                'user_id' => $knife['procurement']['id'],
-                'nickname' => $knife['procurement']['nickname'],
-                'avatar' => UrlServer::getFileUrl($knife['procurement']['avatar']),
+                'user_id' => $knife['user']['id'],
+                'nickname' => $knife['user']['nickname'],
+                'avatar' => UrlServer::getFileUrl($knife['user']['avatar']),
                 'help_price' => $knife['help_price'],
                 'help_time' => date('Y-m-d H:i:s', $knife['help_time']),
             ];
diff --git a/app/common/model/billions/Billions.php b/app/common/model/billions/Billions.php
old mode 100644
new mode 100755
diff --git a/app/common/model/community/CommunityArticle.php b/app/common/model/community/CommunityArticle.php
old mode 100644
new mode 100755
diff --git a/app/common/model/community/CommunityArticleImage.php b/app/common/model/community/CommunityArticleImage.php
old mode 100644
new mode 100755
diff --git a/app/common/model/community/CommunityCategory.php b/app/common/model/community/CommunityCategory.php
old mode 100644
new mode 100755
diff --git a/app/common/model/community/CommunityComment.php b/app/common/model/community/CommunityComment.php
old mode 100644
new mode 100755
index 5ad0049f..7b7ae282
--- a/app/common/model/community/CommunityComment.php
+++ b/app/common/model/community/CommunityComment.php
@@ -68,7 +68,7 @@ class CommunityComment extends Models
      */
     public function getChildAttr($value, $data)
     {
-        $lists = self::with(['procurement'])
+        $lists = self::with(['user'])
             ->whereFindInSet('ancestor_relation', $data['id'])
             ->where(['del' => 0, 'status' => CommunityCommentEnum::STATUS_SUCCESS])
             ->order(['like' => 'desc'])
diff --git a/app/common/model/community/CommunityFollow.php b/app/common/model/community/CommunityFollow.php
old mode 100644
new mode 100755
diff --git a/app/common/model/community/CommunityLike.php b/app/common/model/community/CommunityLike.php
old mode 100644
new mode 100755
diff --git a/app/common/model/community/CommunitySearchRecord.php b/app/common/model/community/CommunitySearchRecord.php
old mode 100644
new mode 100755
diff --git a/app/common/model/community/CommunityTopic.php b/app/common/model/community/CommunityTopic.php
old mode 100644
new mode 100755
diff --git a/app/common/model/community/CommunityUser.php b/app/common/model/community/CommunityUser.php
old mode 100644
new mode 100755
diff --git a/app/common/model/content/Article.php b/app/common/model/content/Article.php
old mode 100644
new mode 100755
diff --git a/app/common/model/content/ArticleCategory.php b/app/common/model/content/ArticleCategory.php
old mode 100644
new mode 100755
diff --git a/app/common/model/content/Help.php b/app/common/model/content/Help.php
old mode 100644
new mode 100755
diff --git a/app/common/model/content/HelpCategory.php b/app/common/model/content/HelpCategory.php
old mode 100644
new mode 100755
diff --git a/app/common/model/coupon/Coupon.php b/app/common/model/coupon/Coupon.php
old mode 100644
new mode 100755
diff --git a/app/common/model/coupon/CouponGoods.php b/app/common/model/coupon/CouponGoods.php
old mode 100644
new mode 100755
diff --git a/app/common/model/coupon/CouponList.php b/app/common/model/coupon/CouponList.php
old mode 100644
new mode 100755
diff --git a/app/common/model/dev/DevRegion.php b/app/common/model/dev/DevRegion.php
old mode 100644
new mode 100755
diff --git a/app/common/model/distribution/Distribution.php b/app/common/model/distribution/Distribution.php
old mode 100644
new mode 100755
diff --git a/app/common/model/distribution/DistributionGoods.php b/app/common/model/distribution/DistributionGoods.php
old mode 100644
new mode 100755
diff --git a/app/common/model/distribution/DistributionLevel.php b/app/common/model/distribution/DistributionLevel.php
old mode 100644
new mode 100755
diff --git a/app/common/model/distribution/DistributionLevelUpdate.php b/app/common/model/distribution/DistributionLevelUpdate.php
old mode 100644
new mode 100755
diff --git a/app/common/model/distribution/DistributionMemberApply.php b/app/common/model/distribution/DistributionMemberApply.php
old mode 100644
new mode 100755
diff --git a/app/common/model/distribution/DistributionOrderGoods.php b/app/common/model/distribution/DistributionOrderGoods.php
old mode 100644
new mode 100755
diff --git a/app/common/model/distribution/Distributioncity.php b/app/common/model/distribution/Distributioncity.php
old mode 100644
new mode 100755
diff --git a/app/common/model/expressage/Kd100Expressage.php b/app/common/model/expressage/Kd100Expressage.php
old mode 100644
new mode 100755
diff --git a/app/common/model/face_sheet/FaceSheetSender.php b/app/common/model/face_sheet/FaceSheetSender.php
old mode 100644
new mode 100755
diff --git a/app/common/model/face_sheet/FaceSheetTemplate.php b/app/common/model/face_sheet/FaceSheetTemplate.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/Goods.php b/app/common/model/goods/Goods.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/GoodsBrand.php b/app/common/model/goods/GoodsBrand.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/GoodsCategory.php b/app/common/model/goods/GoodsCategory.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/GoodsClick.php b/app/common/model/goods/GoodsClick.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/GoodsCollect.php b/app/common/model/goods/GoodsCollect.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/GoodsColumn.php b/app/common/model/goods/GoodsColumn.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/GoodsComment.php b/app/common/model/goods/GoodsComment.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/GoodsCommentImage.php b/app/common/model/goods/GoodsCommentImage.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/GoodsImage.php b/app/common/model/goods/GoodsImage.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/GoodsItem.php b/app/common/model/goods/GoodsItem.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/GoodsPrice.php b/app/common/model/goods/GoodsPrice.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/GoodsSpec.php b/app/common/model/goods/GoodsSpec.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/GoodsSpecValue.php b/app/common/model/goods/GoodsSpecValue.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/GoodsUnit.php b/app/common/model/goods/GoodsUnit.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/Goodscontact.php b/app/common/model/goods/Goodscontact.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/Goodspurchase.php b/app/common/model/goods/Goodspurchase.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/Goodswholesale.php b/app/common/model/goods/Goodswholesale.php
old mode 100644
new mode 100755
diff --git a/app/common/model/goods/Supplier.php b/app/common/model/goods/Supplier.php
old mode 100644
new mode 100755
diff --git a/app/common/model/gzuser/Gzuser.php b/app/common/model/gzuser/Gzuser.php
old mode 100644
new mode 100755
diff --git a/app/common/model/gzuser/Weixingzhuserbind.php b/app/common/model/gzuser/Weixingzhuserbind.php
old mode 100644
new mode 100755
diff --git a/app/common/model/integral/IntegralDelivery.php b/app/common/model/integral/IntegralDelivery.php
old mode 100644
new mode 100755
diff --git a/app/common/model/integral/IntegralGoods.php b/app/common/model/integral/IntegralGoods.php
old mode 100644
new mode 100755
diff --git a/app/common/model/integral/IntegralOrder.php b/app/common/model/integral/IntegralOrder.php
old mode 100644
new mode 100755
diff --git a/app/common/model/integral/IntegralOrderRefund.php b/app/common/model/integral/IntegralOrderRefund.php
old mode 100644
new mode 100755
diff --git a/app/common/model/kefu/ChatRecord.php b/app/common/model/kefu/ChatRecord.php
old mode 100644
new mode 100755
diff --git a/app/common/model/kefu/ChatRelation.php b/app/common/model/kefu/ChatRelation.php
old mode 100644
new mode 100755
diff --git a/app/common/model/kefu/Kefu.php b/app/common/model/kefu/Kefu.php
old mode 100644
new mode 100755
diff --git a/app/common/model/kefu/KefuLang.php b/app/common/model/kefu/KefuLang.php
old mode 100644
new mode 100755
diff --git a/app/common/model/kefu/KefuSession.php b/app/common/model/kefu/KefuSession.php
old mode 100644
new mode 100755
diff --git a/app/common/model/live/LiveGoods.php b/app/common/model/live/LiveGoods.php
old mode 100644
new mode 100755
diff --git a/app/common/model/live/LiveRoom.php b/app/common/model/live/LiveRoom.php
old mode 100644
new mode 100755
diff --git a/app/common/model/order/Jicai.php b/app/common/model/order/Jicai.php
old mode 100644
new mode 100755
diff --git a/app/common/model/order/Order.php b/app/common/model/order/Order.php
old mode 100644
new mode 100755
index f031ec14..8d9ae859
--- a/app/common/model/order/Order.php
+++ b/app/common/model/order/Order.php
@@ -382,9 +382,9 @@ class Order extends Models
     {
         $btn = 0;
         if (
+            ($data['order_status'] == OrderEnum::ORDER_STATUS_COMPLETE) ||
             ($data['order_status'] == OrderEnum::ORDER_STATUS_DOWN && $data['pay_status'] == PayEnum::UNPAID) ||
-            ($data['order_status'] == OrderEnum::ORDER_STATUS_DOWN && $data['pay_status'] == PayEnum::REFUNDED) ||
-            ($data['order_status'] == OrderEnum::ORDER_STATUS_COMPLETE)
+            ($data['order_status'] == OrderEnum::ORDER_STATUS_DOWN && $data['pay_status'] == PayEnum::REFUNDED)
         ) {
             $btn = 1;
         }
@@ -496,7 +496,7 @@ class Order extends Models
         }
         return $btn;
     }
-
+    
 
     /**
      * @notes 查看开票按钮
diff --git a/app/common/model/order/OrderGoods.php b/app/common/model/order/OrderGoods.php
old mode 100644
new mode 100755
diff --git a/app/common/model/order/OrderInvoice.php b/app/common/model/order/OrderInvoice.php
old mode 100644
new mode 100755
diff --git a/app/common/model/order/OrderLog.php b/app/common/model/order/OrderLog.php
old mode 100644
new mode 100755
diff --git a/app/common/model/order/OrderRefund.php b/app/common/model/order/OrderRefund.php
old mode 100644
new mode 100755
diff --git a/app/common/model/order/OrderTrade.php b/app/common/model/order/OrderTrade.php
old mode 100644
new mode 100755
diff --git a/app/common/model/order/Verification.php b/app/common/model/order/Verification.php
old mode 100644
new mode 100755
diff --git a/app/common/model/printer/Printer.php b/app/common/model/printer/Printer.php
old mode 100644
new mode 100755
diff --git a/app/common/model/printer/PrinterConfig.php b/app/common/model/printer/PrinterConfig.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Mprocurement.php b/app/common/model/procurement/Mprocurement.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/ProcurementLevel.php b/app/common/model/procurement/ProcurementLevel.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Procurementadd.php b/app/common/model/procurement/Procurementadd.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Procurementintegralpay.php b/app/common/model/procurement/Procurementintegralpay.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Procurementintegralset.php b/app/common/model/procurement/Procurementintegralset.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Procurementset.php b/app/common/model/procurement/Procurementset.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Procurementtreaty.php b/app/common/model/procurement/Procurementtreaty.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Procurementxptreaty.php b/app/common/model/procurement/Procurementxptreaty.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Procurementxy.php b/app/common/model/procurement/Procurementxy.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Procurementxyallprice.php b/app/common/model/procurement/Procurementxyallprice.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Procurementxydt.php b/app/common/model/procurement/Procurementxydt.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Procurementxypay.php b/app/common/model/procurement/Procurementxypay.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Procurementxypencil.php b/app/common/model/procurement/Procurementxypencil.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Procurementxyprice.php b/app/common/model/procurement/Procurementxyprice.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Procurementxyrecord.php b/app/common/model/procurement/Procurementxyrecord.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Procurementxyrpay.php b/app/common/model/procurement/Procurementxyrpay.php
old mode 100644
new mode 100755
diff --git a/app/common/model/procurement/Procurementxyset.php b/app/common/model/procurement/Procurementxyset.php
old mode 100644
new mode 100755
diff --git a/app/common/model/seckill/SeckillGoods.php b/app/common/model/seckill/SeckillGoods.php
old mode 100644
new mode 100755
diff --git a/app/common/model/seckill/SeckillTime.php b/app/common/model/seckill/SeckillTime.php
old mode 100644
new mode 100755
diff --git a/app/common/model/shop/Shop.php b/app/common/model/shop/Shop.php
old mode 100644
new mode 100755
diff --git a/app/common/model/shop/ShopAccountLog.php b/app/common/model/shop/ShopAccountLog.php
old mode 100644
new mode 100755
diff --git a/app/common/model/shop/ShopAdmin.php b/app/common/model/shop/ShopAdmin.php
old mode 100644
new mode 100755
diff --git a/app/common/model/shop/ShopApply.php b/app/common/model/shop/ShopApply.php
old mode 100644
new mode 100755
diff --git a/app/common/model/shop/ShopAuth.php b/app/common/model/shop/ShopAuth.php
old mode 100644
new mode 100755
diff --git a/app/common/model/shop/ShopBank.php b/app/common/model/shop/ShopBank.php
old mode 100644
new mode 100755
diff --git a/app/common/model/shop/ShopCategory.php b/app/common/model/shop/ShopCategory.php
old mode 100644
new mode 100755
diff --git a/app/common/model/shop/ShopFollow.php b/app/common/model/shop/ShopFollow.php
old mode 100644
new mode 100755
diff --git a/app/common/model/shop/ShopGoodsCategory.php b/app/common/model/shop/ShopGoodsCategory.php
old mode 100644
new mode 100755
diff --git a/app/common/model/shop/ShopRole.php b/app/common/model/shop/ShopRole.php
old mode 100644
new mode 100755
diff --git a/app/common/model/shop/ShopRoleAuthIndex.php b/app/common/model/shop/ShopRoleAuthIndex.php
old mode 100644
new mode 100755
diff --git a/app/common/model/shop/ShopSettlement.php b/app/common/model/shop/ShopSettlement.php
old mode 100644
new mode 100755
diff --git a/app/common/model/shop/ShopSettlementRecord.php b/app/common/model/shop/ShopSettlementRecord.php
old mode 100644
new mode 100755
diff --git a/app/common/model/shop/ShopWithdrawal.php b/app/common/model/shop/ShopWithdrawal.php
old mode 100644
new mode 100755
diff --git a/app/common/model/sign_daily/SignDaily.php b/app/common/model/sign_daily/SignDaily.php
old mode 100644
new mode 100755
diff --git a/app/common/model/sign_daily/UserSign.php b/app/common/model/sign_daily/UserSign.php
old mode 100644
new mode 100755
diff --git a/app/common/model/subsidy_withdrawal/SubsidyWithdrawal.php b/app/common/model/subsidy_withdrawal/SubsidyWithdrawal.php
old mode 100644
new mode 100755
index f2cd218b..d5c2c5e8
--- a/app/common/model/subsidy_withdrawal/SubsidyWithdrawal.php
+++ b/app/common/model/subsidy_withdrawal/SubsidyWithdrawal.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * @package     CipherSYS IM
- * @author      Xiaowei Wang <wangxiaowei@ciphersys.com>
- * @copyright   Copyright (c) 2022 - 2024, CipherSYS Co.,Ltd. (https://www.ciphersys.com/)
- * @license     CipherSYS Commercial License
- * @link        https://www.ciphersys.com
- */
 
 namespace app\common\model\subsidy_withdrawal;
 
diff --git a/app/common/model/subsidy_withdrawal/SubsidyWithdrawalRecord.php b/app/common/model/subsidy_withdrawal/SubsidyWithdrawalRecord.php
old mode 100644
new mode 100755
index 99ad2d2a..5d4aa7ac
--- a/app/common/model/subsidy_withdrawal/SubsidyWithdrawalRecord.php
+++ b/app/common/model/subsidy_withdrawal/SubsidyWithdrawalRecord.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * @package     CipherSYS IM
- * @author      Xiaowei Wang <wangxiaowei@ciphersys.com>
- * @copyright   Copyright (c) 2022 - 2024, CipherSYS Co.,Ltd. (https://www.ciphersys.com/)
- * @license     CipherSYS Commercial License
- * @link        https://www.ciphersys.com
- */
 
 namespace app\common\model\subsidy_withdrawal;
 
diff --git a/app/common/model/system/DevCrontab.php b/app/common/model/system/DevCrontab.php
old mode 100644
new mode 100755
diff --git a/app/common/model/system/SystemLog.php b/app/common/model/system/SystemLog.php
old mode 100644
new mode 100755
diff --git a/app/common/model/team/Team.php b/app/common/model/team/Team.php
old mode 100644
new mode 100755
diff --git a/app/common/model/team/TeamActivity.php b/app/common/model/team/TeamActivity.php
old mode 100644
new mode 100755
diff --git a/app/common/model/team/TeamFound.php b/app/common/model/team/TeamFound.php
old mode 100644
new mode 100755
diff --git a/app/common/model/team/TeamGoods.php b/app/common/model/team/TeamGoods.php
old mode 100644
new mode 100755
diff --git a/app/common/model/team/TeamJoin.php b/app/common/model/team/TeamJoin.php
old mode 100644
new mode 100755
diff --git a/app/common/model/user/User.php b/app/common/model/user/User.php
old mode 100644
new mode 100755
diff --git a/app/common/model/user/UserAddress.php b/app/common/model/user/UserAddress.php
old mode 100644
new mode 100755
diff --git a/app/common/model/user/UserAuth.php b/app/common/model/user/UserAuth.php
old mode 100644
new mode 100755
diff --git a/app/common/model/user/UserDistribution.php b/app/common/model/user/UserDistribution.php
old mode 100644
new mode 100755
diff --git a/app/common/model/user/UserGroup.php b/app/common/model/user/UserGroup.php
old mode 100644
new mode 100755
diff --git a/app/common/model/user/UserLevel.php b/app/common/model/user/UserLevel.php
old mode 100644
new mode 100755
diff --git a/app/common/model/user/UserShopDistribution.php b/app/common/model/user/UserShopDistribution.php
old mode 100644
new mode 100755
diff --git a/app/common/model/user/UserTag.php b/app/common/model/user/UserTag.php
old mode 100644
new mode 100755
diff --git a/app/common/model/wechat/Wechat.php b/app/common/model/wechat/Wechat.php
old mode 100644
new mode 100755
diff --git a/app/common/model/wechat/WechatReply.php b/app/common/model/wechat/WechatReply.php
old mode 100644
new mode 100755
diff --git a/app/common/server/AliPayServer.php b/app/common/server/AliPayServer.php
old mode 100644
new mode 100755
index a7aa1fe7..81204ab9
--- a/app/common/server/AliPayServer.php
+++ b/app/common/server/AliPayServer.php
@@ -112,7 +112,7 @@ class AliPayServer
             '订单:'.$sn,
             $sn,
             $order_amount,
-            $domain.'/pc/procurement/order'
+            $domain.'/pc/user/order'
         );
         return $result->body;
     }
diff --git a/app/common/server/AreaServer.php b/app/common/server/AreaServer.php
old mode 100644
new mode 100755
diff --git a/app/common/server/ArrayServer.php b/app/common/server/ArrayServer.php
old mode 100644
new mode 100755
diff --git a/app/common/server/CacheServer.php b/app/common/server/CacheServer.php
old mode 100644
new mode 100755
diff --git a/app/common/server/ConfigServer.php b/app/common/server/ConfigServer.php
old mode 100644
new mode 100755
diff --git a/app/common/server/DistributionServer.php b/app/common/server/DistributionServer.php
old mode 100644
new mode 100755
diff --git a/app/common/server/ExportExcelServer.php b/app/common/server/ExportExcelServer.php
old mode 100644
new mode 100755
diff --git a/app/common/server/ExportGoodsExcelServer.php b/app/common/server/ExportGoodsExcelServer.php
old mode 100644
new mode 100755
index 11e3d2a5..a15fb5c3
--- a/app/common/server/ExportGoodsExcelServer.php
+++ b/app/common/server/ExportGoodsExcelServer.php
@@ -54,4 +54,18 @@ class ExportGoodsExcelServer
         }catch (\Exception $e){
         }
     }
+
+    /**
+     * 图片缓存到本地
+     * @param $url string 远程图片地址
+     * @param $dir string 本地缓存目录
+     * @param $i int 图片序号
+     * @return mixed
+     */
+    public static function img_resource($url,$dir,$i){
+        $data = file_get_contents($url);
+        $path = $dir.time().'-'.$i;
+        file_put_contents($path, $data);
+        return $path;
+    }
 }
\ No newline at end of file
diff --git a/app/common/server/FileServer.php b/app/common/server/FileServer.php
old mode 100644
new mode 100755
diff --git a/app/common/server/JsonServer.php b/app/common/server/JsonServer.php
old mode 100644
new mode 100755
diff --git a/app/common/server/QrCodeServer.php b/app/common/server/QrCodeServer.php
old mode 100644
new mode 100755
diff --git a/app/common/server/SmsMessageServer.php b/app/common/server/SmsMessageServer.php
old mode 100644
new mode 100755
index 62ffaea4..dbe7d966
--- a/app/common/server/SmsMessageServer.php
+++ b/app/common/server/SmsMessageServer.php
@@ -34,42 +34,6 @@ class SmsMessageServer
     protected $notice;
 
     public function send($params)
-    {
-        try{
-            //场景对应短信模板信息
-            $scene_config = NoticeSetting::where(['scene' => $params['scene']])->findOrEmpty();
-            //增加短信记录
-            $content = $this->getContentInfo($scene_config, $params);
-            $code = $this->getCodeInfo($params['scene'], $scene_config, $params['params']);
-            $this->sms_log = $this->addSmsLog($params, $content, $code);
-
-            //增加通知记录
-            $this->notice = MessageNoticeLogic::addNoticeLog($params, $scene_config['sms_notice'], NoticeEnum::SMS_NOTICE, $content);
-            //发送短信
-            $SmsDriver = new Driver();
-            $res = $SmsDriver->send($params['mobile'], [
-                'template_id' => $scene_config['sms_notice']['template_code'],
-                'param' => $this->setSmsParams($scene_config, $params),
-            ]);
-
-            if (false === $res) {
-                $this->updateSmsLog($this->sms_log['id'], SmsEnum::SEND_FAIL, $SmsDriver->getError());
-                throw new \Exception($SmsDriver->getError());
-            }
-            $this->updateSmsLog($this->sms_log['id'], SmsEnum::SEND_SUCCESS, $res);
-            return true;
-
-        } catch (\Exception $e) {
-            if (!empty($this->sms_log['id'])) {
-                $this->updateSmsLog($this->sms_log['id'], SmsEnum::SEND_FAIL, $e->getMessage());
-            }
-            if (!empty($this->notice['id'])) {
-                MessageNoticeLogic::updateNotice($this->notice['id'],  $e->getMessage());
-            }
-            return $e->getMessage();
-        }
-    }
-    public function sendNotice($params)
     {
         try{
             //场景对应短信模板信息
@@ -107,6 +71,7 @@ class SmsMessageServer
         }
     }
 
+
     public function addSmsLog($params, $content, $code)
     {
         return SmsLog::create([
diff --git a/app/common/server/TokenServer.php b/app/common/server/TokenServer.php
old mode 100644
new mode 100755
diff --git a/app/common/server/UrlServer.php b/app/common/server/UrlServer.php
old mode 100644
new mode 100755
diff --git a/app/common/server/WeChatPayServer.php b/app/common/server/WeChatPayServer.php
old mode 100644
new mode 100755
index decebd0e..05c117fd
--- a/app/common/server/WeChatPayServer.php
+++ b/app/common/server/WeChatPayServer.php
@@ -148,7 +148,64 @@ class WeChatPayServer
             return false;
         }
     }
+    public static function localserverWxPay($user_id,$post, $client){
+        try {
+            $order['user_id'] = $user_id;
+            $wechat_config = self::getWeChatConfig($order, $client);
+            $auth = $wechat_config['auth'];
+            $config = $wechat_config['config'];
+            $notify_url = $wechat_config['notify_url'];
+            $app = Factory::payment($config);
+            $attributes = [
+                'trade_type' => 'JSAPI',
+                'body' => '本地生活支付',
+                'total_fee' => $post['money'] * 100, // 单位：分
+                'notify_url' => $notify_url,
+                'openid' => $auth['openid'] ?? '',
+                'attach' => 'trade'
+            ];
+            $attributes['out_trade_no'] = "dlh".time().$user_id. $attributes['trade_type'] . $client;
+            $result = $app->order->unify($attributes);
+            // var_dump($result);
+            if ($result['return_code'] == 'SUCCESS' && $result['result_code'] == 'SUCCESS') {
 
+                //小程序,公众号
+                if (in_array($client, [Client_::mnp, Client_::oa])) {
+                    $data = $app->jssdk->bridgeConfig($result['prepay_id'], false);
+                }
+
+                //app客户端
+                if (in_array($client, [Client_::ios, Client_::android])) {
+                    $data = $app->jssdk->appConfig($result['prepay_id'], false);
+                }
+
+                //pc端
+                if ($client == Client_::pc) {
+                    $data = self::getNativeCode($result, $order);
+                }
+
+                //h5(非微信环境)
+                if ($client == Client_::h5) {
+                    $redirect_url = request()->domain() . '/mobile/pages/user_order/user_order';
+                    $redirect_url = urlencode($redirect_url);
+                    $data = $result['mweb_url'] . '&redirect_url=' . $redirect_url;
+                }
+                return $data;
+            } else {
+                if (isset($result['return_code']) && $result['return_code'] == 'FAIL') {
+                    throw new Exception($result['return_msg']);
+                }
+                if (isset($result['err_code_des'])) {
+                    throw new Exception($result['err_code_des']);
+                }
+                throw new Exception('未知原因');
+            }
+
+        } catch (Exception $e) {
+            self::$error = '支付失败:' . $e->getMessage();
+            return false;
+        }
+    }
     /**
      * @notes NATIVE 支付二维码
      * @param $result
diff --git a/app/common/server/WeChatServer.php b/app/common/server/WeChatServer.php
old mode 100644
new mode 100755
index 42dc7f41..c8f1329d
--- a/app/common/server/WeChatServer.php
+++ b/app/common/server/WeChatServer.php
@@ -118,7 +118,6 @@ class WeChatServer
         switch ($order_source) {
             case Client_::mnp:
                 $notify_url = self::getUrl('pay/notifyMnp');
-                dump($notify_url);die;
                 break;
             case Client_::oa:
             case Client_::h5:
diff --git a/app/common/server/WxMessageServer.php b/app/common/server/WxMessageServer.php
old mode 100644
new mode 100755
diff --git a/app/common/server/WxMnpLiveServer.php b/app/common/server/WxMnpLiveServer.php
old mode 100644
new mode 100755
diff --git a/app/common/server/YlyPrinter.php b/app/common/server/YlyPrinter.php
old mode 100644
new mode 100755
diff --git a/app/common/server/printing/Kuaidi100.php b/app/common/server/printing/Kuaidi100.php
old mode 100644
new mode 100755
diff --git a/app/common/server/sms/Driver.php b/app/common/server/sms/Driver.php
old mode 100644
new mode 100755
diff --git a/app/common/server/sms/engine/AliSms.php b/app/common/server/sms/engine/AliSms.php
old mode 100644
new mode 100755
diff --git a/app/common/server/sms/engine/Server.php b/app/common/server/sms/engine/Server.php
old mode 100644
new mode 100755
diff --git a/app/common/server/sms/engine/TcSms.php b/app/common/server/sms/engine/TcSms.php
old mode 100644
new mode 100755
index 7b84e493..fa3710ea
--- a/app/common/server/sms/engine/TcSms.php
+++ b/app/common/server/sms/engine/TcSms.php
@@ -134,46 +134,4 @@ class TcSms extends Server
             return false;
         }
     }
-    public function sendNotice($goods_id=null)
-    {
-        try {
-            if($goods_id != null){
-
-            }
-            $cred = new Credential($this->config['app_key'], $this->config['secret_key']);
-            $httpProfile = new HttpProfile();
-            $httpProfile->setEndpoint("sms.tencentcloudapi.com");
-
-            $clientProfile = new ClientProfile();
-            $clientProfile->setHttpProfile($httpProfile);
-
-            $client = new SmsClient($cred, "", $clientProfile);
-            $req = new SendSmsRequest();
-
-            $params = [
-                'PhoneNumberSet'    => ['+86'.$this->mobile],
-                'TemplateID'        => 'SMS_464320217',
-                'Sign'              => $this->config['sign'],
-                'TemplateParamSet'  => $this->template_param,
-                'SmsSdkAppid'       => $this->config['app_id'],
-            ];
-            $req->fromJsonString(json_encode($params));
-
-            $resp = json_decode($client->SendSms($req)->toJsonString(), true);
-
-            if (isset($resp['SendStatusSet']) && $resp['SendStatusSet'][0]['Code'] == 'Ok') {
-                return $resp;
-            } else {
-                $message = $res['SendStatusSet'][0]['Message'] ?? json_encode($resp);
-                throw new \Exception('短信错误：' . $message);
-            }
-
-        } catch (TencentCloudSDKException $e) {
-            $this->error = $e->getMessage();
-            return false;
-        } catch (\Exception $e) {
-            $this->error = $e->getMessage();
-            return false;
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/common/server/storage/Driver.php b/app/common/server/storage/Driver.php
old mode 100644
new mode 100755
diff --git a/app/common/server/storage/engine/Aliyun.php b/app/common/server/storage/engine/Aliyun.php
old mode 100644
new mode 100755
diff --git a/app/common/server/storage/engine/Local.php b/app/common/server/storage/engine/Local.php
old mode 100644
new mode 100755
diff --git a/app/common/server/storage/engine/Qcloud.php b/app/common/server/storage/engine/Qcloud.php
old mode 100644
new mode 100755
diff --git a/app/common/server/storage/engine/Qiniu.php b/app/common/server/storage/engine/Qiniu.php
old mode 100644
new mode 100755
diff --git a/app/common/server/storage/engine/Server.php b/app/common/server/storage/engine/Server.php
old mode 100644
new mode 100755
diff --git a/app/common/server/system/CrontabServer.php b/app/common/server/system/CrontabServer.php
old mode 100644
new mode 100755
diff --git a/app/common/utils/Redis.php b/app/common/utils/Redis.php
old mode 100644
new mode 100755
diff --git a/app/common/utils/Time.php b/app/common/utils/Time.php
old mode 100644
new mode 100755
diff --git a/app/common/validate/UploadValidate.php b/app/common/validate/UploadValidate.php
old mode 100644
new mode 100755
diff --git a/app/common/websocket/Handler.php b/app/common/websocket/Handler.php
old mode 100644
new mode 100755
index 98921c28..f9194f4c
--- a/app/common/websocket/Handler.php
+++ b/app/common/websocket/Handler.php
@@ -62,7 +62,7 @@ class Handler extends Websocket
     public function onOpen($fd, Request $request)
     {
         $token = $request->get('token/s'); // 客服
-        $type = $request->get('type/s'); // procurement, kefu
+        $type = $request->get('type/s'); // user, kefu
         $client = $request->get('client/d');
         $shop_id = $request->get('shop_id/d', 0); //当前对话的商家id
 
@@ -171,7 +171,7 @@ class Handler extends Websocket
 //            foreach ($check as $item) {
 //                $info = $this->getDataByFd($item);
 //                $client = $info['client'] ?? 0;
-//                if ($client == $procurement['client'] && $fd != $item) {
+//                if ($client == $user['client'] && $fd != $item) {
 //                    $this->del($this->prefix . 'fd_' . $item);
 //                    $this->cache->srem($this->prefix . $type . '_' . $uid, $item);
 //                }
@@ -200,7 +200,7 @@ class Handler extends Websocket
         if ($type == 'kefu') {
             $groupKey = $this->prefix . 'shop_' . $shop_id . '_kefu';
         } else {
-            $groupKey = $this->prefix . 'procurement';
+            $groupKey = $this->prefix . 'user';
         }
         $this->cache->sadd($groupKey, $uid);
     }
@@ -216,7 +216,7 @@ class Handler extends Websocket
     {
         $data = $this->getDataByFd($fd);
         if ($data) {
-            $key = $this->prefix . 'procurement';
+            $key = $this->prefix . 'user';
             if($data['type'] == 'kefu') {
                 $key = $this->prefix . 'shop_'. $data['shop_id'] . '_kefu';
             }
diff --git a/app/common/websocket/Parser.php b/app/common/websocket/Parser.php
old mode 100644
new mode 100755
diff --git a/app/common/websocket/Response.php b/app/common/websocket/Response.php
old mode 100644
new mode 100755
diff --git a/app/event.php b/app/event.php
old mode 100644
new mode 100755
diff --git a/app/index/controller/Download.php b/app/index/controller/Download.php
old mode 100644
new mode 100755
index 63f9d34d..a2f1fc68
--- a/app/index/controller/Download.php
+++ b/app/index/controller/Download.php
@@ -39,12 +39,14 @@ class Download extends IndexBase
         //通过文件缓存的key获取文件储存的路径
         $exportCache = new ExportCache($fileKey);
         $fileInfo = $exportCache->getFile($fileKey);
+
         if (empty($fileInfo)) {
             abort(404, '下载文件不存在');
         }
 
         //下载前删除缓存
         $exportCache->del($fileKey);
+
         return download($fileInfo['src'] . $fileInfo['name'], $fileInfo['name']);
     }
 
@@ -52,7 +54,7 @@ class Download extends IndexBase
     {
         $url = request()->get('url');
         $path = public_path() . ltrim($url, '/');
-
+       
         return download($path, basename($url));
     }
 }
\ No newline at end of file
diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php
old mode 100644
new mode 100755
index 6450c25c..895ea1a4
--- a/app/index/controller/Index.php
+++ b/app/index/controller/Index.php
@@ -22,7 +22,7 @@ namespace app\index\controller;
 
 use app\common\basics\IndexBase;
 use app\common\server\ConfigServer;
-
+use think\facade\Db;
 class Index extends IndexBase
 {
     public function index()
@@ -56,4 +56,20 @@ class Index extends IndexBase
 
         $this->redirect($url);
     }
+    
+        public function localReturn(){
+          $re = $_REQUEST;
+          $data['content'] = $re;
+          $data['dtime'] = date("Y-m-d H:i:s");
+          Db::name("local_return")->save($data);
+        // if (gettype($re) == "string") {
+        //     $data['content'] = $re;
+        //     $data['dtime'] = date("Y-m-d H:i:s");
+        //   Db::name("local_return")->save($data);
+        // } else {
+        //     $data['content'] = var_export($re, true);
+        //     $data['dtime'] = date("Y-m-d H:i:s");
+        //     Db::name("local_return")->save($data);
+        // }
+    }
 }
diff --git a/app/index/controller/WechatMiNiCheckPayOrder.php b/app/index/controller/WechatMiNiCheckPayOrder.php
old mode 100644
new mode 100755
index f066777d..cfcbfe52
--- a/app/index/controller/WechatMiNiCheckPayOrder.php
+++ b/app/index/controller/WechatMiNiCheckPayOrder.php
@@ -21,41 +21,42 @@ class WechatMiNiCheckPayOrder extends IndexBase
 
     public function index()
     {
-        dump(123);
-        die;
         $config = WeChatServer::getPayConfigBySource(1)['config'];
         $app = Factory::payment($config);
 
         RechargeOrder::where('pay_status', PayEnum::UNPAID)->chunk(5, function ($orders) use ($app) {
             foreach($orders as $order){
-                $result = $app->order->queryByOutTradeNumber($order['order_sn'] . $this->prefix);
-                if (isset($result['trade_state']) && $result['trade_state'] === 'SUCCESS') {
-                    $update_data['pay_time'] = time();
-                    $update_data['pay_status'] = PayEnum::ISPAID;
-                    $update_data['transaction_id'] = isset($result['transaction_id']) ? $result['transaction_id'] : '';
-                    $order->where('order_sn', $order->order_sn)->update($update_data);
+                $result = $app->order->queryByOutTradeNumber($order['order_sn']);
+                dump($result);
+                // if (isset($result['trade_state']) && $result['trade_state'] === 'SUCCESS') {
+                //     $update_data['pay_time'] = time();
+                //     $update_data['pay_status'] = PayEnum::ISPAID;
+                //     $update_data['transaction_id'] = isset($result['transaction_id']) ? $result['transaction_id'] : '';
+                //     dump($update_data);
+                    // $order->where('order_sn', $order->order_sn)->update($update_data);
 
-                    $user = User::find($order['user_id']);
-                    $total_money = $order['order_amount'] + $order['give_money'];
-                    $total_integral = $order['give_integral'];
-                    $user->user_money = ['inc', $total_money];
-                    $user->user_integral = ['inc', $total_integral];
-                    $user->user_growth = ['inc', $order['give_growth']];
-                    $user->total_recharge_amount = ['inc', $total_money];
-                    $user->save();
+                    // $user = User::find($order['user_id']);
+                    // $total_money = $order['order_amount'] + $order['give_money'];
+                    // $total_integral = $order['give_integral'];
+                    // $user->user_money = ['inc', $total_money];
+                    // $user->user_integral = ['inc', $total_integral];
+                    // $user->user_growth = ['inc', $order['give_growth']];
+                    // $user->total_recharge_amount = ['inc', $total_money];
+                    // $user->save();
 
-                    //记录余额
-                    $total_money > 0 && AccountLogLogic::AccountRecord($user->id, $total_money, 1, AccountLog::recharge_money, '', $order['id'], $order['order_sn']);
-                    //记录积分
-                    $total_integral > 0 && AccountLogLogic::AccountRecord($user->id, $total_integral, 1, AccountLog::recharge_give_integral);
-                    //记录成长值
-                    $order['give_growth'] > 0 && AccountLogLogic::AccountRecord($user->id, $order['give_growth'], 1, AccountLog::recharge_give_growth);
+                    // //记录余额
+                    // $total_money > 0 && AccountLogLogic::AccountRecord($user->id, $total_money, 1, AccountLog::recharge_money, '', $order['id'], $order['order_sn']);
+                    // //记录积分
+                    // $total_integral > 0 && AccountLogLogic::AccountRecord($user->id, $total_integral, 1, AccountLog::recharge_give_integral);
+                    // //记录成长值
+                    // $order['give_growth'] > 0 && AccountLogLogic::AccountRecord($user->id, $order['give_growth'], 1, AccountLog::recharge_give_growth);
 
-                    // 余额充值参与百亿补贴
-                    self::recharge_billions($order, $order['user_id']);
-                }
+                    // // 余额充值参与百亿补贴
+                    // self::recharge_billions($order, $order['user_id']);
+                // }
             }
         });
+        die;
     }
 
     private static function recharge_billions($order, $user_id)
diff --git a/app/index/controller/Weixingz.php b/app/index/controller/Weixingz.php
old mode 100644
new mode 100755
index ceb9d295..830e5e90
--- a/app/index/controller/Weixingz.php
+++ b/app/index/controller/Weixingz.php
@@ -3,10 +3,10 @@
 
 namespace app\index\controller;
 use app\common\basics\IndexBase;
-use app\common\model\procurement\Procurementxy;
 use think\facade\Db;
 use \weixin\Getgzopenid;
 use app\common\server\JsonServer;
+use app\common\model\procurement\Procurementxy;
 use app\common\model\gzuser\Weixingzhuserbind;
 class Weixingz extends IndexBase
 {
@@ -112,16 +112,13 @@ class Weixingz extends IndexBase
             return JsonServer::error('系统错误');
         }
     }
-    // 信用额度脚本
     public function limitScript(){
         $result = Db::name('procurement_xy_pencil')->field("sum(pencil_price)as sums,user_id")->where('pencil_state',0)->group("user_id")->select();
         foreach($result as $key=>$value){
             $user = Db::name('procurement_xy')->where('user_id',$value['user_id'])->find();
             if($user!=null){
-                if($user['xy_price'] < "1000000"){
-                    Procurementxy::where('user_id', $value['user_id'])
-                        ->inc('xy_price',round($value['sums'],2))->update();
-                }
+                Procurementxy::where('user_id', $value['user_id'])
+                    ->inc('xy_price',round($value['sums'],2))->update();
             }else{
                 Procurementxy::create([
                     'xy_price' => round($value['sums'],2),
diff --git a/app/kefuapi/config/route.php b/app/kefuapi/config/route.php
old mode 100644
new mode 100755
diff --git a/app/kefuapi/controller/Account.php b/app/kefuapi/controller/Account.php
old mode 100644
new mode 100755
diff --git a/app/kefuapi/controller/Chat.php b/app/kefuapi/controller/Chat.php
old mode 100644
new mode 100755
diff --git a/app/kefuapi/controller/File.php b/app/kefuapi/controller/File.php
old mode 100644
new mode 100755
diff --git a/app/kefuapi/http/middleware/Login.php b/app/kefuapi/http/middleware/Login.php
old mode 100644
new mode 100755
diff --git a/app/kefuapi/logic/ChatLogic.php b/app/kefuapi/logic/ChatLogic.php
old mode 100644
new mode 100755
diff --git a/app/kefuapi/logic/LoginLogic.php b/app/kefuapi/logic/LoginLogic.php
old mode 100644
new mode 100755
diff --git a/app/kefuapi/validate/ChatValidate.php b/app/kefuapi/validate/ChatValidate.php
old mode 100644
new mode 100755
diff --git a/app/kefuapi/validate/LoginValidate.php b/app/kefuapi/validate/LoginValidate.php
old mode 100644
new mode 100755
diff --git a/app/kefuapi/validate/TokenValidate.php b/app/kefuapi/validate/TokenValidate.php
old mode 100644
new mode 100755
diff --git a/app/middleware.php b/app/middleware.php
old mode 100644
new mode 100755
diff --git a/app/provider.php b/app/provider.php
old mode 100644
new mode 100755
diff --git a/app/service.php b/app/service.php
old mode 100644
new mode 100755
diff --git a/app/shop/config/project.php b/app/shop/config/project.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/Admin.php b/app/shop/controller/Admin.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/Bank.php b/app/shop/controller/Bank.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/Common.php b/app/shop/controller/Common.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/Dispatch.php b/app/shop/controller/Dispatch.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/File.php b/app/shop/controller/File.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/Freight.php b/app/shop/controller/Freight.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/Index.php b/app/shop/controller/Index.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/Login.php b/app/shop/controller/Login.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/Role.php b/app/shop/controller/Role.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/Seckill.php b/app/shop/controller/Seckill.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/Statistics.php b/app/shop/controller/Statistics.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/Store.php b/app/shop/controller/Store.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/Upload.php b/app/shop/controller/Upload.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/abutment/Abutment.php b/app/shop/controller/abutment/Abutment.php
new file mode 100755
index 00000000..354d530c
--- /dev/null
+++ b/app/shop/controller/abutment/Abutment.php
@@ -0,0 +1,260 @@
+<?php
+
+namespace app\shop\controller\abutment;
+
+use app\common\basics\ShopBase;
+use IcbcConstants;
+use think\App;
+use think\Request;
+use DefaultIcbcClient;
+use UiIcbcClient;
+use think\facade\Db;
+include_once "../vendor/icbc-api-sdk-cop-php/DefaultIcbcClient.php";
+include_once "../vendor/icbc-api-sdk-cop-php/UiIcbcClient.php";
+class Abutment extends ShopBase
+{
+    private $APP_ID = '11000000000000026359';
+    private $url = 'https://gw.open.icbc.com.cn/api/mybank/enterprise/pay/payent/V1';
+    private $PRI_KEY = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC9Soh5U2wx4YQJUaXn80cuHzmZl8p+07yUwl5jawuS88zy6lyPav32ZrsTfQQZv4uqfYCA4oT+BIQE6Segd5yd90FcGHH/vYb9b7JLZxslUGiuXuD6u9ULPt3Upgy9IROq8ghyhBFas3rfNl48Hh0L5WKADYb3Ywi/CqbSKUe4hVJ22GbrGz1eMwZxMD2yveHsmFrsNTYTiy3u+kASk479iYkVxOoobwMMv+1BsnmrAqs5uJt+LVcR2qmLJE0Gyog+CvRI2MORIcYvu8yzwkJu2gsZTVr6yl3WyKv5Mh+79dloimP6YHJWvlmpu77BUsBSofCttPAkEsWG57Rfrft3AgMBAAECggEASpxePrRLKT4itSmho1OY8u0L3yadgnAjHN+gJL/EyB+g4P7PjRg3EjBb/MqCG0QM4R6m0CZ5FUbiYq0kGXQMH5eeA5b/GDa0RqEIPgBeCs8u88wiEbKHvu8AsRjiXIn1HqRYAAtea8ni3KipbDjSaiX4NVEfqdM3V1Xze1MaGfiFgs2artnUw3ZgiUeEIJxpuqwplXsUeZBKm88XNo7mfBfBvP3VFq9HF4O6Lo01SfCn+DWQfEpiRoS7xHfPhxnkggNdr4OMzUg7DV1xTJpX5FeeakuVO4CkyRBrjIR1W6Eq7HeAsoNoPK1OdoBN4zP77H0zW7RT0D8EImfkJKgpwQKBgQDZHH+zD6gvrlReN8DBt0wUksaQ3vAIlXrBIpshPDMvFpqBMQ2SIuMWx9CGiTX4iMAtdQR7cHG2lDwnyv6wjE4lejAZ0E3eHiQJsvA41pbZzenbiilLTv92Ea2PgR8V/qXxIyafedD3Xec7BilmOm+h33ZIo4v8MFjy83FT3H9vswKBgQDfMluU5K49rdtJpRlpCFywqPac7KOpcVT2T6UYmPO1fxek+3lnhB2qFMiJWBYI30mHRglERFRWWoHdEir2eUhXY5u/kN6ncVsMHCVqslJKmBBEeHJRFl41IbwByBHAPqKIcXI5lLyQdNxmgnG3tZDBDTQPz2pdbjARMb9o3wbDLQKBgQDX7bwjvoKrSVqnihOvljmYjJHoK5HXN7OqulxHJbRSNMzdiIfSu9fXJEuEQprm4Dsh+qvGiQLPb4aUnRPJSwG9zFRimAWZz6hP7SN1pBbL8DuSGUsQlzUDnHldrDHakjVAKpGTMnheTYpX7bzm619zQuhFPkNPQlZ06yHfIgGseQKBgQCXi4enNwYflvY3sMPqDuVwhai8r+gH2o2HmFhOtTt0VlDlkmHCKXBC1U28A3UinQk9sg4ErihdYaKfSgClzX+S5m0PyvuC0XKybEHzihRZ1ZnmA6oK6JcamEchJoj28RBGeFDIS/ckVlR3vcYcqEka6y4YNgrQWUqFwjNmr1fWGQKBgQDGFD2O3/2MH068DMTskQWWoJWV1Isvst+oXBgERKkh5A/BYAAaw9kb+tKke/czulajRizv+nhstPQ2d/701QmdLCK6rK05SEChctaq7Cxk2QRRWHznYPqmJHPkuUXqg5LaOa81UDlGKDK1ylljppZOONlLtm00k6s5fLOe1SRfJg==";
+    private $APIGW_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvUqIeVNsMeGECVGl5/NHLh85mZfKftO8lMJeY2sLkvPM8upcj2r99ma7E30EGb+Lqn2AgOKE/gSEBOknoHecnfdBXBhx/72G/W+yS2cbJVBorl7g+rvVCz7d1KYMvSETqvIIcoQRWrN63zZePB4dC+VigA2G92MIvwqm0ilHuIVSdthm6xs9XjMGcTA9sr3h7Jha7DU2E4st7vpAEpOO/YmJFcTqKG8DDL/tQbJ5qwKrObibfi1XEdqpiyRNBsqIPgr0SNjDkSHGL7vMs8JCbtoLGU1a+spd1sir+TIfu/XZaIpj+mByVr5Zqbu+wVLAUqHwrbTwJBLFhue0X637dwIDAQAB";
+
+    private $signType = "RSA2";
+    private $apiClient;
+    public function __construct(\think\App $app){
+        parent::__construct($app);
+        $this->apiClient = new \DefaultIcbcClient(
+            $this->APP_ID,
+            $this->PRI_KEY,
+            $this->signType,
+            'UTF-8',
+            '',
+            $this->APIGW_PUBLIC_KEY,
+            '',
+            '',
+            '',
+            ''
+        );
+    }
+    public function test($empowerPhone="13067694782",$crftNo1="91330401MADP554D6P",$crftType1="101",$mcc="9703"){
+        // 110-营业执照(个体工商户)，101-营业执照(企业法人)
+        // var_dump(132);die;
+         $msg_id = $this->getMsgId();
+        $request = [
+          'serviceUrl' => 'https://gw.open.icbc.com.cn/api/mybank/cardbusiness/shop/MerRegistrationAdd/V1',
+          'method' => 'POST',
+          'isNeedEncrypt'=>false,
+          'biz_content' => array(
+                "channelFlag"=>"2",
+                "notify_url"=>"https://dlh.hainings.com/index/index/localReturn",
+                "empowerPhone"=>$empowerPhone,
+                "applyType"=>"00001",
+                "crftType1"=>$crftType1,
+                 "crftNo1"=>$crftNo1,
+                // "crftNo1"=>"914310236828465718",
+                "serId"=>"120400005722",
+                "mcc"=>$mcc
+                // "mcc"=>"5732"
+                // "mcc"=>"4816"
+          ),
+          'extraParams'=>[]
+        ];
+        print_r("<pre>");
+        var_dump($request);
+        $res = $this->apiClient->execute($request,$msg_id,"");
+    }
+    
+    public function test1(){
+          $msg_id = $this->getMsgId();
+        $request = [
+          'serviceUrl' => 'https://gw.open.icbc.com.cn/api/mybank/cardbusiness/shop/MerRegistrationQuery/V1',
+          'method' => 'POST',
+          'isNeedEncrypt'=>false,
+          'biz_content' => array(
+                "notify_url"=>"https://dlh.hainings.com/index/index/localReturn",
+                "applyType"=>"00001",
+                "crftType"=>"101",
+                "crftNo"=>"91330401MADP554D6P",
+                "serId"=>"120400005722"
+          ),
+          'extraParams'=>[]
+        ];
+        // print_r("<pre>");
+        // var_dump($request);
+        $res = $this->apiClient->execute($request,$msg_id,"");
+          var_dump($res);
+        $result = json_decode($res,true);
+        $r = json_decode($result['results'],true);
+
+        var_dump($r);
+    }
+    
+    public function payTest(){
+        $user_id = 1;
+           $msg_id = $this->getMsgId();
+           $out = "dlh".time().$user_id;
+        $request = [
+          'serviceUrl' => 'https://gw.open.icbc.com.cn/api/cardbusiness/aggregatepay/b2c/online/consumepurchase/V2',
+          'method' => 'POST',
+          'isNeedEncrypt'=>false,
+          'biz_content' => array(
+                "mer_id"=>"120448160200",
+                "ser_Id"=>"120400005722",
+                "out_trade_no"=>$out,
+                "pay_mode"=>"9",
+                "access_type"=>"9",
+                "mer_prtcl_no"=>"1204481602000201",
+                "orig_date_time"=>date("Y-m-d\TH:i:s"),
+                "decive_info"=>"11",
+                "body"=>"泰宇",
+                "fee_type"=>"001",
+                "spbill_create_ip"=>"183.141.48.230",
+                "total_fee"=>"1000",
+                "mer_url"=>"https://dlh.hainings.com/index/index/localReturn",
+                "notify_type"=>"HS",
+                "shop_appid"=>"wx586d77b9edb0636d",
+                "icbc_appid"=>$this->APP_ID,
+                "open_id"=>"ouOMm41xnIKqoZ66ygwJa-qJQpgw",
+                "notify_url"=>"https://dlh.hainings.com/index/index/localReturn",
+                "order_submit_act_input"=>array(
+                    "rec_num"=>"1",
+                    "sub_order_id"=>"dlh".time().$user_id."1",
+                    "oper_flag"=>"0",
+                    "busi_type"=>"1",
+                    "seq_no"=>$out,
+                    "ori_trx_date"=>date("Y-m-d"),
+                    "sub_mer_id"=>"120448160198",
+                    "sub_mer_prtcl_no"=>"120448160198",
+                    "classify_amt"=>"600"
+                )
+          ),
+          'extraParams'=>[]
+        ];
+        $res = $this->apiClient->execute($request,$msg_id,"");
+           $result = json_decode($res,true);
+          print_r("<pre>");
+
+        var_dump($result);
+    }
+    
+        public function payTestCheck(){
+        $user_id = 1;
+           $msg_id = $this->getMsgId();
+        //   $out = "dlh".time().$user_id;
+        $request = [
+          'serviceUrl' => 'https://gw.open.icbc.com.cn/api/cardbusiness/aggregatepay/b2c/online/orderqry/V2',
+          'method' => 'POST',
+          'isNeedEncrypt'=>false,
+          'biz_content' => array(
+                "mer_id"=>"120448160201",
+                "deal_flag"=>'0',
+                "out_trade_no"=>"dlh1722085369979",
+                //  "order_id"=>"120448160200000582407190000053",
+                "mer_prtcl_no"=>"1204481602000201",
+                "icbc_appid"=>$this->APP_ID
+          ),
+          'extraParams'=>[]
+        ];
+         print_r("<pre>");
+         var_dump($request);
+        $res = $this->apiClient->execute($request,$msg_id,"");
+         $result = json_decode($res,true);
+        //   print_r("<pre>");
+        // var_dump($res);die;
+          $r = json_decode($result['order_submit_act_output'],true);
+        //   $result = json_decode($res,true);
+         
+
+        var_dump($r);
+    }
+    
+     public function setTest(){
+        $user = Db::name("user")->where("first_leader",629)->select()->toArray();
+        foreach($user as $key=>$value){
+             Db::name("user")->where("id",$value['id'])->update(["divide_role_user_id"=>$value['first_leader']]);
+             $second_user = Db::name("user")->where("first_leader",$value['id'])->select()->toArray();
+            foreach($second_user as $k=>$v){
+                 Db::name("user")->where("id",$v['id'])->update(["divide_role_user_id"=>$value['first_leader']]);
+                 $third_user = Db::name("user")->where("first_leader",$v['id'])->select()->toArray();
+                 foreach($third_user as $k1=>$v1){
+                     Db::name("user")->where("id",$v1['id'])->update(["divide_role_user_id"=>$value['first_leader']]);
+                    //  $four_user = Db::name("user")->where("first_leader",$v1['id'])->select()->toArray();
+                
+                 }
+                
+            }
+           
+        }
+    }
+    
+    public function getMsgId(){
+        return substr(md5("donglonghui".time().mt_rand(1,1000000)),8,13);
+    }
+    public function abutmentContent(){
+        $data=[
+            "app_id"=> $this->app_id,
+            "timestamp"=>date("Y-m-dH:i:s"),
+            "notify_url"=>"https://dlh.hainings.com/index/index/localReturn"
+        ];
+        ksort($data);
+        print("<pre>");
+        var_dump($data);
+        $data['msg_id'] = $this->getId("donglonghui",$data);
+        $data1 = http_build_query($data);
+        $url = "https://gw.open.icbc.com.cn/api/mybank/enterprise/pay/payent/V1";
+        $res = $this->curl_post($url,$data1);
+//        var_dump($res);
+        $data['sign'] = $res['sign'];
+//        var_dump($data);
+
+        $d=[
+            "channelFlag"=>2,
+            "empowerPhone"=>"18868040087",
+            "applyType"=>"00100",
+            "crftType1"=>"101",
+            "crftNo1"=>"914310236828465718"
+        ];
+        $u = "https://gw.open.icbc.com.cn/api/mybank/cardbusiness/shop/MerRegistrationAdd/V1";
+        $d1= http_build_query($d);
+        $rest = $this->curl_post($u,$d1);
+        var_dump($rest);
+    }
+
+
+    function getId($app_secret, $req_param=[])
+    {
+        // 排序所有请求参数
+        ksort($req_param);
+        $src_value = "";
+        // 按照key1value1key2value2...keynvaluen拼接
+        foreach ($req_param as $key => $value) {
+            $src_value .= ($key . $value);
+        }
+        //计算md5
+        return md5($app_secret . $src_value . $app_secret);
+    }
+
+    private function curl_post($url,$postdata){
+        $curl = curl_init(); // 启动一个CURL会话
+        curl_setopt($curl, CURLOPT_URL, $url); // 要访问的地址
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); // 对认证证书来源的检测
+        curl_setopt($curl, CURLOPT_HTTPHEADER, array(
+            'Expect:'
+        )); // 解决数据包大不能提交
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); // 使用自动跳转
+        curl_setopt($curl, CURLOPT_AUTOREFERER, 1); // 自动设置Referer
+        curl_setopt($curl, CURLOPT_POST, 1); // 发送一个常规的Post请求
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); // Post提交的数据包
+        curl_setopt($curl, CURLOPT_TIMEOUT, 30); // 设置超时限制防止死循
+        curl_setopt($curl, CURLOPT_HEADER, 0); // 显示返回的Header区域内容
+        curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type: application/x-www-form-urlencoded'));
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 获取的信息以文件流的形式返回
+// curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); // 跳过证书检查
+        $tmpInfo = curl_exec($curl); // 执行操作
+        if (curl_errno($curl)) {
+            echo 'Errno' . curl_error($curl);
+        }
+        curl_close($curl); // 关键CURL会话
+        $tmpInfo=json_decode($tmpInfo,true);
+        return $tmpInfo;
+    }
+}
\ No newline at end of file
diff --git a/app/shop/controller/abutment/Abutment_backup.php b/app/shop/controller/abutment/Abutment_backup.php
new file mode 100755
index 00000000..f76e7992
--- /dev/null
+++ b/app/shop/controller/abutment/Abutment_backup.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace app\shop\controller\abutment;
+
+use app\common\basics\ShopBase;
+use IcbcConstants;
+use think\App;
+use think\Request;
+use DefaultIcbcClient;
+use UiIcbcClient;
+use think\facade\Db;
+include_once "../vendor/icbc-api-sdk-cop-php/DefaultIcbcClient.php";
+include_once "../vendor/icbc-api-sdk-cop-php/UiIcbcClient.php";
+class Abutment extends ShopBase
+{
+    private $APP_ID = '11000000000000026359';
+    private $url = 'https://gw.open.icbc.com.cn/api/mybank/enterprise/pay/payent/V1';
+    private $PRI_KEY = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC9Soh5U2wx4YQJUaXn80cuHzmZl8p+07yUwl5jawuS88zy6lyPav32ZrsTfQQZv4uqfYCA4oT+BIQE6Segd5yd90FcGHH/vYb9b7JLZxslUGiuXuD6u9ULPt3Upgy9IROq8ghyhBFas3rfNl48Hh0L5WKADYb3Ywi/CqbSKUe4hVJ22GbrGz1eMwZxMD2yveHsmFrsNTYTiy3u+kASk479iYkVxOoobwMMv+1BsnmrAqs5uJt+LVcR2qmLJE0Gyog+CvRI2MORIcYvu8yzwkJu2gsZTVr6yl3WyKv5Mh+79dloimP6YHJWvlmpu77BUsBSofCttPAkEsWG57Rfrft3AgMBAAECggEASpxePrRLKT4itSmho1OY8u0L3yadgnAjHN+gJL/EyB+g4P7PjRg3EjBb/MqCG0QM4R6m0CZ5FUbiYq0kGXQMH5eeA5b/GDa0RqEIPgBeCs8u88wiEbKHvu8AsRjiXIn1HqRYAAtea8ni3KipbDjSaiX4NVEfqdM3V1Xze1MaGfiFgs2artnUw3ZgiUeEIJxpuqwplXsUeZBKm88XNo7mfBfBvP3VFq9HF4O6Lo01SfCn+DWQfEpiRoS7xHfPhxnkggNdr4OMzUg7DV1xTJpX5FeeakuVO4CkyRBrjIR1W6Eq7HeAsoNoPK1OdoBN4zP77H0zW7RT0D8EImfkJKgpwQKBgQDZHH+zD6gvrlReN8DBt0wUksaQ3vAIlXrBIpshPDMvFpqBMQ2SIuMWx9CGiTX4iMAtdQR7cHG2lDwnyv6wjE4lejAZ0E3eHiQJsvA41pbZzenbiilLTv92Ea2PgR8V/qXxIyafedD3Xec7BilmOm+h33ZIo4v8MFjy83FT3H9vswKBgQDfMluU5K49rdtJpRlpCFywqPac7KOpcVT2T6UYmPO1fxek+3lnhB2qFMiJWBYI30mHRglERFRWWoHdEir2eUhXY5u/kN6ncVsMHCVqslJKmBBEeHJRFl41IbwByBHAPqKIcXI5lLyQdNxmgnG3tZDBDTQPz2pdbjARMb9o3wbDLQKBgQDX7bwjvoKrSVqnihOvljmYjJHoK5HXN7OqulxHJbRSNMzdiIfSu9fXJEuEQprm4Dsh+qvGiQLPb4aUnRPJSwG9zFRimAWZz6hP7SN1pBbL8DuSGUsQlzUDnHldrDHakjVAKpGTMnheTYpX7bzm619zQuhFPkNPQlZ06yHfIgGseQKBgQCXi4enNwYflvY3sMPqDuVwhai8r+gH2o2HmFhOtTt0VlDlkmHCKXBC1U28A3UinQk9sg4ErihdYaKfSgClzX+S5m0PyvuC0XKybEHzihRZ1ZnmA6oK6JcamEchJoj28RBGeFDIS/ckVlR3vcYcqEka6y4YNgrQWUqFwjNmr1fWGQKBgQDGFD2O3/2MH068DMTskQWWoJWV1Isvst+oXBgERKkh5A/BYAAaw9kb+tKke/czulajRizv+nhstPQ2d/701QmdLCK6rK05SEChctaq7Cxk2QRRWHznYPqmJHPkuUXqg5LaOa81UDlGKDK1ylljppZOONlLtm00k6s5fLOe1SRfJg==";
+    private $APIGW_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvUqIeVNsMeGECVGl5/NHLh85mZfKftO8lMJeY2sLkvPM8upcj2r99ma7E30EGb+Lqn2AgOKE/gSEBOknoHecnfdBXBhx/72G/W+yS2cbJVBorl7g+rvVCz7d1KYMvSETqvIIcoQRWrN63zZePB4dC+VigA2G92MIvwqm0ilHuIVSdthm6xs9XjMGcTA9sr3h7Jha7DU2E4st7vpAEpOO/YmJFcTqKG8DDL/tQbJ5qwKrObibfi1XEdqpiyRNBsqIPgr0SNjDkSHGL7vMs8JCbtoLGU1a+spd1sir+TIfu/XZaIpj+mByVr5Zqbu+wVLAUqHwrbTwJBLFhue0X637dwIDAQAB";
+
+    private $signType = "RSA2";
+    private $apiClient;
+    public function __construct(\think\App $app){
+        parent::__construct($app);
+        $this->apiClient = new \DefaultIcbcClient(
+            $this->APP_ID,
+            $this->PRI_KEY,
+            $this->signType,
+            '',
+            '',
+            $this->APIGW_PUBLIC_KEY,
+            '',
+            '',
+            '',
+            ''
+        );
+    }
+    public function test(){
+        $request = [
+          'serviceUrl' => 'https://gw.open.icbc.com.cn/api/mybank/enterprise/pay/payent/V1',
+          'method' => 'POST',
+          'isNeedEncrypt'=>false,
+          'biz_content' => array(
+                "channelFlag"=>2,
+                "empowerPhone"=>"18868040087",
+                "applyType"=>"00100",
+                "crftType1"=>"101",
+                "crftNo1"=>"914310236828465718"
+          ),
+          'extraParams'=>[]
+        ];
+        $res = $this->apiClient->execute($request,$this->getMsgId(),"");
+    }
+    public function getMsgId(){
+        return substr(md5("donglonghui".time().mt_rand(1,1000000)),8,13);
+    }
+    public function abutmentContent(){
+        $data=[
+            "app_id"=> $this->app_id,
+            "timestamp"=>date("Y-m-dH:i:s"),
+            "notify_url"=>"https://dlh.hainings.com/index/index/localReturn"
+        ];
+        ksort($data);
+        print("<pre>");
+        var_dump($data);
+        $data['msg_id'] = $this->getId("donglonghui",$data);
+        $data1 = http_build_query($data);
+        $url = "https://gw.open.icbc.com.cn/api/mybank/enterprise/pay/payent/V1";
+        $res = $this->curl_post($url,$data1);
+//        var_dump($res);
+        $data['sign'] = $res['sign'];
+//        var_dump($data);
+
+        $d=[
+            "channelFlag"=>2,
+            "empowerPhone"=>"18868040087",
+            "applyType"=>"00100",
+            "crftType1"=>"101",
+            "crftNo1"=>"914310236828465718"
+        ];
+        $u = "https://gw.open.icbc.com.cn/api/mybank/cardbusiness/shop/MerRegistrationAdd/V1";
+        $d1= http_build_query($d);
+        $rest = $this->curl_post($u,$d1);
+        var_dump($rest);
+    }
+
+
+    function getId($app_secret, $req_param=[])
+    {
+        // 排序所有请求参数
+        ksort($req_param);
+        $src_value = "";
+        // 按照key1value1key2value2...keynvaluen拼接
+        foreach ($req_param as $key => $value) {
+            $src_value .= ($key . $value);
+        }
+        //计算md5
+        return md5($app_secret . $src_value . $app_secret);
+    }
+
+    private function curl_post($url,$postdata){
+        $curl = curl_init(); // 启动一个CURL会话
+        curl_setopt($curl, CURLOPT_URL, $url); // 要访问的地址
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); // 对认证证书来源的检测
+        curl_setopt($curl, CURLOPT_HTTPHEADER, array(
+            'Expect:'
+        )); // 解决数据包大不能提交
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); // 使用自动跳转
+        curl_setopt($curl, CURLOPT_AUTOREFERER, 1); // 自动设置Referer
+        curl_setopt($curl, CURLOPT_POST, 1); // 发送一个常规的Post请求
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); // Post提交的数据包
+        curl_setopt($curl, CURLOPT_TIMEOUT, 30); // 设置超时限制防止死循
+        curl_setopt($curl, CURLOPT_HEADER, 0); // 显示返回的Header区域内容
+        curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type: application/x-www-form-urlencoded'));
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 获取的信息以文件流的形式返回
+// curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); // 跳过证书检查
+        $tmpInfo = curl_exec($curl); // 执行操作
+        if (curl_errno($curl)) {
+            echo 'Errno' . curl_error($curl);
+        }
+        curl_close($curl); // 关键CURL会话
+        $tmpInfo=json_decode($tmpInfo,true);
+        return $tmpInfo;
+    }
+}
\ No newline at end of file
diff --git a/app/shop/controller/activity_area/Goods.php b/app/shop/controller/activity_area/Goods.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/after_sale/AfterSale.php b/app/shop/controller/after_sale/AfterSale.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/bargain/Bargain.php b/app/shop/controller/bargain/Bargain.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/coupon/Coupon.php b/app/shop/controller/coupon/Coupon.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/decoration/Index.php b/app/shop/controller/decoration/Index.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/distribution/Center.php b/app/shop/controller/distribution/Center.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/distribution/Goods.php b/app/shop/controller/distribution/Goods.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/distribution/Order.php b/app/shop/controller/distribution/Order.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/distribution/Record.php b/app/shop/controller/distribution/Record.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/express_assistant/FaceSheetOrder.php b/app/shop/controller/express_assistant/FaceSheetOrder.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/express_assistant/FaceSheetSender.php b/app/shop/controller/express_assistant/FaceSheetSender.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/express_assistant/FaceSheetSetting.php b/app/shop/controller/express_assistant/FaceSheetSetting.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/express_assistant/FaceSheetTpl.php b/app/shop/controller/express_assistant/FaceSheetTpl.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/finance/Settlement.php b/app/shop/controller/finance/Settlement.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/finance/Shop.php b/app/shop/controller/finance/Shop.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/finance/Withdrawal.php b/app/shop/controller/finance/Withdrawal.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/free_shipping/FreeShipping.php b/app/shop/controller/free_shipping/FreeShipping.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/goods/Category.php b/app/shop/controller/goods/Category.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/goods/Comment.php b/app/shop/controller/goods/Comment.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/goods/Goods.php b/app/shop/controller/goods/Goods.php
old mode 100644
new mode 100755
index 9197ea2c..a202b195
--- a/app/shop/controller/goods/Goods.php
+++ b/app/shop/controller/goods/Goods.php
@@ -24,16 +24,14 @@ namespace app\shop\controller\goods;
 use app\common\basics\ShopBase;
 use app\common\enum\GoodsEnum;
 use app\common\model\goods\GoodsBrand;
-use app\common\model\goods\GoodsCategory;
-use app\common\model\goods\GoodsSpec;
 use app\common\model\goods\GoodsUnit;
+use app\common\model\goods\GoodsCategory;
 use app\common\model\Freight;
 use app\common\model\goods\Supplier;
 use app\common\model\goods\Goods as GoodsModel;
 use app\common\logic\CommonLogic;
 use app\common\server\ArrayServer;
 use app\common\server\JsonServer;
-use app\common\server\sms\Driver;
 use app\shop\logic\goods\GoodsLogic;
 use app\shop\validate\goods\GoodsMoreSpec;
 use app\shop\validate\goods\GoodsMoreSpecLists;
@@ -42,9 +40,7 @@ use app\shop\validate\goods\GoodsStatusValidate;
 use app\shop\validate\goods\GoodsValidate;
 use app\admin\logic\goods\CategoryLogic as MallCategoryLogic;
 use app\shop\logic\goods\CategoryLogic as ShopCategoryLogic;
-use app\common\server\doudian\DouDianServer;
-use DOMDocument;
-use think\Exception;
+
 
 
 /**
@@ -68,9 +64,7 @@ class Goods extends ShopBase
         $cate_list = MallCategoryLogic::categoryTreeeTree();
         $shop_cate_list = ShopCategoryLogic::listAll($this->shop_id);
         $statistics = GoodsLogic::statistics($this->shop_id);
-
         return view('', [
-            'shop_id'           => $this->shop_id,
             'statistics'        => $statistics,
             'cate_list'         => $cate_list, //平台分类
             'shop_cate_list'    => $shop_cate_list, //商家分类
@@ -110,10 +104,11 @@ class Goods extends ShopBase
                 unset($spec_lists['spec_values']);
                 unset($spec_lists['spec_value_ids']);
                 unset($spec_lists['delivery_type']);
-                unset($spec_lists['c_name']);
+                 unset($spec_lists['c_name']);
                 unset($spec_lists['c_phone']);
+                unset($spec_lists['work_remark']);
                 unset($spec_lists['goods_remark']);
-                unset($spec_lists['first_cate_id']);
+                 unset($spec_lists['first_cate_id']);
                 unset($spec_lists['second_cate_id']);
                 unset($spec_lists['third_cate_id']);
                 $goods_number = $spec_lists['goods_number'];
@@ -156,9 +151,9 @@ class Goods extends ShopBase
             }
             return JsonServer::success('添加成功');
         }
-        $a = MallCategoryLogic::getAllTree();
+            $a = MallCategoryLogic::getAllTree();
         return view('', [
-            'category_lists_new' => $a,
+          'category_lists_new' => $a,
             'category_first' => "",
             'category_second' => "",
             'second_pid' => "",
@@ -212,10 +207,11 @@ class Goods extends ShopBase
                 unset($spec_lists['spec_id']);
                 unset($spec_lists['spec_value_ids']);
                 unset($spec_lists['delivery_type']);
-                unset($spec_lists['c_name']);
+                 unset($spec_lists['c_name']);
                 unset($spec_lists['c_phone']);
                 unset($spec_lists['goods_remark']);
-                unset($spec_lists['first_cate_id']);
+                 unset($spec_lists['work_remark']);
+                 unset($spec_lists['first_cate_id']);
                 unset($spec_lists['second_cate_id']);
                 unset($spec_lists['third_cate_id']);
                 $goods_number = $spec_lists['goods_number'];
@@ -257,12 +253,12 @@ class Goods extends ShopBase
 
         $goods_id = $this->request->get('goods_id');
         $a = MallCategoryLogic::getAllTree();
-        $b = GoodsLogic::info($goods_id);
-        $second_pid = array();
-        $arr = $arr1 = array();
+          $b = GoodsLogic::info($goods_id);
+         $second_pid = array();
+          $arr = $arr1 = array();
         if($b['base']['second_cate_id']!=0){
             $second_pid = GoodsCategory::where("id in (".$b['base']['second_cate_id'].")")->select();
-            if(!empty($second_pid)){
+              if(!empty($second_pid)){
                 foreach($second_pid as $key=>$value){
                     $arr[$key]=$value['pid'];
                 }
@@ -272,7 +268,7 @@ class Goods extends ShopBase
         $third_pid = array();
         if($b['base']['third_cate_id']!=0){
             $third_pid = GoodsCategory::where("id in (".$b['base']['third_cate_id'].")")->select();
-            if(!empty($third_pid)){
+             if(!empty($third_pid)){
                 foreach($third_pid as $key=>$value){
                     $arr1[$key]=$value['pid'];
                 }
@@ -283,7 +279,7 @@ class Goods extends ShopBase
         $b['base']['second_cate_id'] = explode(",",$b['base']['second_cate_id']);
         $b['base']['third_cate_id']= explode(",",$b['base']['third_cate_id']);
         return view('goods/goods/add', [
-            'category_lists_new' => $a,
+              'category_lists_new' => $a,
             'category_first' => $b['base']['first_cate_id'],
             'category_second' => $b['base']['second_cate_id'],
             'second_pid' => $second_pid,
@@ -387,41 +383,11 @@ class Goods extends ShopBase
             return JsonServer::error(GoodsLogic::getError());
         }
     }
-
-    /**
-     * @notes 同步到抖店
-     */
-    public function syncDouDian()
-    {
-        if ($this->request->isAjax()) {
-            $goods_id = $this->request->post('id');
-            // 目前仅限于泰宇店
-            if ($this->shop_id === 4) {
-                try {
-                    $doudian = new DouDianServer();
-                    $result = \app\common\model\goods\Goods::where(['id' => $goods_id])->find();
-                    if ($result['doudian_data']) {
-                        $product = json_decode($result['doudian_data'], true);
-                        $doudian->camelliaProductEdit($product['product_id'], $goods_id);
-                    } else {
-                        if ($doudian->camelliaProduct($goods_id) == 10000) {
-                            return JsonServer::success('同步成功');
-                        }
-                    }
-                } catch (Exception $e) {
-                    return JsonServer::error($e->getMessage());
-                }
-            }
-        }
-    }
-
-    /**
-     * @notes 导出Excel
-     */
+    
     public function export()
     {
         $result = GoodsLogic::exportData($this->shop_id);
-        if (!$result) {
+        if(false === $result) {
             return JsonServer::error(OrderLogic::getError() ?: '导出失败');
         }
         $src = input('server.REQUEST_SCHEME') . '://' . input('server.SERVER_NAME');
diff --git a/app/shop/controller/goods/Supplier.php b/app/shop/controller/goods/Supplier.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/kefu/Kefu.php b/app/shop/controller/kefu/Kefu.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/kefu/KefuLang.php b/app/shop/controller/kefu/KefuLang.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/live/LiveGoods.php b/app/shop/controller/live/LiveGoods.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/live/LiveRoom.php b/app/shop/controller/live/LiveRoom.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/order/Invoice.php b/app/shop/controller/order/Invoice.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/order/Order.php b/app/shop/controller/order/Order.php
old mode 100644
new mode 100755
index 591998dc..2f95b8e7
--- a/app/shop/controller/order/Order.php
+++ b/app/shop/controller/order/Order.php
@@ -112,7 +112,6 @@ class Order extends ShopBase
      */
     public function express()
     {
-
         $id = $this->request->get('id');
         $detail = OrderLogic::getDetail($id);
         $detail['shipping'] = OrderLogic::shippingInfo($detail['id']);
diff --git a/app/shop/controller/printer/Config.php b/app/shop/controller/printer/Config.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/printer/Printer.php b/app/shop/controller/printer/Printer.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/printer/Template.php b/app/shop/controller/printer/Template.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/seckill/SeckillGoods.php b/app/shop/controller/seckill/SeckillGoods.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/setting/CustomerService.php b/app/shop/controller/setting/CustomerService.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/team/Activity.php b/app/shop/controller/team/Activity.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/team/Found.php b/app/shop/controller/team/Found.php
old mode 100644
new mode 100755
diff --git a/app/shop/controller/user/User.php b/app/shop/controller/user/User.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/AdminLogic.php b/app/shop/logic/AdminLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/BankLogic.php b/app/shop/logic/BankLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/CommonLogic.php b/app/shop/logic/CommonLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/FileLogic.php b/app/shop/logic/FileLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/LoginLogic.php b/app/shop/logic/LoginLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/RoleLogic.php b/app/shop/logic/RoleLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/SeckillLogic.php b/app/shop/logic/SeckillLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/StatisticsLogic.php b/app/shop/logic/StatisticsLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/StoreLogic.php b/app/shop/logic/StoreLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/activity_area/AreaLogic.php b/app/shop/logic/activity_area/AreaLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/activity_area/GoodsLogic.php b/app/shop/logic/activity_area/GoodsLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/after_sale/AfterSaleLogic.php b/app/shop/logic/after_sale/AfterSaleLogic.php
old mode 100644
new mode 100755
index 72da69d4..f9a64d75
--- a/app/shop/logic/after_sale/AfterSaleLogic.php
+++ b/app/shop/logic/after_sale/AfterSaleLogic.php
@@ -130,9 +130,9 @@ class AfterSaleLogic extends Logic
         $count = $after_sale
             ->alias('a')
             ->join('order o', 'o.id = a.order_id')
-            ->join('procurement u', 'u.id = a.user_id')
+            ->join('user u', 'u.id = a.user_id')
             ->join('order_goods g', 'g.id = a.order_goods_id')
-            ->with(['order_goods', 'procurement', 'order'])
+            ->with(['order_goods', 'user', 'order'])
             ->where($where)
             ->group('a.id')
             ->count();
@@ -141,13 +141,13 @@ class AfterSaleLogic extends Logic
             ->alias('a')
             ->field($field)
             ->join('order o', 'o.id = a.order_id')
-            ->join('procurement u', 'u.id = a.user_id')
+            ->join('user u', 'u.id = a.user_id')
             ->join('order_goods g', 'g.id = a.order_goods_id')
-            ->with(['order_goods', 'procurement', 'order'])
+            ->with(['order_goods', 'user', 'order'])
             ->where($where)
             ->page($page, $limit)
             ->order('a.id desc')
-            ->append(['procurement.base_avatar', 'order_goods.base_image'])
+            ->append(['user.base_avatar', 'order_goods.base_image'])
             ->group('a.id')
             ->select()->toArray();
         foreach ($lists as &$list) {
@@ -155,7 +155,7 @@ class AfterSaleLogic extends Logic
             $list['order']['order_status'] = OrderModel::getOrderStatus($list['order']['order_status']);
             $list['refund_type'] = AfterSale::getRefundTypeDesc($list['refund_type']);
             $list['status'] = AfterSale::getStatusDesc($list['status']);
-            $list['procurement']['avatar'] = UrlServer::getFileUrl($list['procurement']['avatar']);
+            $list['user']['avatar'] = UrlServer::getFileUrl($list['user']['avatar']);
             foreach ($list['order_goods'] as &$good) {
                 $good['image'] = empty($good['spec_image']) ?
                     UrlServer::getFileUrl($good['image']) : UrlServer::getFileUrl($good['spec_image']);
@@ -179,7 +179,7 @@ class AfterSaleLogic extends Logic
 
         $after_sale = new AfterSale();
         $result = $after_sale
-            ->with(['order_goods', 'procurement', 'order', 'logs'])
+            ->with(['order_goods', 'user', 'order', 'logs'])
             ->where('id', $id)
             ->find()->toArray();
         $result['refund_type_text'] = AfterSale::getRefundTypeDesc($result['refund_type']);
@@ -553,9 +553,9 @@ class AfterSaleLogic extends Logic
                 ->alias('a')
                 ->field($field)
                 ->join('order o', 'o.id = a.order_id')
-                ->join('procurement u', 'u.id = a.user_id')
+                ->join('user u', 'u.id = a.user_id')
                 ->join('order_goods g', 'g.id = a.order_goods_id')
-                ->with(['order_goods', 'procurement', 'order'])
+                ->with(['order_goods', 'user', 'order'])
                 ->where($condition)
                 ->order('a.id desc')
                 ->group('a.id')
diff --git a/app/shop/logic/bargain/BargainLogic.php b/app/shop/logic/bargain/BargainLogic.php
old mode 100644
new mode 100755
index fef2c6a7..7b954ccd
--- a/app/shop/logic/bargain/BargainLogic.php
+++ b/app/shop/logic/bargain/BargainLogic.php
@@ -494,14 +494,14 @@ class BargainLogic extends Logic
         $count = $model->where($where)->count('id');
         $lists = $model->field(true)
             ->where($where)
-            ->with(['procurement.level'])
+            ->with(['user.level'])
             ->order('id', 'desc')
             ->page($get['page'], $get['limit'])
             ->select()->toArray();
 
         foreach ($lists as &$item) {
-            if (!empty($item['procurement']['avatar'])) {
-                $item['procurement']['avatar'] = UrlServer::getFileUrl($item['procurement']['avatar']);
+            if (!empty($item['user']['avatar'])) {
+                $item['user']['avatar'] = UrlServer::getFileUrl($item['user']['avatar']);
             }
 
             $item['launch_start_time'] = date('Y-m-d H:i:s', $item['launch_start_time']);
@@ -530,7 +530,7 @@ class BargainLogic extends Logic
         $model = new BargainLaunch();
         $detail = $model->field(true)
             ->where(['id' => (int)$id])
-            ->with(['procurement.level'])
+            ->with(['user.level'])
             ->find()->toArray();
 
         $detail['domain'] = UrlServer::getFileUrl();
@@ -561,7 +561,7 @@ class BargainLogic extends Logic
         $lists = $model->field(true)
             ->where(['id' => (int)$launch_id])
             ->where('order_id', '>', 0)
-            ->with(['procurement.level', 'order'])
+            ->with(['user.level', 'order'])
             ->page($get['page'], $get['limit'])
             ->select();
 
@@ -591,7 +591,7 @@ class BargainLogic extends Logic
         $count = $model->where(['launch_id' => (int)$launch_id])->count();
         $lists = $model->field(true)
             ->where(['launch_id' => (int)$launch_id])
-            ->with(['procurement.level'])
+            ->with(['user.level'])
             ->page($get['page'], $get['limit'])
             ->select();
 
diff --git a/app/shop/logic/coupon/CouponLogic.php b/app/shop/logic/coupon/CouponLogic.php
old mode 100644
new mode 100755
index f7717c37..b478c536
--- a/app/shop/logic/coupon/CouponLogic.php
+++ b/app/shop/logic/coupon/CouponLogic.php
@@ -261,12 +261,12 @@ class CouponLogic extends Logic{
         }
 
         $log_count = CouponList::alias('cl')
-            ->join('procurement u','cl.user_id = u.id')
+            ->join('user u','cl.user_id = u.id')
             ->where($where)
             ->count();
 
         $log_list = CouponList::alias('cl')
-            ->join('procurement u','cl.user_id = u.id')
+            ->join('user u','cl.user_id = u.id')
             ->where($where)
             ->field('cl.coupon_id,cl.status as cl_status,coupon_code,cl.create_time as cl_create_time,cl.use_time,u.nickname,u.avatar,u.mobile,u.sn,u.level')
             ->page($get['page'], $get['limit'])
diff --git a/app/shop/logic/decoration/IndexLogic.php b/app/shop/logic/decoration/IndexLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/distribution/CenterLogic.php b/app/shop/logic/distribution/CenterLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/distribution/GoodsLogic.php b/app/shop/logic/distribution/GoodsLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/distribution/OrderLogic.php b/app/shop/logic/distribution/OrderLogic.php
old mode 100644
new mode 100755
index 44c7d5ff..35937dcd
--- a/app/shop/logic/distribution/OrderLogic.php
+++ b/app/shop/logic/distribution/OrderLogic.php
@@ -78,7 +78,7 @@ class OrderLogic extends Logic
 
         $lists = DistributionOrderGoods::alias('dog')
             ->leftJoin('order o', 'o.id = dog.order_id')
-            ->leftJoin('procurement u', 'u.id = dog.user_id')
+            ->leftJoin('user u', 'u.id = dog.user_id')
             ->leftJoin('order_goods og', 'og.id = dog.order_goods_id')
             ->leftJoin('distribution_level dl', 'dl.id = dog.level_id')
             ->field($field)
@@ -90,7 +90,7 @@ class OrderLogic extends Logic
 
         $count = DistributionOrderGoods::alias('dog')
             ->leftJoin('order o', 'o.id = dog.order_id')
-            ->leftJoin('procurement u', 'u.id = dog.user_id')
+            ->leftJoin('user u', 'u.id = dog.user_id')
             ->leftJoin('order_goods og', 'og.id = dog.order_goods_id')
             ->leftJoin('distribution_level dl', 'dl.id = dog.level_id')
             ->field($field)
diff --git a/app/shop/logic/distribution/RecordLogic.php b/app/shop/logic/distribution/RecordLogic.php
old mode 100644
new mode 100755
index 4d98c9ac..d9e860f3
--- a/app/shop/logic/distribution/RecordLogic.php
+++ b/app/shop/logic/distribution/RecordLogic.php
@@ -61,7 +61,7 @@ class RecordLogic extends Logic
         }
         $lists = DistributionOrderGoods::alias('dog')
             ->field('dog.money, dog.status as status_desc,dog.create_time as distribution_create_time,u.nickname as user_nickname,u.sn as user_sn,u.mobile as user_mobile,og.total_pay_price,o.order_sn')
-            ->leftJoin('procurement u', 'u.id=dog.user_id')
+            ->leftJoin('user u', 'u.id=dog.user_id')
             ->leftJoin('order_goods og', 'og.id=dog.order_goods_id')
             ->leftJoin('order o', 'o.id=og.order_id')
             ->where($where)
@@ -72,7 +72,7 @@ class RecordLogic extends Logic
 
         $count = DistributionOrderGoods::alias('dog')
             ->field('dog.money, dog.status as status_desc,dog.create_time as distribution_create_time,u.nickname as user_nickname,u.sn as user_sn,u.mobile as user_mobile,og.total_pay_price,o.order_sn')
-            ->leftJoin('procurement u', 'u.id=dog.user_id')
+            ->leftJoin('user u', 'u.id=dog.user_id')
             ->leftJoin('order_goods og', 'og.id=dog.order_goods_id')
             ->leftJoin('order o', 'o.id=og.order_id')
             ->where($where)
diff --git a/app/shop/logic/express_assistant/FaceSheetOrderLogic.php b/app/shop/logic/express_assistant/FaceSheetOrderLogic.php
old mode 100644
new mode 100755
index cc0cc58c..4cfc731e
--- a/app/shop/logic/express_assistant/FaceSheetOrderLogic.php
+++ b/app/shop/logic/express_assistant/FaceSheetOrderLogic.php
@@ -107,7 +107,7 @@ class FaceSheetOrderLogic extends Logic
         $exclude = array_unique($exclude);
         
         $count = Order::where($where)->alias('O')
-            ->join('procurement U', 'U.id = O.user_id')
+            ->join('user U', 'U.id = O.user_id')
             ->join('orderGoods OG', 'OG.order_id = O.id')
             ->leftJoin('team_join TJ', "TJ.order_id = O.id and TJ.status = " . TeamEnum::TEAM_STATUS_SUCCESS)
             ->whereNotIn('O.id', $exclude)
@@ -121,7 +121,7 @@ class FaceSheetOrderLogic extends Logic
             )
             ->where($where)
             ->whereNotIn('O.id', $exclude)
-            ->join('procurement U', 'U.id = O.user_id')
+            ->join('user U', 'U.id = O.user_id')
             ->join('orderGoods OG', 'OG.order_id = O.id')
             ->leftJoin('team_join TJ', "TJ.order_id = O.id and TJ.status = " . TeamEnum::TEAM_STATUS_SUCCESS)
             ->order(['O.id' => 'desc'])
@@ -130,7 +130,7 @@ class FaceSheetOrderLogic extends Logic
 
         foreach ($lists as &$item) {
             $user = User::field('nickname,sn')->where(['id' => $item['user_id']])->find();
-            $item['procurement'] = $user['nickname'];
+            $item['user'] = $user['nickname'];
 
             $item['order_type'] = Order::getOrderType($item['order_type']);
             $item['order_status'] = Order::getOrderStatus($item['order_status']);
diff --git a/app/shop/logic/express_assistant/FaceSheetSenderLogic.php b/app/shop/logic/express_assistant/FaceSheetSenderLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/express_assistant/FaceSheetTplLogic.php b/app/shop/logic/express_assistant/FaceSheetTplLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/finance/SettlementLogic.php b/app/shop/logic/finance/SettlementLogic.php
old mode 100644
new mode 100755
index 946c8ddd..e90c51d4
--- a/app/shop/logic/finance/SettlementLogic.php
+++ b/app/shop/logic/finance/SettlementLogic.php
@@ -223,11 +223,10 @@ class SettlementLogic extends Logic
             $data['afterSalesMoney']   += $order['is_cancel'] ? 0 : $order['refund_amount'];
             $data['distributionMoney'] += $order['distribution_money'];
 
-//            $orderMoney      = $order['order_amount'] - $order['distribution_money'] - ($order['refund_amount'] ?: 0);
-//            $orderMoney      = $orderMoney < 0 ? 0 : $orderMoney;
-//            $tradeServiceFee = $orderMoney * ($tradeServiceRatio / 100); // 本单交易服务费
-            $tradeServiceFee = $order['order_amount']* ($tradeServiceRatio / 100) - $order['distribution_money'];
-            $actualGetMoney  = $order['order_amount'] - $tradeServiceFee - $order['distribution_money'];   // 实际到账金额
+            $orderMoney      = $order['order_amount'] - $order['distribution_money'] - ($order['refund_amount'] ?: 0);
+            $orderMoney      = $orderMoney < 0 ? 0 : $orderMoney;
+            $tradeServiceFee = $orderMoney * ($tradeServiceRatio / 100); // 本单交易服务费
+            $actualGetMoney  = $orderMoney - $tradeServiceFee;   // 实际到账金额
             $entryAmount     = $actualGetMoney;
             $data['entryAccountMoney']    += $actualGetMoney;
             $data['totalTradeServiceFee'] += $tradeServiceFee;
diff --git a/app/shop/logic/finance/ShopLogic.php b/app/shop/logic/finance/ShopLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/finance/WithdrawalLogic.php b/app/shop/logic/finance/WithdrawalLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/free_shipping/FreeShippingLogic.php b/app/shop/logic/free_shipping/FreeShippingLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/goods/CategoryLogic.php b/app/shop/logic/goods/CategoryLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/goods/CommentLogic.php b/app/shop/logic/goods/CommentLogic.php
old mode 100644
new mode 100755
index f4717bd6..12af6563
--- a/app/shop/logic/goods/CommentLogic.php
+++ b/app/shop/logic/goods/CommentLogic.php
@@ -75,7 +75,7 @@ class CommentLogic extends Logic
         $lists = GoodsComment::alias('gc')
             ->with(['goods_comment_image'])
             ->field('gc.id,gc.goods_comment,gc.goods_comment as goods_comment_desc,gc.comment,gc.reply,gc.status,gc.status as status_desc,gc.create_time,u.sn,u.nickname,u.avatar,u.level,g.name as goods_name,g.image as goods_image,gi.image as item_image,gi.spec_value_str')
-            ->leftJoin('procurement u', 'u.id=gc.user_id')
+            ->leftJoin('user u', 'u.id=gc.user_id')
             ->leftJoin('goods g', 'g.id=gc.goods_id')
             ->leftJoin('goods_item gi', 'gi.id=gc.item_id')
             ->where($where)
@@ -86,7 +86,7 @@ class CommentLogic extends Logic
 
         $count = GoodsComment::alias('gc')
             ->field('gc.id,gc.goods_comment,gc.goods_comment as goods_comment_desc,gc.comment,gc.reply,gc.status,gc.status as status_desc,gc.create_time,u.sn,u.nickname,u.avatar,u.level,g.name as goods_name,g.image as goods_image,gi.image as item_image,gi.spec_value_str')
-            ->leftJoin('procurement u', 'u.id=gc.user_id')
+            ->leftJoin('user u', 'u.id=gc.user_id')
             ->leftJoin('goods g', 'g.id=gc.goods_id')
             ->leftJoin('goods_item gi', 'gi.id=gc.item_id')
             ->where($where)
diff --git a/app/shop/logic/goods/GoodsLogic.php b/app/shop/logic/goods/GoodsLogic.php
old mode 100644
new mode 100755
index 9d21d35b..1efa1b8e
--- a/app/shop/logic/goods/GoodsLogic.php
+++ b/app/shop/logic/goods/GoodsLogic.php
@@ -37,6 +37,8 @@ use think\facade\Db;
 use app\common\model\shop\Shop;
 use app\common\server\ExportGoodsExcelServer;
 
+
+
 /**
  * 商品管理-逻辑
  * Class GoodsLogic
@@ -315,11 +317,11 @@ class GoodsLogic extends Logic
             }
             $info['item'][$key]['item_goods_purchase'] = $goodspurchase;
         }
-
+    
         $info['gw'] = $arr;
         $info['pur'] = $arr1;
         $info['ast'] = $ast;
-        $info['contact'] = Goodscontact::where(['goods_id' => $goods_id])->select();
+         $info['contact'] = Goodscontact::where(['goods_id' => $goods_id])->select();
         // 商品规格项
         $info['spec'] = GoodsSpec::where(['goods_id' => $goods_id])->select();
         // 商品规格值
@@ -352,7 +354,7 @@ class GoodsLogic extends Logic
                 $wholesale_price = $post['one_wholesale_pce'];
                 $purchase_price = $post['one_purchase_price'];
                 $issuing_price = $post['one_issuing_price'];
-
+                
             } else {
                 $max_price = max($post['price']);
                 $min_price = min($post['price']);
@@ -364,7 +366,7 @@ class GoodsLogic extends Logic
                 $issuing_price = $post['issuing_price'][0];
             }
             if($purchase_price == ""){
-                $purchase_price = 0;
+             $purchase_price = 0;   
             }
             // 库存校验
             if($post['status'] == GoodsEnum::STATUS_SHELVES && $total_stock == 0) {
@@ -379,7 +381,7 @@ class GoodsLogic extends Logic
             }
             if($goods_msg['purchase_percent'] > 0){
                 if($purchase_price>0&&$purchase_price!=""){
-                    $purchase_price = round((100+$goods_msg['purchase_percent'])*$purchase_price/100,2);
+                       $purchase_price = round((100+$goods_msg['purchase_percent'])*$purchase_price/100,2);
                 }
             }
             if($goods_msg['issuing_percent'] > 0){
@@ -387,24 +389,24 @@ class GoodsLogic extends Logic
             }
             // 格式化数据
             $post = self::formatGoodsData($post);
-            if(isset($post['first_cate_id'])){
-                sort($post['first_cate_id']);
-                $post['first_cate_id'] = implode(',', $post['first_cate_id']);
-            }else{
-                $post['first_cate_id'] = 0;
-            }
-            if(isset($post['second_cate_id'])){
-                sort($post['second_cate_id']);
-                $post['second_cate_id'] = implode(',', $post['second_cate_id']);
-            }else{
-                $post['second_cate_id'] = 0;
-            }
-            if(isset($post['third_cate_id'])){
-                sort($post['third_cate_id']);
-                $post['third_cate_id'] = implode(',', $post['third_cate_id']);
-            }else{
-                $post['third_cate_id'] = 0;
-            }
+        if(isset($post['first_cate_id'])){
+            sort($post['first_cate_id']);
+            $post['first_cate_id'] = implode(',', $post['first_cate_id']);
+        }else{
+            $post['first_cate_id'] = 0;
+        }
+        if(isset($post['second_cate_id'])){
+            sort($post['second_cate_id']);
+            $post['second_cate_id'] = implode(',', $post['second_cate_id']);
+        }else{
+            $post['second_cate_id'] = 0;
+        }
+        if(isset($post['third_cate_id'])){
+            sort($post['third_cate_id']);
+            $post['third_cate_id'] = implode(',', $post['third_cate_id']);
+        }else{
+            $post['third_cate_id'] = 0;
+        }
             //更新主表
             $data = [
                 'name'                      => $post['name'],
@@ -443,7 +445,8 @@ class GoodsLogic extends Logic
                 'wholesale_price'           =>$wholesale_price,
                 'purchase_price'            =>$purchase_price,
                 'issuing_price'             =>$issuing_price,
-                'goods_remark'             =>$post['goods_remark']
+                'goods_remark'             =>$post['goods_remark'],
+             'work_remark'             =>$post['work_remark']
             ];
 
             // 判断是否为未审核通过的商品
@@ -736,7 +739,7 @@ class GoodsLogic extends Logic
                     $spec_lists[$k]['wh_price'] = $v['wholesale_pce'];
                     $spec_lists[$k]['pu_price'] = $v['purchase_price'];
                     $spec_lists[$k]['is_price'] = $v['issuing_price'];
-                    unset($spec_lists[$k]['c_name']);
+                     unset($spec_lists[$k]['c_name']);
                     unset($spec_lists[$k]['c_phone']);
                     $spec_lists[$k]['wholesale_pce'] = $wholesale_pce;
                     $spec_lists[$k]['purchase_price'] = $purchase_price;
@@ -912,26 +915,26 @@ class GoodsLogic extends Logic
 
         // 处理商品数据
         $post = self::formatGoodsData($post);
-        if(isset($post['first_cate_id'])){
-            sort($post['first_cate_id']);
-            $post['first_cate_id'] = implode(',', $post['first_cate_id']);
+         if(isset($post['first_cate_id'])){
+             sort($post['first_cate_id']);
+             $post['first_cate_id'] = implode(',', $post['first_cate_id']);
         }else{
             $post['first_cate_id'] = 0;
         }
-        if(isset($post['second_cate_id'])){
-            sort($post['second_cate_id']);
-            $post['second_cate_id'] = implode(',', $post['second_cate_id']);
+         if(isset($post['second_cate_id'])){
+             sort($post['second_cate_id']);
+             $post['second_cate_id'] = implode(',', $post['second_cate_id']);
         }else{
             $post['second_cate_id'] = 0;
         }
         if(isset($post['third_cate_id'])){
-            sort($post['third_cate_id']);
-            $post['third_cate_id'] = implode(',', $post['third_cate_id']);
+             sort($post['third_cate_id']);
+             $post['third_cate_id'] = implode(',', $post['third_cate_id']);
         }else{
             $post['third_cate_id'] = 0;
         }
-
-
+         
+        
         //写入主表
         $data = [
             'type'                      => $post['type'],
@@ -974,10 +977,11 @@ class GoodsLogic extends Logic
             'wholesale_price'           =>$wholesale_price,
             'purchase_price'            =>$purchase_price,
             'issuing_price'             =>$issuing_price,
-            'goods_remark'             =>$post['goods_remark']
+            'goods_remark'             =>$post['goods_remark'],
+             'work_remark'             =>$post['work_remark']
         ];
         $goods = Goods::create($data);
-        foreach($post['c_name'] as $key=>$value){
+          foreach($post['c_name'] as $key=>$value){
             $d = [
                 'c_name'=>$value,
                 'c_phone'=>$post['c_phone'][$key],
@@ -1206,7 +1210,7 @@ class GoodsLogic extends Logic
     }
 
 
-    /**
+/**
      * @notes 格式化商品数据
      * @param array $data
      * @return array
@@ -1232,9 +1236,7 @@ class GoodsLogic extends Logic
 
         return $data;
     }
-    /**
-     * @notes 导出Excel
-     */
+
     public static function exportData($shop_id) {
         try {
             $where = [
@@ -1283,23 +1285,6 @@ class GoodsLogic extends Logic
             return false;
         }
     }
-
-    /**
-     * @note 抖店上传成功的数据同步到数据表里面
-     */
-    public static function updateDouDianData($goods_id, $data)
-    {
-        Db::startTrans();
-        try {
-            Goods::where(['id' => $goods_id])->update([
-                'doudian_data' => $data
-            ]);
-            Db::commit();
-            return true;
-        } catch (\Exception $e) {
-            Db::rollback();
-            self::$error = $e->getMessage();
-            return false;
-        }
-    }
+    
 }
+
diff --git a/app/shop/logic/goods/SupplierLogic.php b/app/shop/logic/goods/SupplierLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/index/StatLogic.php b/app/shop/logic/index/StatLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/kefu/KefuLangLogic.php b/app/shop/logic/kefu/KefuLangLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/kefu/KefuLogic.php b/app/shop/logic/kefu/KefuLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/live/LiveGoodsLogic.php b/app/shop/logic/live/LiveGoodsLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/live/LiveRoomLogic.php b/app/shop/logic/live/LiveRoomLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/order/InvoiceLogic.php b/app/shop/logic/order/InvoiceLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/order/OrderLogic.php b/app/shop/logic/order/OrderLogic.php
old mode 100644
new mode 100755
index f2951357..57ab3cb8
--- a/app/shop/logic/order/OrderLogic.php
+++ b/app/shop/logic/order/OrderLogic.php
@@ -314,7 +314,7 @@ class OrderLogic extends Logic
             $shipping['create_time_text'] = date('Y-m-d H:i:s', $shipping['create_time']);
         }
         $shipping['traces'] = self::getShipping($order_id);
-
+        
         return $shipping;
     }
 
@@ -330,7 +330,7 @@ class OrderLogic extends Logic
      */
     public static function getShipping($order_id)
     {
-
+        
         $express_data = array();
 
         $orderModel = new Order();
@@ -339,16 +339,16 @@ class OrderLogic extends Logic
             ->join('delivery d', 'd.order_id = o.id')
             ->where(['o.id' => $order_id])
             ->find();
-
+            
         $express = ConfigServer::get('express', 'way');
         $key = ConfigServer::get($express, 'appkey');
         $app = ConfigServer::get($express, 'appsecret');
         if (empty($express) || $order['shipping_status'] != 1 || empty($app) || empty($key)) {
             return $traces[] = ['暂无物流信息'];
         }
-
+        
         $result = Kd100Logic::detail($order_id);
-
+        
         // 如果当前时间大于了api接口限制的时间，则调用api接口
         if (!isset($result) || (time() > $result['sel_time'])) {
             //快递配置设置为快递鸟时
@@ -390,12 +390,12 @@ class OrderLogic extends Logic
                     $item = array_values(array_unique($item));
                 }
             }
-
+         
             $express_data['state'] = $state;
             $express_data['state_text'] = Kd100Logic::$EXPRESS_STATE[$state];
             $express_data['list'] = $traces;
         } else {
-
+            
             $express_data['state'] = $result['state'];
             $express_data['state_text'] = Kd100Logic::$EXPRESS_STATE[$result['state']];
             $express_data['list'] = json_decode($result['data'], true);
@@ -403,10 +403,10 @@ class OrderLogic extends Logic
                 $item = array_values(array_unique($item));
             }
         }
-
+       
         return $express_data;
     }
-
+    
     /**
      * @notes 获取物流
      * @return \think\Collection
diff --git a/app/shop/logic/printer/ConfigLogic.php b/app/shop/logic/printer/ConfigLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/printer/PrinterLogic.php b/app/shop/logic/printer/PrinterLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/printer/TemplateLogic.php b/app/shop/logic/printer/TemplateLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/seckill/SeckillGoodsLogic.php b/app/shop/logic/seckill/SeckillGoodsLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/team/ActivityLogic.php b/app/shop/logic/team/ActivityLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/logic/team/FoundLogic.php b/app/shop/logic/team/FoundLogic.php
old mode 100644
new mode 100755
index 0daa574c..ae1033fc
--- a/app/shop/logic/team/FoundLogic.php
+++ b/app/shop/logic/team/FoundLogic.php
@@ -58,7 +58,7 @@ class FoundLogic extends Logic
 
             $model = new TeamFound();
             $lists = $model->alias('TF')->field(['TF.*,U.nickname'])
-                ->join('procurement U', 'U.id = TF.user_id')
+                ->join('user U', 'U.id = TF.user_id')
                 ->order('id desc')
                 ->where($where)
                 ->paginate([
@@ -114,7 +114,7 @@ class FoundLogic extends Logic
     {
         $teamFound = (new TeamFound())->alias('TF')
             ->field(['TF.*,U.sn,U.nickname,U.mobile'])
-            ->join('procurement U', 'U.id = TF.user_id')
+            ->join('user U', 'U.id = TF.user_id')
             ->findOrEmpty(intval($id))->toArray();
         $teamFound['kaituan_time'] = date('Y-m-d H:i:s', $teamFound['kaituan_time']);
         $teamFound['invalid_time'] = date('Y-m-d H:i:s', $teamFound['invalid_time']);
@@ -135,7 +135,7 @@ class FoundLogic extends Logic
         try {
             $model = new TeamJoin();
             $lists = $model->alias('TJ')->field(['TJ.*,U.sn,U.nickname,U.avatar'])
-                ->join('procurement U', 'U.id = TJ.user_id')
+                ->join('user U', 'U.id = TJ.user_id')
                 ->where('TJ.team_id', '=', $get['found_id'])
                 ->paginate([
                     'page'      => $get['page'] ?? 1,
diff --git a/app/shop/logic/user/UserLogic.php b/app/shop/logic/user/UserLogic.php
old mode 100644
new mode 100755
diff --git a/app/shop/server/AuthServer.php b/app/shop/server/AuthServer.php
old mode 100644
new mode 100755
diff --git a/app/shop/server/MenuServer.php b/app/shop/server/MenuServer.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/AdminPasswordValidate.php b/app/shop/validate/AdminPasswordValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/AdminValidate.php b/app/shop/validate/AdminValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/BankValidate.php b/app/shop/validate/BankValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/BargainValidate.php b/app/shop/validate/BargainValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/LoginValidate.php b/app/shop/validate/LoginValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/RoleValidate.php b/app/shop/validate/RoleValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/SeckillGoodsValidate.php b/app/shop/validate/SeckillGoodsValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/TeamValidate.php b/app/shop/validate/TeamValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/activity_area/ActivityGoodsValidate.php b/app/shop/validate/activity_area/ActivityGoodsValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/activity_area/AreaValidate.php b/app/shop/validate/activity_area/AreaValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/coupon/CouponValidate.php b/app/shop/validate/coupon/CouponValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/express_assistant/FaceSheetOrderValidate.php b/app/shop/validate/express_assistant/FaceSheetOrderValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/goods/GoodsCategoryValidate.php b/app/shop/validate/goods/GoodsCategoryValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/goods/GoodsMoreSpec.php b/app/shop/validate/goods/GoodsMoreSpec.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/goods/GoodsMoreSpecLists.php b/app/shop/validate/goods/GoodsMoreSpecLists.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/goods/GoodsOneSpec.php b/app/shop/validate/goods/GoodsOneSpec.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/goods/GoodsStatusValidate.php b/app/shop/validate/goods/GoodsStatusValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/goods/GoodsValidate.php b/app/shop/validate/goods/GoodsValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/goods/SupplierValidate.php b/app/shop/validate/goods/SupplierValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/kefu/KefuLangValidate.php b/app/shop/validate/kefu/KefuLangValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/kefu/KefuValidate.php b/app/shop/validate/kefu/KefuValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/kefu/LoginValidate.php b/app/shop/validate/kefu/LoginValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/live/LiveGoodsValidate.php b/app/shop/validate/live/LiveGoodsValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/live/LiveRoomValidate.php b/app/shop/validate/live/LiveRoomValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/order/OrderInvoiceValidate.php b/app/shop/validate/order/OrderInvoiceValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/order/OrderPrintValidate.php b/app/shop/validate/order/OrderPrintValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/order/VerificationValidate.php b/app/shop/validate/order/VerificationValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/order/VirtualDeliveryValidate.php b/app/shop/validate/order/VirtualDeliveryValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/printer/ConfigValidate.php b/app/shop/validate/printer/ConfigValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/printer/PrinterValidate.php b/app/shop/validate/printer/PrinterValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/validate/printer/TemplateValidate.php b/app/shop/validate/printer/TemplateValidate.php
old mode 100644
new mode 100755
diff --git a/app/shop/view/activity_area/goods/add.html b/app/shop/view/activity_area/goods/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/activity_area/goods/edit.html b/app/shop/view/activity_area/goods/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/activity_area/goods/lists.html b/app/shop/view/activity_area/goods/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/admin/add.html b/app/shop/view/admin/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/admin/edit.html b/app/shop/view/admin/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/admin/lists.html b/app/shop/view/admin/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/admin/password.html b/app/shop/view/admin/password.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/after_sale/after_sale/detail.html b/app/shop/view/after_sale/after_sale/detail.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/after_sale/after_sale/lists.html b/app/shop/view/after_sale/after_sale/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/bank/add.html b/app/shop/view/bank/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/bank/detail.html b/app/shop/view/bank/detail.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/bank/edit.html b/app/shop/view/bank/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/bank/lists.html b/app/shop/view/bank/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/bargain/activity.html b/app/shop/view/bargain/activity.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/bargain/add.html b/app/shop/view/bargain/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/bargain/bargain_detail.html b/app/shop/view/bargain/bargain_detail.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/bargain/detail.html b/app/shop/view/bargain/detail.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/bargain/edit.html b/app/shop/view/bargain/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/bargain/launch.html b/app/shop/view/bargain/launch.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/bargain/set.html b/app/shop/view/bargain/set.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/common/select_goods.html b/app/shop/view/common/select_goods.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/common/select_goods_two.html b/app/shop/view/common/select_goods_two.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/coupon/coupon/add.html b/app/shop/view/coupon/coupon/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/coupon/coupon/detail.html b/app/shop/view/coupon/coupon/detail.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/coupon/coupon/edit.html b/app/shop/view/coupon/coupon/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/coupon/coupon/lists.html b/app/shop/view/coupon/coupon/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/coupon/coupon/log.html b/app/shop/view/coupon/coupon/log.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/coupon/coupon/send_coupon_list.html b/app/shop/view/coupon/coupon/send_coupon_list.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/decoration/index/set.html b/app/shop/view/decoration/index/set.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/dispatch/dispatch_error.html b/app/shop/view/dispatch/dispatch_error.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/distribution/center/center.html b/app/shop/view/distribution/center/center.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/distribution/center/data.html b/app/shop/view/distribution/center/data.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/distribution/goods/index.html b/app/shop/view/distribution/goods/index.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/distribution/goods/set.html b/app/shop/view/distribution/goods/set.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/distribution/order/index.html b/app/shop/view/distribution/order/index.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/distribution/record/lists.html b/app/shop/view/distribution/record/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/express_assistant/face_sheet_order/lists.html b/app/shop/view/express_assistant/face_sheet_order/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/express_assistant/face_sheet_order/select.html b/app/shop/view/express_assistant/face_sheet_order/select.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/express_assistant/face_sheet_sender/add.html b/app/shop/view/express_assistant/face_sheet_sender/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/express_assistant/face_sheet_sender/edit.html b/app/shop/view/express_assistant/face_sheet_sender/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/express_assistant/face_sheet_sender/lists.html b/app/shop/view/express_assistant/face_sheet_sender/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/express_assistant/face_sheet_setting/setting.html b/app/shop/view/express_assistant/face_sheet_setting/setting.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/express_assistant/face_sheet_tpl/add.html b/app/shop/view/express_assistant/face_sheet_tpl/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/express_assistant/face_sheet_tpl/edit.html b/app/shop/view/express_assistant/face_sheet_tpl/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/express_assistant/face_sheet_tpl/lists.html b/app/shop/view/express_assistant/face_sheet_tpl/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/file/addCate.html b/app/shop/view/file/addCate.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/file/editCate.html b/app/shop/view/file/editCate.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/file/lists.html b/app/shop/view/file/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/file/move.html b/app/shop/view/file/move.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/file/video_list.html b/app/shop/view/file/video_list.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/finance/settlement/detail.html b/app/shop/view/finance/settlement/detail.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/finance/settlement/lists.html b/app/shop/view/finance/settlement/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/finance/shop/account.html b/app/shop/view/finance/shop/account.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/finance/withdrawal/add.html b/app/shop/view/finance/withdrawal/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/finance/withdrawal/detail.html b/app/shop/view/finance/withdrawal/detail.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/finance/withdrawal/lists.html b/app/shop/view/finance/withdrawal/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/free_shipping/free_shipping/index.html b/app/shop/view/free_shipping/free_shipping/index.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/freight/add.html b/app/shop/view/freight/add.html
old mode 100644
new mode 100755
index 4e2d4281..533c0fa0
--- a/app/shop/view/freight/add.html
+++ b/app/shop/view/freight/add.html
@@ -49,15 +49,15 @@
                 </thead>
                 <tbody >
                     <!--全国-->
-                    <tr class='area_all'>
-                        <td><span class='all_area_name'>全国</span></td>
-                        <input type='hidden' class='region' name='region[]' value='all'>
-                        <td><input type='number' name='first_unit[]' lay-verify='required' autocomplete='off' class='layui-input '></td>
-                        <td><input type='number' name='first_money[]' lay-verify='required' autocomplete='off' class='layui-input '></td>
-                        <td><input type='number' name='continue_unit[]' lay-verify='required' autocomplete='off' class='layui-input '></td>
-                        <td><input type='number' name='continue_money[]' lay-verify='required' autocomplete='off' class='layui-input '></td>
-                        <td></td>
-                    </tr>
+                    <!--<tr class='area_all'>-->
+                    <!--    <td><span class='all_area_name'>全国</span></td>-->
+                    <!--    <input type='hidden' class='region' name='region[]' value='all'>-->
+                    <!--    <td><input type='number' name='first_unit[]' lay-verify='required' autocomplete='off' class='layui-input '></td>-->
+                    <!--    <td><input type='number' name='first_money[]' lay-verify='required' autocomplete='off' class='layui-input '></td>-->
+                    <!--    <td><input type='number' name='continue_unit[]' lay-verify='required' autocomplete='off' class='layui-input '></td>-->
+                    <!--    <td><input type='number' name='continue_money[]' lay-verify='required' autocomplete='off' class='layui-input '></td>-->
+                    <!--    <td></td>-->
+                    <!--</tr>-->
                     <tr class="area_tbody"></tr>
 
 
diff --git a/app/shop/view/freight/area.html b/app/shop/view/freight/area.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/freight/area_edit.html b/app/shop/view/freight/area_edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/freight/detail.html b/app/shop/view/freight/detail.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/freight/edit.html b/app/shop/view/freight/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/freight/index.html b/app/shop/view/freight/index.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/freight/lists.html b/app/shop/view/freight/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/freight/set.html b/app/shop/view/freight/set.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/goods/category/add.html b/app/shop/view/goods/category/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/goods/category/edit.html b/app/shop/view/goods/category/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/goods/category/lists.html b/app/shop/view/goods/category/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/goods/comment/lists.html b/app/shop/view/goods/comment/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/goods/goods/add.html b/app/shop/view/goods/goods/add.html
old mode 100644
new mode 100755
index 940a2120..2a074105
--- a/app/shop/view/goods/goods/add.html
+++ b/app/shop/view/goods/goods/add.html
@@ -53,7 +53,7 @@
         //---------------------------------------平台分类联动 begin ----------------------------------
         var categorys = {$category_lists | raw};
         setSelectFirst();
-
+        
         function setSelectFirst(default_id) {
             var category_select_html = '<option value="">请选择分类</option>';
             for (var i in categorys) {
@@ -187,37 +187,43 @@
             $(this).find('.goods-spec-img-del-x').show();
         });
         $(document).on('mouseleave', '.goods-spec-img-div', function () {
-            $(this).find('.goods-spec-img-del-x').hide();
+            $(this).find('.goods-spec-img-del-x').show();
+            // $(this).find('.goods-spec-img-del-x').hide();
         });
         form.on('checkbox(first)', function (data) {
-            var second_category = "";
-            for (var i in categorys) {
-                if (categorys[i]['pid'] == data.value) {
-                    if($(this).is(':checked')){
-                        second_category +="<div id='second_" + categorys[i]['id'] + "'><input type='checkbox'  name='second_cate_id' value='" + categorys[i]['id'] + "' lay-skin='primary' lay-filter='second' title='" + categorys[i]['name'] + "'></div>";
-                    }else{
-                        $('#second_'+categorys[i]['id']).remove();
+             var second_category = "";
+                for (var i in categorys) {
+                    if (categorys[i]['pid'] == data.value) {
+                        if($(this).is(':checked')){
+                            second_category +="<div id='second_" + categorys[i]['id'] + "'><input type='checkbox'  name='second_cate_id[]' value='" + categorys[i]['id'] + "' lay-skin='primary' lay-filter='second' title='" + categorys[i]['name'] + "'></div>";
+                        }else{
+                            for(var j in categorys){
+                                if (categorys[i]['id'] == categorys[j]['pid']) {
+                                    $('#third_'+categorys[j]['id']).remove();
+                                }
+                            }
+                           $('#second_'+categorys[i]['id']).remove();
+                        }
                     }
-                }
             }
             $('.second_cate').append(second_category);
-            form.render('checkbox');
+          form.render('checkbox');
         });
-        form.on('checkbox(second)', function (data) {
-            var third_category = "";
-            for (var i in categorys) {
-                if (categorys[i]['pid'] == data.value) {
-                    if($(this).is(':checked')){
-                        third_category +="<div id='third_" + categorys[i]['id'] + "'><input type='checkbox'  name='third_cate_id' value='" + categorys[i]['id'] + "' lay-skin='primary' lay-filter='third' title='" + categorys[i]['name'] + "'></div>";
-                    }else{
-                        $('#third_'+categorys[i]['id']).remove();
-                    }
+         form.on('checkbox(second)', function (data) {
+                 var third_category = "";
+                    for (var i in categorys) {
+                        if (categorys[i]['pid'] == data.value) {
+                            if($(this).is(':checked')){
+                                third_category +="<div id='third_" + categorys[i]['id'] + "'><input type='checkbox'  name='third_cate_id[]' value='" + categorys[i]['id'] + "' lay-skin='primary' lay-filter='third' title='" + categorys[i]['name'] + "'></div>";
+                            }else{
+                               $('#third_'+categorys[i]['id']).remove();
+                            }
+                        }
+                  
                 }
-
-            }
-            $('.third_cate').append(third_category);
-            form.render('checkbox');
-        });
+                 $('.third_cate').append(third_category);
+              form.render('checkbox');
+            });
         $(document).on('click', '.goods-spec-img-del-x', function () {
             var key = 'spec_image[]' + $(this).parent().parent().parent().attr('spec-value-temp-ids');
             $(this).parent().html('<div class="like-upload-image goods-spec-img-div">' +
@@ -786,7 +792,8 @@
         $('textarea[name="delivery_content"]').val(goods_info['base']['delivery_content']);
         // 配送方式
         renderDeliveryType(goods_info['base']['delivery_type'], goods_info['base']['type']);
-        $('textarea[name="goods_remark"]').val(goods_info['base']['goods_remark']);
+$('textarea[name="goods_remark"]').val(goods_info['base']['goods_remark']);
+$('input[name="work_remark"]').val(goods_info['base']['work_remark']);
         $('input[name="goods_id"]').val(goods_info['base']['id']);
         $('input[name="name"]').val(goods_info['base']['name']);
         $('input[name="code"]').val(goods_info['base']['code']);
@@ -854,15 +861,15 @@
         $("input[name=spec_type][value="+goods_info['base']['spec_type']+"]").prop('checked',"true");
 
         $('input[name="stock_warn"]').val(goods_info['base']['stock_warn']);
-        let d=0;
+         let d=0;
         $('input[name="c_name[]"]').each(function(index,element){
             if(goods_info['contact'].length > 0){
                 $(this).val(goods_info['contact'][d]['c_name']);
-                $(this).next().val(goods_info['contact'][d]['c_phone']);
+                  $(this).next().val(goods_info['contact'][d]['c_phone']);
                 d++;
             }
         });
-
+      
         $("input[name=is_show_stock][value="+goods_info['base']['is_show_stock']+"]").prop("checked",true);  //是否显示库存
         $("input[name=express_type][value="+goods_info['base']['express_type']+"]").prop("checked",true);
         $('input[name="express_money"]').val(goods_info['base']['express_money']);
diff --git a/app/shop/view/goods/goods/goods_base.html b/app/shop/view/goods/goods/goods_base.html
old mode 100644
new mode 100755
index fa967406..52ad2d8b
--- a/app/shop/view/goods/goods/goods_base.html
+++ b/app/shop/view/goods/goods/goods_base.html
@@ -34,8 +34,8 @@
             <!--平台分类-->
             <div class="layui-form-item">
                 <label class="layui-form-label"><span class="form-label-asterisk">*</span>平台分类：</label>
-                <div class="layui-input-block">
-                    <?php foreach($category_lists_new as $key=>$value){ ?>
+                   <div class="layui-input-block">
+                        <?php foreach($category_lists_new as $key=>$value){ ?>
                         <?php if($value['pid'] == 0){ ?>
                             <?php if($category_first!=""){ ?>
                                 <?php foreach($category_first as $k=>$v){ ?>
@@ -50,35 +50,35 @@
                             <?php } ?>
                          <?php } ?>
                     <?php } ?>
-                </div>
+                    </div>
                 <div class="layui-input-block second_cate">
-                    <?php foreach($category_lists_new as $key=>$value){ ?>
-                    <?php if(!empty($second_pid)){foreach($second_pid as $k1=>$v1){ ?>
-                    <?php if($value['pid'] == $v1){ ?>
-                    <div id="second_<?php echo $value['id'] ?>">
-                        <input type="checkbox"  <?php if($category_second!=""){foreach($category_second as $k=>$v){if($v == $value['id']){ ?>checked<?php }}} ?>  name="second_cate_id[]" value="<?php echo $value['id'] ?>" lay-skin="primary" lay-filter="second" title="<?php echo $value['name']; ?>">
+                       <?php foreach($category_lists_new as $key=>$value){ ?>
+                        <?php if(!empty($second_pid)){foreach($second_pid as $k1=>$v1){ ?>
+                            <?php if($value['pid'] == $v1){ ?>
+                                <div id="second_<?php echo $value['id'] ?>">
+                                     <input type="checkbox"  <?php if($category_second!=""){foreach($category_second as $k=>$v){if($v == $value['id']){ ?>checked<?php }}} ?>  name="second_cate_id[]" value="<?php echo $value['id'] ?>" lay-skin="primary" lay-filter="second" title="<?php echo $value['name']; ?>">
+                                </div>
+                            <?php } ?>
+                       <?php }} ?>
+                    <?php } ?>
                     </div>
-                        <?php } ?>
+                    <div class="layui-input-block third_cate">
+                      <?php foreach($category_lists_new as $key=>$value){ ?>
+                        <?php if(!empty($third_pid)>0){foreach($third_pid as $k1=>$v1){ ?>
+                            <?php if($value['pid'] == $v1){ ?>
+                                    <div id="third_<?php echo $value['id'] ?>">
+                                        <input type="checkbox"  <?php if($category_third!=""){ foreach($category_third as $k=>$v){if($v == $value['id']){ ?>checked <?php }}} ?>  name="third_cate_id[]" value="<?php echo $value['id'] ?>" lay-skin="primary" lay-filter="third" title="<?php echo $value['name']; ?>">
+                                    </div>
+                            <?php } ?>  
                         <?php }} ?>
-                        <?php } ?>
-                </div>
-                <div class="layui-input-block third_cate">
-                    <?php foreach($category_lists_new as $key=>$value){ ?>
-                    <?php if(!empty($third_pid)>0){foreach($third_pid as $k1=>$v1){ ?>
-                    <?php if($value['pid'] == $v1){ ?>
-                    <div id="third_<?php echo $value['id'] ?>">
-                        <input type="checkbox"  <?php if($category_third!=""){ foreach($category_third as $k=>$v){if($v == $value['id']){ ?>checked <?php }}} ?>  name="third_cate_id[]" value="<?php echo $value['id'] ?>" lay-skin="primary" lay-filter="third" title="<?php echo $value['name']; ?>">
+                    <?php } ?>
                     </div>
-                    <?php } ?>
-                    <?php }} ?>
-                    <?php } ?>
-                </div>
                 <!--<div class="layui-input-inline">-->
-
-                <!--<select name="first_cate_id" lay-filter="first_category" lay-verify="custom_required"-->
-                <!--        lay-verType="tips" switch-tab="0" verify-msg="请选择分类">-->
-                <!--    <option value="">请选择分类</option>-->
-                <!--</select>-->
+                   
+                    <!--<select name="first_cate_id" lay-filter="first_category" lay-verify="custom_required"-->
+                    <!--        lay-verType="tips" switch-tab="0" verify-msg="请选择分类">-->
+                    <!--    <option value="">请选择分类</option>-->
+                    <!--</select>-->
                 <!--</div>-->
                 <!--<div class="layui-input-inline">-->
                 <!--    <select name="second_cate_id" lay-filter="second_category" switch-tab="0" verify-msg="请选择分类">-->
@@ -103,15 +103,22 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">商品卖点：</label>
                 <div class="layui-input-block">
-                    <input type="text" maxlength="60" name="remark"  autocomplete="off" class="layui-input">
+                    <input type="text"  name="remark"  autocomplete="off" class="layui-input">
                 </div>
             </div>
-            <!--商品备注-->
+             <!--工作人员备注-->
+            <div class="layui-form-item">
+                <label class="layui-form-label">工作人员备注：</label>
+                <div class="layui-input-block">
+                    <input type="text" maxlength="60" name="work_remark"  autocomplete="off" class="layui-input">
+                </div>
+            </div>
+              <!--商品备注-->
             <div class="layui-form-item">
                 <label class="layui-form-label">商品备注：</label>
                 <div class="layui-input-block">
                     <textarea name="goods_remark" style="width: 763px; height: 294px;" class="layui-input">
-
+                        
                     </textarea>
                     <!--<input type="text" maxlength="60" name="goods_remark"  autocomplete="off" class="layui-input">-->
                 </div>
@@ -149,7 +156,7 @@
                 <div class="layui-input-block" id="imageContainer">
                     <div class="like-upload-image">
                         <div class="upload-image-elem"><a class="add-upload-image" id="image"> + 添加图片</a></div>
-                    </div>
+                      </div>
                 </div>
             </div>
             <div class="layui-form-item">
@@ -175,7 +182,7 @@
                 <div class="layui-input-block" id="goodsImageContainer">
                     <div class="like-upload-image">
                         <div class="upload-image-elem"><a class="add-upload-image" id="goodsimage"> + 添加图片</a></div>
-                    </div>
+                      </div>
                 </div>
             </div>
             <div class="layui-form-item">
@@ -188,7 +195,7 @@
                 <div class="layui-input-block" id="videoContainer">
                     <div class="like-upload-video">
                         <div class="upload-image-elem"><a class="add-upload-video" id="video"> + 添加视频</a></div>
-                    </div>
+                      </div>
                 </div>
             </div>
             <div class="layui-form-item">
diff --git a/app/shop/view/goods/goods/goods_content.html b/app/shop/view/goods/goods/goods_content.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/goods/goods/goods_distribution.html b/app/shop/view/goods/goods/goods_distribution.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/goods/goods/goods_sale_setting.html b/app/shop/view/goods/goods/goods_sale_setting.html
old mode 100644
new mode 100755
index e52489c2..3d009eb8
--- a/app/shop/view/goods/goods/goods_sale_setting.html
+++ b/app/shop/view/goods/goods/goods_sale_setting.html
@@ -22,7 +22,7 @@
         <label class="layui-form-label"></label>
         <span style="color: #a3a3a3;font-size: 9px">商品详情显示剩余库存数量</span>
     </div>
-    <!-- 通知 -->
+   <!-- 通知 -->
     <div class="layui-form-item">
         <label class="layui-form-label">通知发货人：</label>
         <div class="layui-input-inline">
diff --git a/app/shop/view/goods/goods/goods_spec.html b/app/shop/view/goods/goods/goods_spec.html
old mode 100644
new mode 100755
index 316b2bd4..fdc15de6
--- a/app/shop/view/goods/goods/goods_spec.html
+++ b/app/shop/view/goods/goods/goods_spec.html
@@ -84,11 +84,11 @@
                                        lay-verType="tips"
                                        autocomplete="off" switch-tab="1" verify-msg="请输入集采价"
                                        name="one_purchase_price">
-                                <input type="text" class="layui-input" style="width:50%;float:left" name="one_purchase_content[]" placeholder="集采规格">
+                                <input type="text" class="layui-input" style="width:50%;float:left" name="one_purchase_content[]" placeholder="数量">
                                 <input type="text" class="layui-input" style="width:50%;float:left" name="one_purchase_child_price[]" placeholder="价格">
-                                <input type="text" class="layui-input" style="width:50%;float:left" name="one_purchase_content[]" placeholder="集采规格">
+                                <input type="text" class="layui-input" style="width:50%;float:left" name="one_purchase_content[]" placeholder="数量">
                                 <input type="text" class="layui-input" style="width:50%;float:left" name="one_purchase_child_price[]" placeholder="价格">
-                                <input type="text" class="layui-input" style="width:50%;float:left" name="one_purchase_content[]" placeholder="集采规格">
+                                <input type="text" class="layui-input" style="width:50%;float:left" name="one_purchase_content[]" placeholder="数量">
                                 <input type="text" class="layui-input" style="width:50%;float:left" name="one_purchase_child_price[]" placeholder="价格">
                             </td>
                             <td><input type="number" class="layui-input"
@@ -226,11 +226,11 @@
     </td>
     <td><input type="number" class="layui-input"  lay-verType="tips"
                autocomplete="off" switch-tab="1" verify-msg="请输入集采价" name="purchase_price[]">
-        <input type="text" class="layui-input" style="width:50%;float:left" name="purchase_content[]" placeholder="集采规格">
+        <input type="text" class="layui-input" style="width:50%;float:left" name="purchase_content[]" placeholder="数量">
         <input type="text" class="layui-input" style="width:50%;float:left" name="purchase_child_price[]" placeholder="价格">
-        <input type="text" class="layui-input" style="width:50%;float:left" name="purchase_content[]" placeholder="集采规格">
+        <input type="text" class="layui-input" style="width:50%;float:left" name="purchase_content[]" placeholder="数量">
         <input type="text" class="layui-input" style="width:50%;float:left" name="purchase_child_price[]" placeholder="价格">
-        <input type="text" class="layui-input" style="width:50%;float:left" name="purchase_content[]" placeholder="集采规格">
+        <input type="text" class="layui-input" style="width:50%;float:left" name="purchase_content[]" placeholder="数量">
         <input type="text" class="layui-input" style="width:50%;float:left" name="purchase_child_price[]" placeholder="价格">
     </td>
     <td><input type="number" class="layui-input"  lay-verType="tips"
diff --git a/app/shop/view/goods/goods/lists.html b/app/shop/view/goods/goods/lists.html
old mode 100644
new mode 100755
index 4e6e6e6f..893fbce3
--- a/app/shop/view/goods/goods/lists.html
+++ b/app/shop/view/goods/goods/lists.html
@@ -23,6 +23,7 @@
         <!--搜索条件-->
         <div class="layui-card-body layui-form">
             <div class="layui-form-item">
+                   
                 <div class="layui-inline">
                     <label class="layui-form-label">商品名称：</label>
                     <div class="layui-input-inline">
@@ -66,6 +67,7 @@
                     <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="search">查询</button>
                     <button class="layui-btn layui-btn-sm layui-btn-primary" lay-submit lay-filter="clear-search">重置</button>
                     <button class="layui-btn layui-btn-sm layuiadmin-btn-ad layui-btn-primary " lay-submit lay-filter="data-export">导出</button>
+
                 </div>
             </div>
         </div>
@@ -90,14 +92,14 @@
 
                 <table id="goods-lists" lay-filter="goods-lists"></table>
                 <script type="text/html" id="id">
-                    {{d.id}}
+                     {{d.id}}
                 </script>
                 <script type="text/html" id="goods-info">
                     <img src="{{d.image}}" style="height:60px;width: 60px;margin-right: 5px;" class="image-show"> {{d.name}}
                 </script>
 
                 <script type="text/html" id="price-info">
-                    {{d.min_price}} ~ {{d.max_price}}
+                   {{d.min_price}} ~ {{d.max_price}}
                 </script>
 
                 <script type="text/html" id="ratio">
@@ -107,11 +109,6 @@
                 </script>
 
                 <script type="text/html" id="goods-operation">
-                    {if condition="$shop_id eq 4"}
-                        {{# if( d.del != 2 ){ }}
-                        <a class="layui-btn layui-btn-normal layui-btn-sm" lay-event="sync_doudian">同步抖店</a>
-                        {{# } }}
-                    {/if}
                     {{# if( d.del != 2 ){ }}
                     <a class="layui-btn layui-btn-normal layui-btn-sm" lay-event="edit">编辑</a>
                     {{# } }}
@@ -137,13 +134,7 @@
 </div>
 
 <script>
-    layui.config({
-        base: "/static/admin/js/layui_exts/",
-    }).extend({
-        excel: 'excel',
-    });
-
-    layui.use(['table', 'form', 'element', 'excel'], function(){
+    layui.use(['table', 'form', 'element'], function(){
         var $ = layui.$
             ,form = layui.form
             ,table = layui.table
@@ -186,7 +177,6 @@
                 }
             });
         });
-
         //事件
         var active = {
             add: function(){
@@ -279,32 +269,6 @@
         table.on('tool(goods-lists)', function(obj){
             var id = obj.data.id;
             var name = obj.data.name;
-
-            //商品同步到抖店
-            if (obj.event === 'sync_doudian') {
-                layer.confirm('是否同步到抖店', function(){
-                    like.ajax({
-                        url:'{:url("goods.goods/syncDouDian")}',
-                        data:{id:id},
-                        type:'post',
-                        dataType:'json',
-                        success:function (res) {
-                            if(res.code == 1) {
-                                console.log(res)
-                                layui.layer.msg(res.msg, {
-                                    offset: '15px'
-                                    , icon: 1
-                                    , time: 2000
-                                }, function () {
-                                    // updateTabNumber();
-                                    // table.reload('goods-lists');
-                                });
-                            }
-                        }
-                    })
-                })
-            }
-
             //上下架
             if(obj.event === 'status'){
                 var tips = '确定上架当前商品：'+'<span style="color: red">'+name+'</span>';
@@ -400,16 +364,16 @@
                         submit.trigger('click');
                     }
                     ,cancel: function(index, layero){
-                        var window_index = index;
-                        layer.confirm('商品未保存，确定关闭吗？', {
-                            time: 0, //不自动关闭
-                            btn: ['确定', '取消'],
-                            yes: function(index){
-                                layer.close(index);
-                                layer.close(window_index);
-                            }
-                        });
-                        return false;
+                    var window_index = index;
+                    layer.confirm('商品未保存，确定关闭吗？', {
+                        time: 0, //不自动关闭
+                        btn: ['确定', '取消'],
+                        yes: function(index){
+                            layer.close(index);
+                            layer.close(window_index);
+                        }
+                    });
+                    return false;
                     }
                 });
             }
@@ -471,7 +435,7 @@
         function getList(type) {
             like.tableLists('#goods-lists', '{:url("goods.goods/lists")}?type='+type, [
                 {type:'checkbox'}
-                ,{title: '商品id',width:250, templet: '#id'}
+                ,{title: '商品id',width:100, templet: '#id'}
                 ,{title: '商品信息',width:250, templet: '#goods-info'}
                 ,{field: 'price',title: '价格区间(元)', width: 200, align: 'center'}
                 ,{field: 'stock',width: 100,title: '总库存', align: 'center'}
@@ -481,7 +445,7 @@
                 ,{field: 'audit_remark', width: 180, title: '审核说明', align: 'center'}
                 ,{field: 'sort',width: 80, title:'排序', align: 'center'}
                 ,{field: 'create_time',width:160, title:'发布日期', align: 'center'}
-                ,{fixed: 'right', title: '操作', width:350, align: 'center', toolbar: '#goods-operation'}
+                ,{fixed: 'right', title: '操作', width:250, align: 'center', toolbar: '#goods-operation'}
             ]);
             // if(type == 6) { // 审核未通过,显示审核说明列(注意计时器时间控制，先让动态表格渲染完成，再去移除layui-hide)
             //     setTimeout(function() {
diff --git a/app/shop/view/goods/supplier/add.html b/app/shop/view/goods/supplier/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/goods/supplier/edit.html b/app/shop/view/goods/supplier/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/goods/supplier/lists.html b/app/shop/view/goods/supplier/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/index/index.html b/app/shop/view/index/index.html
old mode 100644
new mode 100755
index a10aab9c..fe8c7d30
--- a/app/shop/view/index/index.html
+++ b/app/shop/view/index/index.html
@@ -36,7 +36,7 @@
                     <cite>{$admin_name}（{$shop_name}）</cite>
                 <span class="layui-nav-more"></span></a>
                 <dl class="layui-nav-child layui-anim layui-anim-upbit userinfo">
-<!--                    <dd><a lay-id="u-1" href="javascript:" data-url="pages/member/procurement.html">个人中心<span class="layui-badge-dot"></span></a></dd>-->
+<!--                    <dd><a lay-id="u-1" href="javascript:" data-url="pages/member/user.html">个人中心<span class="layui-badge-dot"></span></a></dd>-->
 <!--                    <dd><hr></dd>-->
                     <dd><a href="{:url('login/logout')}" id="logout">退出登录</a></dd>
                 </dl>
diff --git a/app/shop/view/index/stat.html b/app/shop/view/index/stat.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/kefu/kefu/add.html b/app/shop/view/kefu/kefu/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/kefu/kefu/admin_lists.html b/app/shop/view/kefu/kefu/admin_lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/kefu/kefu/edit.html b/app/shop/view/kefu/kefu/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/kefu/kefu/lists.html b/app/shop/view/kefu/kefu/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/kefu/kefu_lang/add.html b/app/shop/view/kefu/kefu_lang/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/kefu/kefu_lang/edit.html b/app/shop/view/kefu/kefu_lang/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/kefu/kefu_lang/lists.html b/app/shop/view/kefu/kefu_lang/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/layout1.html b/app/shop/view/layout1.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/layout2.html b/app/shop/view/layout2.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/live/live_goods/add.html b/app/shop/view/live/live_goods/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/live/live_goods/detail.html b/app/shop/view/live/live_goods/detail.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/live/live_goods/lists.html b/app/shop/view/live/live_goods/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/live/live_room/add.html b/app/shop/view/live/live_room/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/live/live_room/edit.html b/app/shop/view/live/live_room/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/live/live_room/lists.html b/app/shop/view/live/live_room/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/live/live_room/select_goods.html b/app/shop/view/live/live_room/select_goods.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/login/login.html b/app/shop/view/login/login.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/order/invoice/detail.html b/app/shop/view/order/invoice/detail.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/order/invoice/lists.html b/app/shop/view/order/invoice/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/order/order/change_address.html b/app/shop/view/order/order/change_address.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/order/order/delivery.html b/app/shop/view/order/order/delivery.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/order/order/detail.html b/app/shop/view/order/order/detail.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/order/order/express.html b/app/shop/view/order/order/express.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/order/order/lists.html b/app/shop/view/order/order/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/printer/config/edit.html b/app/shop/view/printer/config/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/printer/config/lists.html b/app/shop/view/printer/config/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/printer/printer/add.html b/app/shop/view/printer/printer/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/printer/printer/edit.html b/app/shop/view/printer/printer/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/printer/printer/lists.html b/app/shop/view/printer/printer/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/printer/template/edit.html b/app/shop/view/printer/template/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/role/add.html b/app/shop/view/role/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/role/edit.html b/app/shop/view/role/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/role/lists.html b/app/shop/view/role/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/seckill/seckill_goods/add_goods.html b/app/shop/view/seckill/seckill_goods/add_goods.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/seckill/seckill_goods/edit_goods.html b/app/shop/view/seckill/seckill_goods/edit_goods.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/seckill/seckill_goods/lists.html b/app/shop/view/seckill/seckill_goods/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/setting/customer_service/index.html b/app/shop/view/setting/customer_service/index.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/statistics/goods.html b/app/shop/view/statistics/goods.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/statistics/trading.html b/app/shop/view/statistics/trading.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/statistics/visit.html b/app/shop/view/statistics/visit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/store/index.html b/app/shop/view/store/index.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/team/activity/add.html b/app/shop/view/team/activity/add.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/team/activity/detail.html b/app/shop/view/team/activity/detail.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/team/activity/edit.html b/app/shop/view/team/activity/edit.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/team/activity/lists.html b/app/shop/view/team/activity/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/team/activity/select.html b/app/shop/view/team/activity/select.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/team/found/detail.html b/app/shop/view/team/found/detail.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/team/found/lists.html b/app/shop/view/team/found/lists.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/user/user/info.html b/app/shop/view/user/user/info.html
old mode 100644
new mode 100755
diff --git a/app/shop/view/user/user/lists.html b/app/shop/view/user/user/lists.html
old mode 100644
new mode 100755
diff --git a/app/shopapi/config/route.php b/app/shopapi/config/route.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/controller/Account.php b/app/shopapi/controller/Account.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/controller/Config.php b/app/shopapi/controller/Config.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/controller/Goods.php b/app/shopapi/controller/Goods.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/controller/Index.php b/app/shopapi/controller/Index.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/controller/Order.php b/app/shopapi/controller/Order.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/controller/Shop.php b/app/shopapi/controller/Shop.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/controller/Statistics.php b/app/shopapi/controller/Statistics.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/controller/Test.php b/app/shopapi/controller/Test.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/controller/Verification.php b/app/shopapi/controller/Verification.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/http/middleware/Login.php b/app/shopapi/http/middleware/Login.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/logic/GoodsLogic.php b/app/shopapi/logic/GoodsLogic.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/logic/IndexLogic.php b/app/shopapi/logic/IndexLogic.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/logic/LoginLogic.php b/app/shopapi/logic/LoginLogic.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/logic/OrderLogic.php b/app/shopapi/logic/OrderLogic.php
old mode 100644
new mode 100755
index 22042601..1dd7b87c
--- a/app/shopapi/logic/OrderLogic.php
+++ b/app/shopapi/logic/OrderLogic.php
@@ -138,7 +138,7 @@ class OrderLogic extends Logic
     {
         $result = Order::where('id',$id)
             ->field('id,user_id,order_sn,order_type,order_source,order_status,pay_status,pay_time,shipping_status,pay_way,order_amount,goods_price,shipping_price,discount_amount,member_amount,create_time,consignee,mobile,province,city,district,address,user_remark,delivery_type,delivery_content')
-            ->with(['order_goods','procurement', 'invoice'])
+            ->with(['order_goods','user', 'invoice'])
             ->append(['shop_cancel_btn','edit_address_btn','to_ship_btn','take_btn','delivery_btn','del_btn','order_status_text','pay_way_text','delivery_address','order_type_text','order_source_text','pay_status_text'])
             ->find()
             ->toArray();
diff --git a/app/shopapi/logic/ShopLogic.php b/app/shopapi/logic/ShopLogic.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/logic/StatisticsLogic.php b/app/shopapi/logic/StatisticsLogic.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/logic/VerificationLogic.php b/app/shopapi/logic/VerificationLogic.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/server/UserServer.php b/app/shopapi/server/UserServer.php
old mode 100644
new mode 100755
index cdc20978..b7cea4d9
--- a/app/shopapi/server/UserServer.php
+++ b/app/shopapi/server/UserServer.php
@@ -68,9 +68,9 @@ class UserServer
             } else {
                 if ($config['default'] == 'local') {
                     $file_name = md5($openid . $time) . '.jpeg';
-                    $avatar = download_file($avatar_url, 'uploads/procurement/avatar/', $file_name);
+                    $avatar = download_file($avatar_url, 'uploads/user/avatar/', $file_name);
                 } else {
-                    $avatar = 'uploads/procurement/avatar/' . md5($openid . $time) . '.jpeg';
+                    $avatar = 'uploads/user/avatar/' . md5($openid . $time) . '.jpeg';
                     $StorageDriver = new StorageDriver($config);
                     if (!$StorageDriver->fetch($avatar_url, $avatar)) {
                         throw new Exception( '头像保存失败:'. $StorageDriver->getError());
@@ -187,9 +187,9 @@ class UserServer
                 $avatar = '';     //头像路径
                 if ($config['default'] == 'local') {
                     $file_name = md5($openid . $time) . '.jpeg';
-                    $avatar = download_file($avatar_url, 'uploads/procurement/avatar/', $file_name);
+                    $avatar = download_file($avatar_url, 'uploads/user/avatar/', $file_name);
                 } else {
-                    $avatar = 'uploads/procurement/avatar/' . md5($openid . $time) . '.jpeg';
+                    $avatar = 'uploads/user/avatar/' . md5($openid . $time) . '.jpeg';
                     $StorageDriver = new StorageDriver($config);
                     if (!$StorageDriver->fetch($avatar_url, $avatar)) {
                         throw new Exception( '头像保存失败:'. $StorageDriver->getError());
diff --git a/app/shopapi/validate/AdminPasswordValidate.php b/app/shopapi/validate/AdminPasswordValidate.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/validate/LoginValidate.php b/app/shopapi/validate/LoginValidate.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/validate/OrderValidate.php b/app/shopapi/validate/OrderValidate.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/validate/ShopDataSetValidate.php b/app/shopapi/validate/ShopDataSetValidate.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/validate/ShopWithdrawValidate.php b/app/shopapi/validate/ShopWithdrawValidate.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/validate/TokenValidate.php b/app/shopapi/validate/TokenValidate.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/validate/VerificationValidate.php b/app/shopapi/validate/VerificationValidate.php
old mode 100644
new mode 100755
diff --git a/app/shopapi/validate/VirtualDeliveryValidate.php b/app/shopapi/validate/VirtualDeliveryValidate.php
old mode 100644
new mode 100755
diff --git a/config/aliyunoss.php b/config/aliyunoss.php
old mode 100644
new mode 100755
diff --git a/config/app.php b/config/app.php
old mode 100644
new mode 100755
diff --git a/config/cache.php b/config/cache.php
old mode 100644
new mode 100755
diff --git a/config/captcha.php b/config/captcha.php
old mode 100644
new mode 100755
diff --git a/config/console.php b/config/console.php
old mode 100644
new mode 100755
diff --git a/config/cookie.php b/config/cookie.php
old mode 100644
new mode 100755
diff --git a/config/database.php b/config/database.php
old mode 100644
new mode 100755
diff --git a/config/default.php b/config/default.php
old mode 100644
new mode 100755
index 7f77e002..2287f7e6
--- a/config/default.php
+++ b/config/default.php
@@ -9,7 +9,7 @@ return [
         'name' => 'likeshop',
         'web_favicon' => '/static/common/ico/default.png', //浏览器图标
 
-        'user_image' => '/static/common/image/default/procurement.png',//用户默认头像
+        'user_image' => '/static/common/image/default/user.png',//用户默认头像
         'goods_image' => '/static/common/image/default/main.png',//商品主图
         'system_notice' => '/static/common/image/default/system_notice.png',//系统通知图标
         'earning_notice' => '/static/common/image/default/earning_notice.png',//收益通知图标
diff --git a/config/filesystem.php b/config/filesystem.php
old mode 100644
new mode 100755
diff --git a/config/lang.php b/config/lang.php
old mode 100644
new mode 100755
diff --git a/config/log.php b/config/log.php
old mode 100644
new mode 100755
diff --git a/config/middleware.php b/config/middleware.php
old mode 100644
new mode 100755
diff --git a/config/project.php b/config/project.php
old mode 100644
new mode 100755
diff --git a/config/route.php b/config/route.php
old mode 100644
new mode 100755
diff --git a/config/session.php b/config/session.php
old mode 100644
new mode 100755
diff --git a/config/swoole.php b/config/swoole.php
old mode 100644
new mode 100755
diff --git a/config/trace.php b/config/trace.php
old mode 100644
new mode 100755
diff --git a/config/view.php b/config/view.php
old mode 100644
new mode 100755