Merge pull request 'dev' (#22) from dev into preview

Reviewed-on: #22
2023-10-04 11:19:15 +08:00 · 2023-10-04 11:19:15 +08:00 · a13bb2b710
commit a13bb2b710
parent 328491332d 939842ec1a
234 changed files with 1615 additions and 278 deletions
--- a/app/common/dao/store/product/ProductDao.php
+++ b/app/common/dao/store/product/ProductDao.php
@ -152,7 +152,7 @@ class ProductDao extends BaseDao
                }
            })
            ->when(isset($where['keyword']) && $where['keyword'] !== '', function ($query) use ($where) {
-                $query->whereLike('Product.keyword', "%{$where['keyword']}%");
+                $query->whereLike('Product.store_name', "%{$where['keyword']}%");
            })
            ->when(isset($where['mer_labels']) && $where['mer_labels'] !== '', function ($query) use ($where) {
                $query->whereLike('U.mer_labels', "%,{$where['mer_labels']},%");
--- a/app/common/dao/store/product/SpuDao.php
+++ b/app/common/dao/store/product/SpuDao.php
@ -43,7 +43,6 @@ class SpuDao extends  BaseDao
                $order = 'S.'. (($where['order'] !== '') ?$where['order']: 'star' ).' DESC';
            }
        }
-
        $order .= ',S.create_time DESC';
        if(isset($where['order']) && $where['order'] === 'none'){
            $order = '';
@ -65,15 +64,16 @@ class SpuDao extends  BaseDao
                $query->whereIn('P.mer_id',$where['mer_ids']);
            })
            ->when(isset($where['keyword']) && $where['keyword'] !== '',function($query)use($where){
+                $query->whereLike("S.store_name|S.keyword|S.product_id", "%{$where['keyword']}%");
                if (is_numeric($where['keyword'])) {
-                    $query->whereLike("S.store_name|S.keyword|S.product_id", "%{$where['keyword']}%");
+                    // $query->whereLike("S.store_name|S.keyword|S.product_id", "%{$where['keyword']}%");
                } else {
-                    $word = app()->make(VicWordService::class)->getWord($where['keyword']);
-                    $query->where(function ($query) use ($word) {
-                        foreach ($word as $item) {
-                            $query->whereOr('S.store_name|S.keyword', 'LIKE', "%$item%");
-                        }
-                    });
+                    // $word = app()->make(VicWordService::class)->getWord($where['keyword']);
+                    // $query->where(function ($query) use ($word) {
+                    //     foreach ($word as $item) {
+                    //         $query->whereOr('S.store_name|S.keyword', 'LIKE', "%$item%");
+                    //     }
+                    // });
                }
            })
            ->when(isset($where['is_trader']) && $where['is_trader'] !== '',function($query)use($where){
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@ -284,9 +284,12 @@ class StoreOrderRepository extends BaseRepository
                        $flag = false;
                    }
                }
-                //发起队列物流信息处理
-                //event('order.sendGoodsCode', $order);
-                Queue::push(SendGoodsCodeJob::class, $order);
+                if ($order->order_type == 0)
+                {
+                    //发起队列物流信息处理
+                    //event('order.sendGoodsCode', $order);
+                    Queue::push(SendGoodsCodeJob::class, $order);
+                }
                
                // 商户流水账单数据
                $finance[] = [
@ -314,6 +317,7 @@ class StoreOrderRepository extends BaseRepository

                $_order_rate = 0;

+                //平台手续费 
                if ($order['commission_rate'] > 0) {

                    $commission_rate = ($order['commission_rate'] / 100);
@ -321,6 +325,7 @@ class StoreOrderRepository extends BaseRepository
                    $_order_rate = bcmul($_payPrice, $commission_rate, 2);

                    $_payPrice = bcsub($_payPrice, $_order_rate, 2);
+                   // 结算各镇 小组佣金
                    event('order.paySuccessOrder', compact('order','_order_rate'));

                }
@ -370,6 +375,7 @@ class StoreOrderRepository extends BaseRepository
                            'financial_record_sn' => $financeSn . ($i++)
                        ];
                    }
+                    //保证金计算
                    if ($_payPrice > 0) {
                        /** @var MerchantRepository $merchantRepo */
                        $merchantRepo = app()->make(MerchantRepository::class);
@ -432,10 +438,11 @@ class StoreOrderRepository extends BaseRepository
                //自动打印订单
                $this->autoPrinter($order->order_id, $order->mer_id);
            }
-            if ($groupOrder->user->spread_uid) {
-                Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_pay_num', 'inc' => 1]);
-                Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_money', 'inc' => $groupOrder->pay_price]);
-            }
+            //分销判断
+            // if ($groupOrder->user->spread_uid) {
+            //     Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_pay_num', 'inc' => 1]);
+            //     Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_money', 'inc' => $groupOrder->pay_price]);
+            // }
            app()->make(UserRepository::class)->update($groupOrder->uid, [
                'pay_count' => Db::raw('pay_count+' . count($groupOrder->orderList)),
                'pay_price' => Db::raw('pay_price+' . $groupOrder->pay_price),
@ -464,7 +471,7 @@ class StoreOrderRepository extends BaseRepository
        Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->uid, 'type' => 'pay_money', 'inc' => $groupOrder->pay_price]);
        Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->uid, 'type' => 'pay_num', 'inc' => 1]);
        app()->make(UserBrokerageRepository::class)->incMemberValue($groupOrder->uid, 'member_pay_num', $groupOrder->group_order_id);
-        event('order.paySuccess', compact('groupOrder'));
+        // event('order.paySuccess', compact('groupOrder'));
        //店内扫码支付
        if (isset($groupOrder['micro_pay']) && $groupOrder['micro_pay'] == 1) {
            $order = $this->dao->search(['uid' => $groupOrder->uid])->where('group_order_id', $groupOrder->group_order_id)->find();
--- a/app/common/repositories/store/product/ProductRepository.php
+++ b/app/common/repositories/store/product/ProductRepository.php
@ -69,7 +69,7 @@ class ProductRepository extends BaseRepository

    protected $dao;
    const CREATE_PARAMS = [
-        "image", "slider_image", "store_name", "store_info", "keyword", "bar_code", "guarantee_template_id", "cate_id", "mer_cate_id", "unit_name", "sort" , "is_show", "is_good", 'is_gift_bag', 'integral_rate', "video_link", "temp_id", "content", "spec_type", "extension_type", "attr", 'mer_labels', 'delivery_way', 'delivery_free','param_temp_id','extend', 'source_product_id',
+        "image", "slider_image", "store_name", "store_info", "keyword", "bar_code", "guarantee_template_id", "cate_id", "mer_cate_id", "unit_name", "sort" , "is_show", "is_good", 'is_gift_bag', 'integral_rate', "video_link", "temp_id", "content", "spec_type", "extension_type", "attr", 'mer_labels', 'delivery_way', 'delivery_free','param_temp_id','extend', 'source_product_id', 'stock',
        ["brand_id",0],
        ['once_max_count',0],
        ['once_min_count',0],
@ -237,8 +237,9 @@ class ProductRepository extends BaseRepository
            $activity_id = 0;
            $product['product_type'] = $productType;
            $result = $this->dao->create($product);
+            
            $settleParams = $this->setAttrValue($data, $result->product_id, $productType, 0,$data['mer_id']);
-            $settleParams['cate'] = $this->setMerCate($data['mer_cate_id'], $result->product_id, $data['mer_id']);
+            // $settleParams['cate'] = $this->setMerCate($data['mer_cate_id'], $result->product_id, $data['mer_id']);
            $settleParams['attr'] = $this->setAttr($data['attr'], $result->product_id);
            if (in_array($productType, [0, 98, 99])) app()->make(ParameterValueRepository::class)->create($result->product_id, $data['params'] ?? [],$data['mer_id']);
            $this->save($result->product_id, $settleParams, $content,$product,$productType);
@ -455,9 +456,9 @@ class ProductRepository extends BaseRepository
            if($data['integral_rate'] > 100) $integral_rate = 100;

        }
-
        $result = [
            'store_name' => $data['store_name'],
+            'stock' => $data['stock'] ?? 0,
            'image' => $data['image'],
            'slider_image' => is_array($data['slider_image']) ? implode(',', $data['slider_image']) : '',
            'store_info' => $data['store_info'] ?? '',
@ -662,9 +663,7 @@ class ProductRepository extends BaseRepository
    public function getAdminOneProduct(int $id, ?int $activeId, $conType = 0)
    {
        $with = ['attr', 'attrValue', 'oldAttrValue',  'merCateId.category', 'storeCategory', 'brand', 'temp', 'seckillActive',
-            'content' => function($query) use($conType){
-                $query->where('type',$conType);
-            },
+            'content',
            'merchant'=> function($query){
                $query->field('mer_id,mer_avatar,mer_name,is_trader');
            },
@ -752,7 +751,16 @@ class ProductRepository extends BaseRepository
        $data['attrValue'] = $arr;

        $content = $data['content']['content'] ?? '';
-        if ($conType) $content = json_decode($content);
+        if (isset($data['content']) &&$data['content']['type']==1){
+            $arr = json_decode($content);
+            if($arr){
+                $content='';
+                foreach($arr->image as $k=>$v){
+                    $content.='<img src='.$v.'></br>';
+                }
+
+            }
+        } 
        unset($data['content']);
        $data['content'] = $content;
        return $data;
@ -1322,19 +1330,17 @@ class ProductRepository extends BaseRepository
            ->where('mer_id',$merId);
        $data = [];
        $count = $query->count();
-
-        if ($count < 3) {
-            $productIds[] = $productId;
-            $data = $this->dao->getSearch([])
-                ->where($this->dao->productShow())
-                ->whereNotIn('product_id',$productIds)
-                ->where('mer_id', $merId)
-                ->field('mer_id,product_id,store_name,image,price,is_show,status,is_gift_bag,is_good,sales,create_time')
-                ->order('sort DESC,create_time DESC')
-                ->limit((3 - $count))
-                ->select()->toArray();
-        }
-
+        // if ($count < 3) {
+        //     $productIds[] = $productId;
+        //     $data = $this->dao->getSearch([])
+        //         ->where($this->dao->productShow())
+        //         ->whereNotIn('product_id',$productIds)
+        //         ->where('mer_id', $merId)
+        //         ->field('mer_id,product_id,store_name,image,price,is_show,status,is_gift_bag,is_good,sales,create_time')
+        //         ->order('sort DESC,create_time DESC')
+        //         ->limit((3 - $count))
+        //         ->select()->toArray();
+        // }
        if ($count > 0 ){
            $count = $count  > 3 ? 3 : $count;
            $res = $query->setOption('field',[])->field('mer_id,product_id,store_name,image,price,is_show,status,is_gift_bag,is_good,sales,create_time')
@ -2243,8 +2249,8 @@ class ProductRepository extends BaseRepository
            throw new ValidateException('品牌不存在');
        if (!$this->CatExists($data['cate_id']))
            throw new ValidateException('平台分类不存在');
-        if (isset($data['mer_cate_id']) && !$this->merCatExists($data['mer_cate_id'], $merId))
-            throw new ValidateException('不存在的商户分类');
+        // if (isset($data['mer_cate_id']) && !$this->merCatExists($data['mer_cate_id'], $merId))
+        //     throw new ValidateException('不存在的商户分类');
        if ($data['delivery_way'] == 2 && !$this->merShippingExists($merId, $data['temp_id']))
            throw new ValidateException('运费模板不存在');
        if (isset($data['type']) && $data['type'] && $data['extend']) {
@ -2267,7 +2273,7 @@ class ProductRepository extends BaseRepository
            }
        }
        foreach ($data['attrValue'] as $k => $item) {
-            $data['attrValue'][$k]['stock'] = 0;
+            //$data['attrValue'][$k]['stock'] = 0;
        }
        app()->make(ProductLabelRepository::class)->checkHas($merId,$data['mer_labels']);
        $count = app()->make(StoreCategoryRepository::class)->getWhereCount(['store_category_id' => $data['cate_id'],'is_show' => 1]);
--- a/app/common/repositories/store/product/SpuRepository.php
+++ b/app/common/repositories/store/product/SpuRepository.php
@ -144,7 +144,7 @@ class SpuRepository extends BaseRepository
        }
        $where = array_merge(Product::searchEnable(), $where);
        $query = $this->dao->search($where);
-
+        
        $query->with([
            'merchant' => function ($query) {
                $query->field($this->merchantFiled)->with(['type_name']);
@ -153,8 +153,7 @@ class SpuRepository extends BaseRepository
            'product.attrValue',
        ]);
        $productMake = app()->make(ProductRepository::class);
-        $count = $query->count();
-
+        $count = $query->fetchSql(false)->count();
        $list = $query->page($page, $limit)->setOption('field', [])->field($this->productFiled)->select();
        $append = ['stop_time','svip_price','show_svip_info','is_svip_price'];
        if ($productMake->getUserIsPromoter($userInfo))
@ -164,7 +163,7 @@ class SpuRepository extends BaseRepository
        return compact('count', 'list');
    }

-    public function getApiCloudSearch($where, $page, $limit, $rand = false)
+    public function getApiCloudSearch($where, $page, $limit, $rand = true)
    {
        $where = array_merge(Product::searchEnable(), $where);
        if (!empty($where['keyword'])) {
@ -179,17 +178,30 @@ class SpuRepository extends BaseRepository
            }
        }
        if ($rand) {
-            $dataKey = sprintf(CloudProduct::CacheKey, $where['mer_id']);
-            $RedisCacheService = app()->make(RedisCacheService::class);
-            $exists = $RedisCacheService->exists($dataKey);
-            if (!$exists) {
-                $productIds = Db::name('cloud_product')->where('mer_id', $where['mer_id'])->where('status', 1)->limit(100)->column('product_id');
-                foreach ($productIds as $productId) {
-                    $RedisCacheService->SADD($dataKey, $productId);
-                }
+            // $dataKey = sprintf(CloudProduct::CacheKey, $where['mer_rand_id']);
+            // $RedisCacheService = app()->make(RedisCacheService::class);
+            // $exists = $RedisCacheService->exists($dataKey);
+            // if (!$exists) {
+            //     $productIds = Db::name('cloud_product')->where('mer_id', $where['mer_rand_id'])->where('status', 1)->limit(100)->column('product_id');
+            //     foreach ($productIds as $productId) {
+            //         $RedisCacheService->SADD($dataKey, $productId);
+            //     }
+            // }
+            // $where['product_id'] = $this->getSpuFromCache($where['mer_rand_id'], $page, $limit);
+            // 查询
+            $query = $this->dao->search($where);
+            $randPidList = $query->setOption('field', [])->field(['P.product_id'])->fetchSql(false)->page(1)->limit(500)->column('P.product_id');
+            $randNum = count($randPidList);
+            // 最多10条随机数据
+            if ($randNum > 10) {
+                array_rand($randPidList, 10);
+            } elseif ($randNum > 0) {
+                array_rand($randPidList, $randNum);
+            } else {
+                $randPidList = [];
            }
-            $where['product_id'] = $this->getSpuFromCache($where['mer_id'], $page, $limit);
-            unset($where['mer_id'], $where['page']);
+            $where['product_id'] = $randPidList;
+            unset($where['mer_rand_id'], $where['page']);
            $page = 1;
        }
        $entryMerId = $where['entry_mer_id'] ?? '';
--- a/app/common/repositories/system/merchant/MerchantRepository.php
+++ b/app/common/repositories/system/merchant/MerchantRepository.php
@ -51,6 +51,7 @@ use think\db\exception\ModelNotFoundException;
 use think\Exception;
 use think\exception\ValidateException;
 use think\facade\Db;
+use think\facade\Log;
 use think\facade\Queue;
 use think\facade\Route;
 use think\Model;
@ -255,8 +256,8 @@ class MerchantRepository extends BaseRepository
        $merchantCategoryRepository = app()->make(MerchantCategoryRepository::class);
        $adminRepository = app()->make(MerchantAdminRepository::class);

-        if (!$data['category_id'] || !$merchantCategoryRepository->exists($data['category_id']))
-            throw new ValidateException('商户分类不存在');
+        // if (!$data['category_id'] || !$merchantCategoryRepository->exists($data['category_id']))
+        //     throw new ValidateException('商户分类不存在');
        if ($adminRepository->fieldExists('account', $data['mer_account']))
            throw new ValidateException('账号已存在');

@ -266,7 +267,7 @@ class MerchantRepository extends BaseRepository
        $margin = app()->make(MerchantTypeRepository::class)->get($data['type_id']);
        $data['is_margin'] = $margin['is_margin'] ?? -1;
        $data['margin'] = $margin['margin'] ?? 0;
-
+        
        return Db::transaction(function () use ($data, $make) {
            $account = $data['mer_account'];
            $password = $data['mer_password'];
@ -688,18 +689,19 @@ class MerchantRepository extends BaseRepository
    public function autoMargin($income, $order, $finance, $financeSn, $index = 0)
    {
        $merchant = Merchant::find($this->merId);
-        //商户保证金未完全缴纳且设置了自动扣除比例
-        if ($merchant['margin'] <= $merchant['paid_margin'] || ($this->forceMargin === false && $merchant['auto_margin_rate'] <= 0 && $merchant['auto_margin_rate'] > 100)) {
+        $margin_type = Db::name('MerchantType')->where('mer_type_id', $merchant['type_id'])->value('margin');
+        //商户保证金大于支付保证金 或者forceMargin==false 直接返回 不计算保证金
+        if ($merchant['paid_margin']>= $margin_type|| ($this->forceMargin === false && $merchant['auto_margin_rate'] == 0)) {
            return [$income, $finance, false];
        }
        $rate = $this->forceMargin ? 100 : $merchant['auto_margin_rate'];
-        //商户保证金未完全缴纳且设置了自动扣除比例
-        $margin = bcmul($income, $rate / 100, 2);
-        $margin = min(bcsub($merchant['margin'], $merchant['paid_margin'], 2), $margin);
-        $income = max(bcsub($income, $margin, 2), 0);
-        if ($margin <= 0) {
-            return [$income, $finance, false];
-        }
+        // //商户保证金未完全缴纳且设置了自动扣除比例
+        $margin= bcmul($income, bcdiv($rate, 100,2), 2);
+        // $margin = min(bcsub($margin, $merchant['paid_margin'], 2), $margin);
+        // $income = max(bcsub($income, $margin, 2), 0);
+        // if ($margin <= 0) {
+        //     return [$income, $finance, false];
+        // }
        $finance[] = [
            'order_id' => $order->order_id,
            'order_sn' => $order->order_sn,
@ -712,10 +714,14 @@ class MerchantRepository extends BaseRepository
            'mer_id' => $this->merId,
            'financial_record_sn' => $financeSn . $index
        ];
-
+        if(bcadd($merchant['paid_margin'],$margin)>=$margin_type){
+            $is_margin=10;
+        }else{
+            $is_margin=1;
+        }
        $orderInfo = [
            'type_id' => $merchant['type_id'],
-            'is_margin' => $merchant['is_margin'],
+            'is_margin' => $is_margin,
            'margin' => $margin,
        ];
        $values = [
@ -736,12 +742,12 @@ class MerchantRepository extends BaseRepository
        }
        $merchant->paid_margin = bcadd($margin, $merchant->paid_margin, 2);
        $merchant->ot_margin = $merchant->paid_margin;
-        $merchant->is_margin = MerchantRepository::PaidMargin;
+        $merchant->is_margin = $is_margin;
        if ($merchant->save() === false) {
            throw new \Exception('merchant 保存出错', 500);
        }

-        return [$income, $finance, true];
+        return [bcsub($income,$margin,2), $finance, true];
    }

 }
--- a/app/common/service/JgPush.php
+++ b/app/common/service/JgPush.php
@ -15,12 +15,23 @@ class JgPush

    public $client;
    public $push;
+    public $iosKey;
+    public $iosSecret;
+    public $azKey;
+    public $azSecret;

    public function __construct()
    {
-        $this->client = new Client('b5f679f4357018605ea6fd2e', 'c4fb573758f8d7058d697c54');
-        $this->push = $this->client->push();
-        $this->setPlatform();
+        // ios
+        // $this->client = new Client('8a5efd65cda14fafa6e64ad3', 'daebe19b547c43128796a078');
+        $this->iosKey = '8a5efd65cda14fafa6e64ad3';
+        $this->iosSecret = 'daebe19b547c43128796a078';
+        // 安卓
+        // $this->client = new Client('b5f679f4357018605ea6fd2e', 'c4fb573758f8d7058d697c54');
+        $this->azKey = 'b5f679f4357018605ea6fd2e';
+        $this->azSecret = 'c4fb573758f8d7058d697c54';
+        // $this->push = $this->client->push();
+        // $this->setPlatform();
    }

    public function send($type, $data)
@ -30,9 +41,6 @@ class JgPush
                $groupOrder = app()->make(StoreGroupOrderRepository::class)->get($data['id']);
                if ($groupOrder) {
                    foreach ($groupOrder->orderList as $order) {
-                        $this->client = new Client('b5f679f4357018605ea6fd2e', 'c4fb573758f8d7058d697c54');
-                        $this->push = $this->client->push();
-                        $this->setPlatform();
                        $route = "/pages/admin/orderDetail/index?id={$order['order_id']}&mer_id={$order['mer_id']}";
                        $merUserId = Merchant::where('mer_id', $order->mer_id)->value('uid');
                        $jgRegisterId = User::where('uid', $merUserId)->value('jg_register_id');
@ -41,11 +49,24 @@ class JgPush
                        }
                        $msg = $order['pay_type'] == StoreGroupOrder::PAY_TYPE_CREDIT_BUY ? '您有新的订单已结算，请注意查看。' : '您有新的订单，请注意查看。';
                        $msgType = $order['pay_type'] == StoreGroupOrder::PAY_TYPE_CREDIT_BUY ? 'ORDER_SETTLEMENT' : 'ORDER_CREATE';
-                        $this->addRegistrationId($jgRegisterId);
-                        $this->androidNotification($msg, ['extras' => ['route' => $route, 'type' => $msgType]]);
-                        $this->iosNotification($msg, ['extras' => ['route' => $route, 'type' => $msgType]]);
-                        $this->push->send();
-                        unset($this->client, $this->push);
+                        try {
+                            $this->client = new Client($this->iosKey, $this->iosSecret);
+                            $this->push = $this->client->push();
+                            $this->setPlatform();
+                            $this->addRegistrationId($jgRegisterId);
+                            $this->iosNotification($msg, ['extras' => ['route' => $route, 'type' => $msgType]]);
+                            $this->push->send();
+                            unset($this->client, $this->push);
+                        } catch (\Exception $e) {}
+                        try {
+                            $this->client = new Client($this->azKey, $this->azSecret);
+                            $this->push = $this->client->push();
+                            $this->setPlatform();
+                            $this->addRegistrationId($jgRegisterId);
+                            $this->androidNotification($msg, ['extras' => ['route' => $route, 'type' => $msgType]]);
+                            $this->push->send();
+                            unset($this->client, $this->push);
+                        } catch (\Exception $e) {}    
                    }
                }
                break;
@ -56,10 +77,25 @@ class JgPush
                    $route = "/pages/order_details/index?order_id={$order['order_id']}";
                    $jgRegisterId = User::where('uid', $order['uid'])->value('jg_register_id');
                    if (!empty($jgRegisterId)) {
-                        $this->addRegistrationId($jgRegisterId);
-                        $this->androidNotification('您的订单已发货，请注意查看。', ['extras' => ['route' => $route]]);
-                        $this->iosNotification('您的订单已发货，请注意查看。', ['extras' => ['route' => $route]]);
-                        $this->push->send();
+                        $msg = '您的订单已发货，请注意查看。';
+                        try {
+                            $this->client = new Client($this->iosKey, $this->iosSecret);
+                            $this->push = $this->client->push();
+                            $this->setPlatform();
+                            $this->addRegistrationId($jgRegisterId);
+                            $this->iosNotification($msg, ['extras' => ['route' => $route]]);
+                            $this->push->send();
+                            unset($this->client, $this->push);
+                        } catch (\Exception $e) {} 
+                        try {
+                            $this->client = new Client($this->azKey, $this->azSecret);
+                            $this->push = $this->client->push();
+                            $this->setPlatform();
+                            $this->addRegistrationId($jgRegisterId);
+                            $this->androidNotification($msg, ['extras' => ['route' => $route]]);
+                            $this->push->send();
+                            unset($this->client, $this->push);
+                        } catch (\Exception $e) {}    
                    }
                }
                break;
@ -71,10 +107,25 @@ class JgPush
                if (empty($jgRegisterId)) {
                    break;
                }
-                $this->addRegistrationId($jgRegisterId);
-                $this->androidNotification('您的先货后款订单即将逾期，请尽快处理！', ['extras' => ['route' => $route]]);
-                $this->iosNotification('您的先货后款订单即将逾期，请尽快处理！', ['extras' => ['route' => $route]]);
-                $this->push->send();
+                $msg = '您的先货后款订单即将逾期，请尽快处理！';
+                try {
+                    $this->client = new Client($this->iosKey, $this->iosSecret);
+                    $this->push = $this->client->push();
+                    $this->setPlatform();
+                    $this->addRegistrationId($jgRegisterId);
+                    $this->iosNotification($msg, ['extras' => ['route' => $route]]);
+                    $this->push->send();
+                    unset($this->client, $this->push);
+                } catch (\Exception $e) {} 
+                try {
+                    $this->client = new Client($this->azKey, $this->azSecret);
+                    $this->push = $this->client->push();
+                    $this->setPlatform();
+                    $this->addRegistrationId($jgRegisterId);
+                    $this->androidNotification($msg, ['extras' => ['route' => $route]]);
+                    $this->push->send();
+                    unset($this->client, $this->push);
+                } catch (\Exception $e) {} 
                break;
            case 'ORDER_CREATE':
                $order = app()->make(StoreOrderRepository::class)->get($data['id']);
@ -87,10 +138,28 @@ class JgPush
                if (empty($jgRegisterId)) {
                    break;
                }
-                $this->addRegistrationId($jgRegisterId);
-                $this->androidNotification('您有新的订单，请注意查看。', ['extras' => ['route' => $route, 'type' =>'ORDER_CREATE']]);
-                $this->iosNotification('您有新的订单，请注意查看。', ['extras' => ['route' => $route, 'type' =>'ORDER_CREATE']]);
-                $this->push->send();
+
+                $msg  = '您有新的订单，请注意查看。';
+                $type = 'ORDER_CREATE';
+                try {
+                    $this->client = new Client($this->iosKey, $this->iosSecret);
+                    $this->push = $this->client->push();
+                    $this->setPlatform();
+                    $this->addRegistrationId($jgRegisterId);
+                    $this->iosNotification($msg, ['extras' => ['route' => $route, 'type' => $type]]);
+                    $this->push->send();
+                    unset($this->client, $this->push);
+                } catch (\Exception $e) {} 
+
+                try {
+                    $this->client = new Client($this->azKey, $this->azSecret);
+                    $this->push = $this->client->push();
+                    $this->setPlatform();
+                    $this->addRegistrationId($jgRegisterId);
+                    $this->androidNotification($msg, ['extras' => ['route' => $route, 'type' => $type]]);
+                    $this->push->send();
+                    unset($this->client, $this->push);
+                } catch (\Exception $e) {} 
                break;
            case 'ORDER_PAY_SUCCESS':
                $order = app()->make(StoreOrderRepository::class)->get($data['id']);
@ -103,10 +172,27 @@ class JgPush
                if (empty($jgRegisterId)) {
                    break;
                }
-                $this->addRegistrationId($jgRegisterId);
-                $this->androidNotification('您有新的订单，请注意查看。', ['extras' => ['route' => $route, 'type' =>'ORDER_PAY_SUCCESS']]);
-                $this->iosNotification('您有新的订单，请注意查看。', ['extras' => ['route' => $route, 'type' =>'ORDER_PAY_SUCCESS']]);
-                $this->push->send();
+                $msg  = '您有新的订单，请注意查看。';
+                $type = 'ORDER_PAY_SUCCESS';
+                try {
+                    $this->client = new Client($this->iosKey, $this->iosSecret);
+                    $this->push = $this->client->push();
+                    $this->setPlatform();
+                    $this->addRegistrationId($jgRegisterId);
+                    $this->iosNotification($msg, ['extras' => ['route' => $route, 'type' => $type]]);
+                    $this->push->send();
+                    unset($this->client, $this->push);
+                } catch (\Exception $e) {} 
+
+                try {
+                    $this->client = new Client($this->azKey, $this->azSecret);
+                    $this->push = $this->client->push();
+                    $this->setPlatform();
+                    $this->addRegistrationId($jgRegisterId);
+                    $this->androidNotification($msg, ['extras' => ['route' => $route, 'type' => $type]]);
+                    $this->push->send();
+                    unset($this->client, $this->push);
+                } catch (\Exception $e) {} 
                break;
            default:
                break;
--- a/app/controller/admin/system/merchant/Merchant.php
+++ b/app/controller/admin/system/merchant/Merchant.php
@ -146,21 +146,16 @@ class Merchant extends BaseController
            return app('json')->fail('商户名已存在');
        if ($data['mer_phone'] && isPhone($data['mer_phone']))
            return app('json')->fail('请输入正确的手机号');
-        if (!$data['category_id'] || !$merchantCategoryRepository->exists($data['category_id']))
-            return app('json')->fail('商户分类不存在');
-
+        // if (!$data['category_id'] || !$merchantCategoryRepository->exists($data['category_id']))
+        //     return app('json')->fail('商户分类不存在');
+        
        $newUid = Db::name('User')->where('account', $data['mer_phone'])->value('uid', -1);
        $merId  = Db::name('Merchant')->where('uid', $newUid)->value('mer_id', 0);
        if ($newUid != -1 && $id != $merId) {
            //return app('json')->fail('该商家手机号已存在账户，请更换手机');
        }
        unset($data['mer_account'], $data['mer_password']);
-        $margin = $this->repository->checkMargin($id, $data['type_id']);
-        $data['margin'] = $margin['margin'];
-        $data['is_margin'] = $data['paid_margin'] > 0 ? MerchantRepository::PaidMargin : $margin['is_margin'];
-        $data['ot_margin'] = $data['paid_margin'];
-        $datas=$data;
-        $this->repository->update($id, $datas);
+        $this->repository->update($id, $data);
        return app('json')->success('编辑成功');
    }

@ -190,7 +185,7 @@ class Merchant extends BaseController
     */
    public function checkParam(MerchantValidate $validate, $isUpdate = false)
    {
-        $data = $this->request->params([['area_id',0],['street_id',0],['village_id',0],['category_id', 0], ['type_id', 0], 'mer_name', 'commission_rate', 'real_name', 'mer_phone', 'mer_keyword', 'mer_address', 'mark', ['sort', 0], ['status', 0], ['is_audit', 0], ['is_best', 0], ['is_bro_goods', 0], ['is_bro_room', 0], ['is_trader', 0],'sub_mchid', 'auto_margin_rate', 'paid_margin']);
+        $data = $this->request->params([['area_id',0],['street_id',0],['village_id',0],['category_id', 0], ['type_id', 0], 'mer_name', 'commission_rate', 'real_name', 'mer_phone', 'mer_keyword', 'mer_address', 'mark', ['sort', 0], ['status', 0], ['is_audit', 0], ['is_best', 0], ['is_bro_goods', 0], ['is_bro_room', 0], ['is_trader', 0],'sub_mchid', 'auto_margin_rate','margin']);
        if (!$isUpdate) {
            $data += $this->request->params(['mer_account', 'mer_password']);
        }else {
--- a/app/controller/admin/system/merchant/MerchantType.php
+++ b/app/controller/admin/system/merchant/MerchantType.php
@ -91,7 +91,7 @@ class MerchantType extends BaseController

    protected function getValidParams()
    {
-        $data = $this->request->params(['type_name', 'type_info', 'is_margin', 'margin', 'first_margin', 'auth', 'description', 'is_allow_apply', 'is_search_display', 'is_sync_prod', 'type_code']);
+        $data = $this->request->params(['type_name', 'type_info', 'is_margin', 'margin','auth', 'description', 'is_allow_apply', 'is_search_display', 'is_sync_prod', 'type_code']);
        $validate = app()->make(MerchantTypeValidate::class);
        $validate->check($data);
        if ($data['is_margin'] == 1) {
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@ -17,6 +17,7 @@ namespace app\controller\api;
 use app\common\repositories\store\order\StoreOrderRepository;
 use app\common\repositories\store\order\StoreRefundOrderRepository;
 use app\common\repositories\system\notice\SystemNoticeConfigRepository;
+use app\common\repositories\system\config\ConfigValueRepository;
 use app\common\model\system\merchant\Merchant;
 use app\common\repositories\user\UserRepository;
 use app\common\repositories\user\UserSignRepository;
@ -47,6 +48,7 @@ use think\facade\Db;
 use think\facade\Log;
 use think\facade\Queue;
 use crmeb\jobs\SendSmsJob;
+use app\common\service\JgPush;
 use crmeb\jobs\TestJob;
 use crmeb\services\PayService;
 use crmeb\services\CombinePayService;
@ -64,22 +66,19 @@ class Auth extends BaseController
 {
    public function dotest()
    {
-        $repository = app()->make(StoreOrderRepository::class);
-        $param = [
-            "status" => 0,
-            "is_del" => 0,
-            "mer_id" => 1,
-            "pay_type" => 1,
-            "attach" => "margin",
-            "order_info" => '{"is_margin":1,"margin":"0.01"}',
-            "pay_price" => 0.01,
-            "order_sn" => "bzj" . date('YmdHis') . uniqid(),
-            "body" =>'哈哈哈',
+        $data = [
+            "tempId" => "ADMIN_PAY_SUCCESS_CODE",
+            "id"     => 113 
        ];
-        $payType = 'weixinApp';
-        $service = new PayService($payType, $param);
-        $payInfo = $service->pay(User::where(['uid'=>1])->find());
-        return app('json')->success([]);
+        try {
+            $client = app()->make(JgPush::class);
+            Log::info('JgPush送发送数据：' . json_encode($data));
+            $client->send($data['tempId'], $data);
+            return app('json')->success(json_encode($data, true));
+        } catch (\Exception $e) {
+            Log::info('JgPush推送消息发送失败' . json_encode($data) . ' - ' . $e->getMessage());
+            return app('json')->success(json_encode($data, true) . $e->getMessage());
+        }
    }

    public function test()
@ -276,24 +275,28 @@ class Auth extends BaseController
    public function doMargin()
    {
        $user = $this->request->userInfo();
-        $merchant = Db::name('merchant')->where('uid', $user['uid'])->where('status', 1)->where('is_margin', 1)->find();
+        $merchant = Db::name('merchant')->where('uid', $user['uid'])->where('status', 1)->find();
        if (!$merchant) {
-            return app('json')->fail('用户店铺异常');
+            return app('json')->fail('没有店铺');
        }
-        $merchantTypeInfo = Db::name('merchant_type')->where('mer_type_id', $merchant['type_id'])->find();
-        if ($merchantTypeInfo['first_margin'] > 0) {
-            if (!$merchant['first_margin_status']) {
-                $merchant['margin'] = $merchantTypeInfo['first_margin'];
+        if($merchant['is_margin'] == 10){
+            return app('json')->fail('保证金已缴纳');
+        }
+        if($merchant['margin'] == 0){
+            $margin = Db::name('MerchantType')->where('mer_type_id', $merchant['type_id'])->value('margin');
+            $margin = bcsub($margin,$merchant['paid_margin'],2);
+            if($margin==0){
+                return app('json')->fail('当前金额为0,不能进行充值');
            }
+        }else{
+            $margin=0;
        }
-        
-        $repository = app()->make(StoreOrderRepository::class);
        $orderSn = "bzj" . date('YmdHis') . uniqid();
        Db::name('margin_order')->insert([
            'uid' => $user['uid'],
            'mer_id' => $merchant['mer_id'],
            'order_sn' => $orderSn,
-            'total_price' => $merchant['margin'],
+            'total_price' => $margin,
            'pay_type' => 1,
            'create_time' => date('Y-m-d H:i:s')
        ]);
@ -303,10 +306,10 @@ class Auth extends BaseController
            "mer_id" => $merchant['mer_id'],
            "pay_type" => 1,
            "attach" => "margin",
-            "order_info" => '{"is_margin":1,"margin":"' . $merchant['margin'] . '"}',
-            "pay_price" => $merchant['margin'],
+            "order_info" => '{"is_margin":1,"margin":"' . $margin . '"}',
+            "pay_price" => $margin,
            "order_sn" => $orderSn,
-            "body" => $merchant['mer_name'] . ' - ' . $merchant['margin'],
+            "body" => $merchant['mer_name'] . ' - ' . $margin,
        ];
        $payType = 'weixinApp';
        $service = new PayService($payType, $param);
@ -318,8 +321,8 @@ class Auth extends BaseController
    {
        $user = $this->request->userInfo();
        [$page, $limit] = $this->getPage();
-        $count = Db::name('margin_order')->where('uid', $user['uid'])->count();
-        $list = Db::name('margin_order')->where('uid', $user['uid'])->page($page, $limit)->order('order_id', 'desc')->select()->toArray();
+        $count = Db::name('margin_order')->where('uid', $user['uid'])->where('paid',1)->count();
+        $list = Db::name('margin_order')->where('uid', $user['uid'])->where('paid',1)->page($page, $limit)->order('order_id', 'desc')->select()->toArray();
        return app('json')->success(compact('count', 'list'));
    }

@ -1406,7 +1409,6 @@ class Auth extends BaseController
            'meizu',
            'moto'
        ];
-        Log::info("请求版本参数：" . json_encode(request()->param()));
        $type = $this->request->param('type', '-1');
        $version = $this->request->param('version', '');
        $phoneBrand = $this->request->param('phone_brand', '');
@ -1462,10 +1464,24 @@ class Auth extends BaseController
                'status'   => ($status == 1 ? 1 : 2),
                'fail_msg' => $remark
            ];
-            if ($status != 1) {
-                Db::name('merchant_intention')->where('mer_intention_id', $id)->where('type', 1)->update($updData);
+            if ($status == 1) {
+                $repository->updateStatus($id, $data);
+                $intention = Db::name('merchant_intention')->where('mer_intention_id', $id)->where('type', 1)->find();
+                $merLicenseImage = '';
+                if (!empty($intention['images'])) {   
+                    $merLicenseImageArray = explode(',', $intention['images']);
+                    $merLicenseImage = $merLicenseImageArray[0] ?? '';
+                }
+                $merCertificate = merchantConfig($intention['mer_id'], 'mer_certificate');
+                if (!is_array($merCertificate)) {
+                    $merCertificate = explode(',', $merCertificate);
+                }
+                $merCertificate[0] =  $merLicenseImage;
+                app()->make(ConfigValueRepository::class)->setFormData([
+                    'mer_certificate' => $merCertificate
+                ], $intention['mer_id']);
            }
-            $repository->updateStatus($id, $data);
+            Db::name('merchant_intention')->where('mer_intention_id', $id)->where('type', 1)->update($updData);
        } else {
            //商户交易申请
            $updData = [
--- a/app/controller/api/Common.php
+++ b/app/controller/api/Common.php
@ -32,6 +32,7 @@ use app\common\repositories\user\UserSignRepository;
 use app\common\repositories\user\UserVisitRepository;
 use app\common\repositories\wechat\TemplateMessageRepository;
 use app\common\repositories\wechat\WechatUserRepository;
+use app\common\model\system\merchant\Merchant;
 use crmeb\basic\BaseController;
 use crmeb\services\AlipayService;
 use crmeb\services\CopyCommand;
@ -494,14 +495,21 @@ class Common extends BaseController

    //获取云店铺
    public function get_cloud_shop($street_code){
+        //更新查询镇级供应链店铺
+        $typeTownSupplyChainId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeTownSupplyChain'])->value('mer_type_id');
+        /*
        $find=DB::name('merchant')
            ->alias('m')
-            ->where('m.type_id',11)
+            ->where('m.type_id',$typeTownSupplyChainId)
            ->where('m.is_del',0)
            ->where('m.status',1)
            ->where('m.street_id',$street_code)
            ->join('merchant_category c','m.category_id=c.merchant_category_id')
            ->field('m.mer_id,category_id,category_name,c.background,c.cover,c.description')->select();
+        */
+        $find=DB::name('merchant_category')
+            ->where('cover', '<>' ,'')
+            ->field('merchant_category_id as category_id,category_name,background,cover,description')->select();
        return app('json')->success($find??[]);
    }
 }
--- a/app/controller/api/server/StoreProduct.php
+++ b/app/controller/api/server/StoreProduct.php
@ -96,7 +96,15 @@ class StoreProduct extends BaseController
        }else{
            $product_type=0;//普通商品
        }
-        $this->repository->create($data, $product_type, 1);
+        $productId = $this->repository->create($data, $product_type, 1);
+        // $unique = Db::name('store_product_attr_value')->where('product_id', $productId)->value('unique');
+        // if (!empty($unique) && $stockNum > 0) {
+        //     $this->repository->stockIn($merId, [
+        //         'product_id' => $productId,
+        //         'unique' => $unique,
+        //         'number' => $stockNum,
+        //     ]);
+        // }
        return app('json')->success('添加成功');
    }

--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@ -264,18 +264,14 @@ class Merchant extends BaseController
        if(empty($id)){
            return app('json')->fail('参数不能为空');
        }
-        $merchantInfo = Db::name('merchant')->where('mer_id',$id)->field('uid,mer_id,type_id,mer_name,margin,paid_margin,is_margin,first_margin_status')->find();
+        $merchantInfo = Db::name('merchant')->where('mer_id',$id)->field('uid,mer_id,type_id,mer_name,margin,paid_margin,is_margin')->find();
        if(empty($merchantInfo)){
            return app('json')->fail('参数错误');
        }
-        $merchantInfo['unpaid_margin'] = $merchantInfo['margin'];
-        $merchantTypeInfo = Db::name('merchant_type')->where('mer_type_id', $merchantInfo['type_id'])->find();
-        if ($merchantTypeInfo['first_margin'] > 0) {
-            if ($merchantInfo['first_margin_status']) {
-                $merchantInfo['margin'] = $merchantInfo['margin'];
-            } else {
-                $merchantInfo['margin'] = $merchantTypeInfo['first_margin'];
-            }
+        $margin = Db::name('MerchantType')->where('mer_type_id', $merchantInfo['type_id'])->value('margin');
+        $merchantInfo['unpaid_margin'] = bcsub($margin,$merchantInfo['paid_margin'],2);
+        if($merchantInfo['margin']==0){
+            $merchantInfo['margin']=$merchantInfo['unpaid_margin'];
        }
        return app('json')->success($merchantInfo);
    }
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@ -98,7 +98,7 @@ class MerchantIntention extends BaseController
        $res = $this->sendMerIntentionApply($sendData, $postUrl);
        if (!$res['ok']) {
            Db::name('merchant_intention')->where('mer_intention_id', $intention->mer_intention_id)->delete();
-            throw new ValidateException('申请商户入驻失败，' . $res['msg']);
+            throw new ValidateException('供销平台申请商户入驻失败，' . $res['msg']);
        }
        return app('json')->success('提交成功');
    }
@ -141,12 +141,15 @@ class MerchantIntention extends BaseController
        if (empty($data['bank_username']) || empty($data['bank_opening']) || empty($data['bank_front']) || empty($data['bank_back']) || empty($data['cardno_front']) || empty($data['cardno_back'])) {
            return app('json')->fail('请完善银行卡及身份信息');
        }
-
+        
        if (!systemConfig('mer_intention_open')) {
            return app('json')->fail('未开启商户入驻');
        }
        if ($this->userInfo) $data['uid'] = $this->userInfo->uid;
        $merInfo = Db::name('merchant')->where('uid', $this->userInfo->uid)->where('status', 1)->find();
+        if (empty($merInfo)) {
+            return app('json')->fail('请申请商户入驻申请！');
+        }
        if (!empty($merInfo['business_status']) && ($merInfo['business_status']==1)) {
            return app('json')->fail('商户交易已申请，正在审核中！');
        }
@ -161,12 +164,11 @@ class MerchantIntention extends BaseController
                'mer_id'     => $merInfo['mer_id'],
                'phone'      => $merInfo['mer_phone'],
                'mer_name'   => $merInfo['mer_name'],
+                'name'   => $merInfo['mer_name'],
                'merchant_category_id' => $merInfo['category_id'],
                'mer_type_id'          => $merInfo['type_id'],
-                'is_old_mer'           => 1
            ];
        }
-
        $intenInfo['bank_username'] = $data['bank_username'];
        $intenInfo['bank_opening'] = $data['bank_opening'];
        $intenInfo['bank_front'] = $data['bank_front'];
@ -191,9 +193,9 @@ class MerchantIntention extends BaseController
            'master_phone' => $intenInfo['phone'],
            'images' => !empty($intenInfo['images'])?json_encode(explode(',', $intenInfo['images'])):'',
            'city' => $areaInfo['city_code'] ?? '',
-            'area' => $intenInfo['area_id'] ?? '',
-            'street' =>  $intenInfo['street_id'] ?? '',
-            'address' =>  $intenInfo['address'] ?? '',
+            'area' => $merInfo['area_id'] ?? '',
+            'street' =>  $merInfo['street_id'] ?? '',
+            'address' =>  $merInfo['address'] ?? '',
            'bank_username' => $data['bank_username'] ?? '',
            'bank_opening' => $data['bank_opening'] ?? '',
            'bank_front' => $data['bank_front'] ?? '',
@ -206,7 +208,7 @@ class MerchantIntention extends BaseController
        $res = $this->sendMerIntentionApply($sendData, $postUrl);
        if (!$res['ok']) {
            Db::name('merchant_intention')->where('mer_intention_id', $intentionId)->delete();
-            throw new ValidateException('商户交易申请失败，' . $res['msg']);
+            throw new ValidateException('供销平台商户交易申请失败，' . $res['msg']);
        }
        Db::name('merchant')->where('uid', $this->userInfo->uid)->where('status', 1)->update(['business_status'=>1]);
        return app('json')->success('申请成功');
@ -299,7 +301,7 @@ class MerchantIntention extends BaseController
        $postUrl = env('TASK_WORKER_HOST_URL') . '/adminapi/company/createShopMerchant';
        $res = $this->sendMerIntentionApply($sendData, $postUrl);
        if (!$res['ok']) {
-            throw new ValidateException('申请商户入驻失败，' . $res['msg']);
+            throw new ValidateException('供销平台申请商户入驻失败，' . $res['msg']);
        }
        return app('json')->success('修改成功');
    }
--- a/app/controller/api/store/product/CloudWarehouse.php
+++ b/app/controller/api/store/product/CloudWarehouse.php
@ -46,11 +46,12 @@ class CloudWarehouse extends BaseController
     */
    public function index()
    {
-        $typeTownSupplyChainId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeTownSupplyChain'])->value('mer_type_id');
+        // 除了市级供应链都可以查询
+        $typeIdArray = Db::name('MerchantType')->whereNotIn('type_code', Merchant::TypeCode['TypeSupplyChain'])->column('mer_type_id');
        $params = $this->request->params(['category_id', 'street_code', 'order', ['product_type', 0], 'keyword']);
        $search = [
            'street_id' => $params['street_code'],
-            'type_id' => $typeTownSupplyChainId,
+            'type_id' => $typeIdArray ?? [],
            'status' => 1,
            'is_del' => 0,
            'mer_state' => 1,
--- a/app/controller/api/store/product/StoreProduct.php
+++ b/app/controller/api/store/product/StoreProduct.php
@ -66,7 +66,7 @@ class StoreProduct extends BaseController
    public function detail($id)
    {
        $param = $this->request->params(['type', ['product_type', 0]]);
-        $data = $this->repository->detail($id, $this->userInfo,$param['product_type']);
+        $data = $this->repository->detail((int)$id, $this->userInfo, $param['product_type']);
        if (!$data){
            app()->make(SpuRepository::class)->changeStatus($id,0);
            return app('json')->fail('商品已下架');
--- a/app/controller/api/store/product/StoreSpu.php
+++ b/app/controller/api/store/product/StoreSpu.php
@ -42,7 +42,8 @@ class StoreSpu extends BaseController
    public function lst()
    {
        [$page, $limit] = $this->getPage();
-        $typeStoreId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeStore'])->value('mer_type_id');
+        // 除了市级供应链都可以查询
+        $typeIdArray = Db::name('MerchantType')->whereNotIn('type_code', (string)Merchant::TypeCode['TypeSupplyChain'])->column('mer_type_id');
        $where = $this->request->params([
            'keyword',
            'cate_id',
@ -63,8 +64,7 @@ class StoreSpu extends BaseController
        $where['is_gift_bag'] = 0;
        $where['product_type'] = 0;
        $where['order'] = $where['order'] ?: 'star';
-        $where['mer_ids'] = Merchant::getInstance()->where('type_id', $typeStoreId)
-            ->where(['status' => 1, 'mer_state' => 1, 'is_del' => 0])->column('mer_id');
+        $where['mer_ids'] = Merchant::getInstance()->whereIn('type_id', implode(',', $typeIdArray ?? []))->where(['status' => 1, 'mer_state' => 1, 'is_del' => 0])->column('mer_id');
        if ($where['is_trader'] != 1) unset($where['is_trader']);
        $data = $this->repository->getApiSearch($where, $page, $limit, $this->userInfo);
        return app('json')->success($data);
@ -79,7 +79,7 @@ class StoreSpu extends BaseController
    public function streetLst($id)
    {
        [$page, $limit] = $this->getPage();
-        $typeStoreId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeStore'])->value('mer_type_id');
+        $typeIdArray = Db::name('MerchantType')->whereNotIn('type_code', Merchant::TypeCode['TypeCloudWarehouse'] . ',' .Merchant::TypeCode['TypeSupplyChain'])->column('mer_type_id');
        $where = $this->request->params([
            'keyword',
            'cate_id',
@ -100,7 +100,7 @@ class StoreSpu extends BaseController
        $where['is_gift_bag'] = 0;
        $where['product_type'] = 0;
        $where['order'] = $where['order'] ?: 'star';
-        $where['mer_ids'] = Merchant::getInstance()->where('type_id', $typeStoreId)->where('street_id', $id)
+        $where['mer_ids'] = Merchant::getInstance()->whereIn('type_id', implode(',', $typeIdArray ?? []))->where('street_id', $id)
            ->where(['status' => 1, 'mer_state' => 1, 'is_del' => 0])->column('mer_id');
        if ($where['is_trader'] != 1) unset($where['is_trader']);
        $data = $this->repository->getApiSearch($where, $page, $limit, $this->userInfo);
@ -108,7 +108,7 @@ class StoreSpu extends BaseController
    }

    /**
-     * TODO 商户的商品搜索列表
+     * TODO 商户的商品搜索列表 new
     * @param $id
     * @return mixed
     * @author Qinii
@ -143,16 +143,17 @@ class StoreSpu extends BaseController
        ]);
        if ($where['action']) unset($where['product_type']);
        $currentMerchant = Db::name('merchant')->where('mer_id',$id)->field('category_id,street_id')->find();
-        $typeTownSupplyChainId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeTownSupplyChain'])->value('mer_type_id');
+        $typeIdArray = Db::name('MerchantType')->whereIn('type_code', (string)Merchant::TypeCode['TypeTownSupplyChain'])->column('mer_type_id');
+        
        $merIdArray = Db::name('merchant')
            ->where('street_id',$currentMerchant['street_id'])
            ->where('mer_state',1)
            ->where('status',1)
            ->where('category_id',$currentMerchant['category_id'])
-            ->where('type_id', $typeTownSupplyChainId)
+            ->whereIn('type_id', implode(',', $typeIdArray))
            ->column('mer_id');
        $where['mer_array_id'] = $merIdArray;
-        // $where['mer_id'] = $mer_id;
+        $where['mer_rand_id'] = $id;
        $where['entry_mer_id'] = $id;
        $where['is_gift_bag'] = 0;
        $where['order'] = $where['order'] ? $where['order'] : 'sort';
@ -169,7 +170,7 @@ class StoreSpu extends BaseController
    {
        [$page, $limit] = $this->getPage();
        $where = $this->request->params(['common','mer_id']);
-        $typeTownSupplyChainId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeTownSupplyChain'])->value('mer_type_id');
+        $typeIdArray = Db::name('MerchantType')->whereNotIn('type_code', Merchant::TypeCode['TypeCloudWarehouse'] . ',' .Merchant::TypeCode['TypeSupplyChain'])->column('mer_type_id');
        $where['is_gift_bag'] = 0;
        //1:星级
        //2:用户收藏
@ -195,7 +196,7 @@ class StoreSpu extends BaseController
        }
        $where['product_type'] = 0;
        $where['is_stock'] = 1;
-        $where['mer_ids'] = Merchant::getInstance()->where('type_id', $typeTownSupplyChainId)
+        $where['mer_ids'] = Merchant::getInstance()->whereIn('type_id', implode(',', $typeIdArray ??[]))
            ->where(['status' => 1, 'mer_state' => 1, 'is_del' => 0])->column('mer_id');
        $data = $this->repository->getApiSearch($where, $page, $limit, $this->userInfo);
        return app('json')->success($data);
--- a/app/controller/merchant/store/order/Order.php
+++ b/app/controller/merchant/store/order/Order.php
@ -19,6 +19,7 @@ use crmeb\exceptions\UploadException;
 use crmeb\jobs\BatchDeliveryJob;
 use crmeb\services\ExcelService;
 use think\App;
+use think\facade\Db;
 use crmeb\basic\BaseController;
 use app\common\repositories\store\order\StoreOrderRepository as repository;
 use think\facade\Queue;
@ -375,6 +376,21 @@ class Order extends BaseController
        return app('json')->success($this->repository->express($id, $this->request->merId()));
    }

+    /**
+     * 设置取货码
+     */
+    public function qrcode($id)
+    {
+        $storeInfo = Db::name('store_service')->where('mer_id', $this->request->merId())->find();
+        if (!$storeInfo)
+            return app('json')->fail('商户信息有误');
+        $make = app()->make(StoreOrderRepository::class);
+        $order = $make->getWhere(['order_id' => $id, 'mer_id' => $storeInfo['mer_id'], 'is_del' => 0]);
+        if (!$order)
+            return app('json')->fail('订单状态有误');
+        return app('json')->success(['qrcode' => $make->logisticsQrcode($id, $order->order_sn)]);
+    }
+
    /**
     * TODO
     * @param $id
--- a/app/listener/paySuccessMargin.php
+++ b/app/listener/paySuccessMargin.php
@ -1,5 +1,6 @@
 <?php
-declare (strict_types=1);
+
+declare(strict_types=1);

 namespace app\listener;

@ -14,38 +15,40 @@ class paySuccessMargin
    public function handle($event)
    {
        Log::info('微信支付保证金成功回调' . json_encode($event));
-        Db::transaction(function () use ($event) {
-            $order_sn = $event['order_sn'] ?? '';
+        Db::startTrans();
+        try {
+            $order_sn = $event['order_sn'];
            $marginInfo = Db::name('margin_order')->where('order_sn', $order_sn)->find();
-            Db::name('margin_order')->where('order_sn', $order_sn)->update([
-                'paid' => 1,
-                'pay_time' => date('Y-m-d H:i:s')
-            ]);
-            $merchantInfo = Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->find();
+            if ($marginInfo) {
+                Db::name('margin_order')->where('order_id', $marginInfo['order_id'])->update([
+                    'paid' => 1,
+                    'pay_time' => date('Y-m-d H:i:s')
+                ]);
+                $merchantInfo = Db::name('merchant')->where('mer_id', $marginInfo['mer_id'])->where('uid', $marginInfo['uid'])->find();
+                $merchant_type = Db::name('merchant_type')->where('mer_type_id', $merchantInfo['type_id'])->find();

-            $paidMarginAmount = (float)$merchantInfo['paid_margin'] + (float)$marginInfo['total_price'];
-            Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
-                'paid_margin' => $paidMarginAmount
-            ]);
-            $marginAmount = (float)$merchantInfo['margin'] - (float)$marginInfo['total_price'];
-            Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
-                'margin' => $marginAmount
-            ]);
-            $merchantTypeInfo = Db::name('merchant_type')->where('mer_type_id', $merchantInfo['type_id'])->find();
-            if ($merchantTypeInfo['first_margin'] > 0) {
-                if (!$merchantInfo['first_margin_status'] && ($marginInfo['total_price'] <= $merchantTypeInfo['first_margin'])) {
-                    Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
-                        'first_margin_status' => 1
+                //已支付的保证金
+                $paidMarginAmount = bcadd($merchantInfo['paid_margin'], $marginInfo['total_price'], 2);
+                Db::name('merchant')->where('mer_id', $marginInfo['mer_id'])->where('uid', $marginInfo['uid'])->update([
+                    'paid_margin' => $paidMarginAmount,'ot_margin'=>$paidMarginAmount
+                ]);
+                Db::name('merchant')->where('mer_id', $marginInfo['mer_id'])->where('uid', $marginInfo['uid'])->update([
+                    'margin' => 0
+                ]);
+
+                if ($paidMarginAmount ==$merchant_type['margin']) {
+                    Db::name('merchant')->where('mer_id', $marginInfo['mer_id'])->where('uid', $marginInfo['uid'])->update([
+                        'is_margin' => 10
                    ]);
                }
            }
+            // 提交事务
+            Db::commit();
+        } catch (\Exception $e) {
+            Log::error('微信支付保证金失败' . $e->getMessage());
+            // 回滚事务
+            Db::rollback();
+        }

-            if ($marginAmount <= 0) {
-                Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
-                    'is_margin' => 10
-                ]);
-            }
-        });
    }
-
-}
+}
--- a/app/listener/paySuccessOrder.php
+++ b/app/listener/paySuccessOrder.php
@ -47,16 +47,16 @@ class paySuccessOrder
            $this->totalAmount = bcmul($realPrice, (string)$commission_rate, 2);
            $this->remain = $this->totalAmount;

-            $typeTownServerId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeTownServer'])->value('mer_type_id');
-            $typeVillageServerId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeVillageServer'])->value('mer_type_id');
-            $typeTeamServerId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeTeamServer'])->value('mer_type_id');
+            // $typeTownServerId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeTownServer'])->value('mer_type_id');
+            // $typeVillageServerId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeVillageServer'])->value('mer_type_id');
+            // $typeTeamServerId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeTeamServer'])->value('mer_type_id');

-            //镇团队佣金
-            $this->calculate($typeTownServerId, 'commission_to_town_rate');
-            //村团队佣金
-            $this->calculate($typeVillageServerId, 'commission_to_village_rate');
-            //小组服务团队佣金
-            $this->calculate($typeTeamServerId, 'commission_to_service_team_rate');
+            // //镇团队佣金
+            // $this->calculate($typeTownServerId, 'commission_to_town_rate');
+            // //村团队佣金
+            // $this->calculate($typeVillageServerId, 'commission_to_village_rate');
+            // //小组服务团队佣金
+            // $this->calculate($typeTeamServerId, 'commission_to_service_team_rate');

            //订单购物详情表是否有云仓数据
            $orderProduct = Db::name('store_order_product')
--- a/app/validate/admin/MerchantValidate.php
+++ b/app/validate/admin/MerchantValidate.php
@ -33,7 +33,7 @@ class MerchantValidate extends Validate
     * @var array
     */
    protected $rule = [
-        'category_id|商户分类' => 'require',
+        // 'category_id|商户分类' => '',
        'type_id|店铺类型' => 'integer',
        'mer_name|商户名称' => 'require|max:32',
        'mer_account|商户账号' => 'require|alphaNum|min:4|max:16',
--- a/cert_crmeb.key
+++ b/cert_crmeb.key
@ -1 +1 @@
-pGW7pPFlXo9Ex7ZPdlu06BP64TfCI5znDxf7qrBZ2WZxeytwHv3wPtru8i/QOJr/EZtiuPj4JnllFeArvZiqFL/IjYm0OFZjQn4+8dktMn47eD3B7Bwcig8pqc4AHA75G7jj7F94mW965k7lzmufaTLIMmX0BFY5yi2iWILA56pPh92ORC2Z/juM2zr3gWhbv9RGAuOftiBauIZ833GinLSRsBAu41dLydmZSGiL+49UZC50+oz2OEC3WQdluTLyMonpmJ2essaeDufq17/Ng7+ydBEbN2Dx3kdaLLnEgYbGNo74+R5/bCMTFksJX/Y9omD7qycRvaE2WYmZY3IDzw==,ZC9992742
+oTmdaPVqUz9ndM6Hz6BCP69jTcGgOyr6tOoyr4F07TBDjrBagS59ymsz1T/RbaOf/i8qYom+ZZmoczoJk1uJuKpKDhlQtuQENSbl53DCXAjnag+vFypGb7r5VXxvaEDuykqqaS6a0IHIIyE8D9fHnUdx++ioKJ14BGbrVRRhvOhOOUKCoQo7UA9Ad6w/oP7jh0Pjr9o9lHOkuqZDFQUUD0LTs4gZSYwEiFzZF6LiitkoH6WBx614mPUH0gCdb8MyeaUbNkd9UzipO4FUJ0U5X+jj0EZUedfy4VB3BMMoBTBMV5HywcCVOlcrA8dY1E7vjehUrNa/1PR1QYUuPs/dnQ==,
--- a/crmeb/jobs/SendSmsJob.php
+++ b/crmeb/jobs/SendSmsJob.php
@ -35,11 +35,11 @@ class SendSmsJob implements JobInterface
            try {
                /** @var JgPush $client */
                $client = app()->make(JgPush::class);
-                Log::info('app推送发送数据：' . var_export($data, 1));
+                Log::info('JgPush送发送数据：' . json_encode($data));
                $client->send($data['tempId'], $data);
            } catch (\Exception $e) {
-                Log::info('app推送消息发送失败' . var_export($data, 1) . $e->getMessage());
-                DingTalk::exception($e, 'app推送消息发送失败' . var_export($data, 1));
+                Log::info('JgPush推送消息发送失败' . json_encode($data) . ' - ' . $e->getMessage());
+                DingTalk::exception($e, 'JgPush推送消息发送失败' . var_export($data, 1));
            }
        }
        if ($status['notice_sms'] == 1) {
--- a/public/UEditor/dialogs/background/background.css
+++ b/public/UEditor/dialogs/background/background.css
@ -3,8 +3,7 @@
 .tabbody .panel { position: absolute;width:100%; height:100%;background: #fff; display: none;}
 .tabbody .focus { display: block;}

-body{font-size: 12px;color: #888;}
-  /*overflow: hidden;}*/
+body{font-size: 12px;color: #888;overflow: hidden;}
 input,label{vertical-align:middle}
 .clear{clear: both;}
 .pl{padding-left: 18px;padding-left: 23px\9;}
@ -92,4 +91,4 @@ div.alignment,#custom{margin-left: 23px;margin-left: 28px\9;}
    height: 107px;
    border: 3px solid #1094fa;
    background-position: 72px 72px;
-}
+}
--- a/public/UEditor/dialogs/charts/charts.css
+++ b/public/UEditor/dialogs/charts/charts.css
@ -1,11 +1,16 @@
-html, body {
+body {
    width: 100%;
    height: 100%;
    margin: 0;
    padding: 0;
    overflow-x: hidden;
 }
-
+html{
+  width: 100%;
+  margin: 0;
+  padding: 0;
+  overflow-x: hidden;
+}
 .main {
    width: 100%;
    overflow: hidden;
@ -162,4 +167,4 @@ html, body {
    height: 100px;
    line-height: 100px;
    text-align: center;
-}
+}
--- a/public/UEditor/dialogs/video/video.html
+++ b/public/UEditor/dialogs/video/video.html
@ -83,4 +83,4 @@
 <!-- video -->
 <script type="text/javascript" src="video.js"></script>
 </body>
-</html>
+</html>
--- a/public/UEditor/index.html
+++ b/public/UEditor/index.html
@ -19,7 +19,7 @@
 <body>
 <div>
    <h1>完整demo</h1>
-    <script id="editor" type="text/plain" style="width:1024px;height:500px;">${store.summary}</script>
+    <script id="editor" type="text/plain" style="width:1024px;height:500px;">{$food[content]}</script>
 </div>
 <div id="btns">
    <div>
--- a/public/UEditor/themes/default/css/ueditor.css
+++ b/public/UEditor/themes/default/css/ueditor.css
@ -61,7 +61,7 @@ div.edui-box {
 }

 .edui-default .edui-popup {
-    position: relative;
+    position: absolute;
    -webkit-user-select: none;
    -moz-user-select: none;
 }
@ -270,7 +270,7 @@ div.edui-box {
    position: absolute;
    bottom: -25px;
    left: 0;
-    z-index: 2009;
+    z-index: 1009;
    width: 99.9%;
 }

@ -1060,7 +1060,6 @@ div.edui-box {
    background-clip: padding-box;
    padding: 5px;
    background:#ffffff;
-  width: 200px;
 }

 .edui-default .edui-popup .edui-bordereraser {
--- a/public/UEditor/themes/default/css/ueditor.min.css
+++ b/public/UEditor/themes/default/css/ueditor.min.css
--- a/public/UEditor/third-party/SyntaxHighlighter/shCore.js
+++ b/public/UEditor/third-party/SyntaxHighlighter/shCore.js
@ -2435,7 +2435,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter :
        // http://davidchambersdesign.com/
        var keywords   = 'after before beginning continue copy each end every from return get global in local named of set some that the then times to where whose with without';
        var ordinals   = 'first second third fourth fifth sixth seventh eighth ninth tenth last front back middle';
-        var specials   = 'activate add alias AppleScript ask attachment boolean class constant delete duplicate empty exists false id integer list make message modal modified new no paragraph pi properties quit real reconciliation remove rest result reveal reverse run running save string true word yes';
+        var specials   = 'activate add alias AppleScript ask attachment boolean class constant delete duplicate empty exists false id integer list make message modal modified new no paragraph pi properties quit real record remove rest result reveal reverse run running save string true word yes';

        this.regexList = [

@ -2830,7 +2830,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter :
 						'of on or packed pansichar pansistring pchar pcurrency pdatetime pextended ' +
 						'pint64 pointer private procedure program property pshortstring pstring ' +
 						'pvariant pwidechar pwidestring protected public published raise real real48 ' +
-						'reconciliation repeat set shl shortint shortstring shr single smallint string then ' +
+						'record repeat set shl shortint shortstring shr single smallint string then ' +
 						'threadvar to true try type unit until uses val var varirnt while widechar ' +
 						'widestring with word write writeln xor';

--- a/public/UEditor/third-party/highcharts/adapters/mootools-adapter.src.js
+++ b/public/UEditor/third-party/highcharts/adapters/mootools-adapter.src.js
@ -151,7 +151,7 @@ win.HighchartsAdapter = {
 		// run
 		effect.start(params);

-		// reconciliation for use in stop method
+		// record for use in stop method
 		el.fx = effect;
 	},

--- a/public/UEditor/third-party/highcharts/highcharts.src.js
+++ b/public/UEditor/third-party/highcharts/highcharts.src.js
@ -807,7 +807,7 @@ function getTimeTicks(normalizedInterval, min, max, startOfWeek) {
 	}


-	// reconciliation information on the chosen unit - for dynamic label formatter
+	// record information on the chosen unit - for dynamic label formatter
 	tickPositions.info = extend(normalizedInterval, {
 		higherRanks: higherRanks,
 		totalRange: interval * count
@ -2647,7 +2647,7 @@ SVGElement.prototype = {
 					});
 				}

-				// reconciliation correction
+				// record correction
 				wrapper.xCorr = xCorr;
 				wrapper.yCorr = yCorr;
 			}
@ -2663,7 +2663,7 @@ SVGElement.prototype = {
 				height = elem.offsetHeight; // assigned to height for JSLint purpose
 			}

-			// reconciliation current text transform
+			// record current text transform
 			wrapper.cTT = currentTextTransform;
 		}
 	},
@ -4331,7 +4331,7 @@ SVGRenderer.prototype = {
 				});
 			}

-			// reconciliation current values
+			// record current values
 			text.x = x;
 			text.y = y;
 		}
@ -5062,7 +5062,7 @@ Highcharts.VMLElement = VMLElement = {
 					element.parentNode.insertBefore(shadow, element);
 				}

-				// reconciliation it
+				// record it
 				shadows.push(shadow);

 			}
@ -7750,7 +7750,7 @@ Axis.prototype = {
 			// get fixed positions based on tickInterval
 			axis.setTickPositions();

-			// reconciliation old values to decide whether a rescale is necessary later on (#540)
+			// record old values to decide whether a rescale is necessary later on (#540)
 			axis.oldUserMin = axis.userMin;
 			axis.oldUserMax = axis.userMax;

@ -9549,7 +9549,7 @@ Pointer.prototype = {
 			// a selection has been made
 			if (this.hasDragged || hasPinched) {

-				// reconciliation each axis' min and max
+				// record each axis' min and max
 				each(chart.axes, function (axis) {
 					if (axis.zoomEnabled) {
 						var horiz = axis.horiz,
@ -12479,7 +12479,7 @@ Point.prototype = {
 				}
 			}

-			// reconciliation changes in the parallel arrays
+			// record changes in the parallel arrays
 			i = inArray(point, data);
 			series.xData[i] = point.x;
 			series.yData[i] = series.toYData ? series.toYData(point) : point.y;
@ -15499,7 +15499,7 @@ var SplineSeries = extendClass(Series, {
 				leftContY = 2 * plotY - rightContY;
 			}

-			// reconciliation for drawing in next point
+			// record for drawing in next point
 			point.rightContX = rightContX;
 			point.rightContY = rightContY;

@ -15744,7 +15744,7 @@ var ColumnSeries = extendClass(Series, {

 		Series.prototype.translate.apply(series);

-		// reconciliation the new values
+		// record the new values
 		each(series.points, function (point) {
 			var yBottom = pick(point.yBottom, translatedThreshold),
 				plotY = mathMin(mathMax(-999 - yBottom, point.plotY), yAxis.len + 999 + yBottom), // Don't draw too far outside plot area (#1303, #2241)
--- a/public/UEditor/third-party/highcharts/modules/data.src.js
+++ b/public/UEditor/third-party/highcharts/modules/data.src.js
@ -290,7 +290,7 @@
 						// Create new columns with the length of either end-start or rowCount
 						columns[i - startColumn] = [];

-						// Setting the length to avoid jslint warning
+						// SettingMer the length to avoid jslint warning
 						columns[i - startColumn].length = Math.min(rowCount, endRow - startRow);
 					}
 				}
--- a/public/UEditor/third-party/jquery-1.10.2.js
+++ b/public/UEditor/third-party/jquery-1.10.2.js
@ -4429,7 +4429,7 @@ jQuery.extend({
 		type: {
 			set: function( elem, value ) {
 				if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
+					// SettingMer the type on a radio button after the value resets the value in IE6-9
 					// Reset value to default in case type is set after value during creation
 					var val = elem.value;
 					elem.setAttribute( "type", value );
@ -4597,7 +4597,7 @@ if ( !getSetAttribute ) {
 	};

 	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
+	// SettingMer to empty string throws an error as an invalid value
 	jQuery.attrHooks.contenteditable = {
 		set: function( elem, value, name ) {
 			nodeHook.set( elem, value === "" ? false : value, name );
@ -7356,7 +7356,7 @@ if ( !jQuery.support.opacity ) {
 					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
 					style.removeAttribute ) {

-				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+				// SettingMer style.filter to null, "" & " " still leave "filter:" in the cssText
 				// if "filter:" is present at all, clearType is disabled, we want to avoid this
 				// style.removeAttribute is IE Only, but so apparently is this code path...
 				style.removeAttribute( "filter" );
--- a/public/UEditor/third-party/jquery-1.10.2.min.map
+++ b/public/UEditor/third-party/jquery-1.10.2.min.map
--- a/public/UEditor/third-party/video-js/video.dev.js
+++ b/public/UEditor/third-party/video-js/video.dev.js
@ -372,7 +372,7 @@ vjs.cleanUpEvents = function(elem, type) {
  if (data.handlers[type].length === 0) {
    delete data.handlers[type];
    // data.handlers[type] = null;
-    // Setting to null was causing an error with data.handlers
+    // SettingMer to null was causing an error with data.handlers

    // Remove the meta-handler from the element
    if (document.removeEventListener) {
@ -3923,7 +3923,7 @@ vjs.Player.prototype.listenForUserActivity = function(){
    // we consider them active even if they're not moving their finger or mouse.
    // So we want to continue to update that they are active
    clearInterval(mouseInProgress);
-    // Setting userActivity=true now and setting the interval to the same time
+    // SettingMer userActivity=true now and setting the interval to the same time
    // as the activityCheck interval (250) should ensure we never miss the
    // next activityCheck
    mouseInProgress = setInterval(vjs.bind(this, onMouseActivity), 250);
@ -4415,6 +4415,7 @@ vjs.SeekBar.prototype.onMouseMove = function(event){

 vjs.SeekBar.prototype.onMouseUp = function(event){
  vjs.Slider.prototype.onMouseUp.call(this, event);
+
  this.player_.scrubbing = false;
  if (this.videoWasPlaying) {
    this.player_.play();
@ -5531,7 +5532,7 @@ vjs.Flash = vjs.MediaTechController.extend({
        // Not sure why that's a security issue, but apparently it is.
        iDoc.write(vjs.Flash.getEmbedCode(options['swf'], flashVars, params, attributes));

-        // Setting variables on the window needs to come after the doc write because otherwise they can get reset in some browsers
+        // SettingMer variables on the window needs to come after the doc write because otherwise they can get reset in some browsers
        // So far no issues with swf ready event being called before it's set on the window.
        iWin['player'] = this.player_;

--- a/public/UEditor/ueditor.all.js
+++ b/public/UEditor/ueditor.all.js
@ -179,7 +179,6 @@ var browser = UE.browser = function(){
         */
        browser.ie7Compat = ( ( version == 7 && !document.documentMode )
                || document.documentMode == 7 );
-
        /**
         * @property { boolean } ie6Compat 检测浏览器模式是否为 IE6 模式 或者怪异模式
         * @warning 如果浏览器不是IE， 则该值为undefined
@ -12673,7 +12672,7 @@ UE.plugins['paragraph'] = function() {
                        } );
                    }
                    tmpRange.setEndAfter( tmpNode );
-                    
+
                    para = range.document.createElement( style );
                    if(attrs){
                        domUtils.setAttributes(para,attrs);
@ -12685,7 +12684,7 @@ UE.plugins['paragraph'] = function() {
                    //需要内容占位
                    if(domUtils.isEmptyNode(para)){
                        domUtils.fillChar(range.document,para);
-                        
+
                    }

                    tmpRange.insertNode( para );
@ -12809,7 +12808,7 @@ UE.plugins['paragraph'] = function() {

        },
        doDirectionality = function(range,editor,forward){
-            
+
            var bookmark,
                filterFn = function( node ) {
                    return   node.nodeType == 1 ? !domUtils.isBookmarkNode(node) : !domUtils.isWhitespace(node);
@ -20027,6 +20026,14 @@ UE.plugins['table'] = function () {

                var caption = domUtils.findParentByTagName(me.selection.getStart(), 'caption', true),
                    range = me.selection.getRange();
+
+                var child = range.startContainer;
+                if (child != null) {
+                  if (child.tagName == "VIDEO") {
+                    domUtils.remove(child);
+                  }
+                }
+
                if (range.collapsed && caption && isEmptyBlock(caption)) {
                    me.fireEvent('saveScene');
                    var table = caption.parentNode;
@ -22731,7 +22738,7 @@ UE.plugins['formatmatch'] = function(){
     });

    function addList(type,evt){
-        
+
        if(browser.webkit){
            var target = evt.target.tagName == 'IMG' ? evt.target : null;
        }
@ -22797,7 +22804,7 @@ UE.plugins['formatmatch'] = function(){

    me.commands['formatmatch'] = {
        execCommand : function( cmdName ) {
-          
+
            if(flag){
                flag = 0;
                list = [];
@ -22806,7 +22813,7 @@ UE.plugins['formatmatch'] = function(){
            }


-              
+
            var range = me.selection.getRange();
            img = range.getClosedNode();
            if(!img || img.tagName != 'IMG'){
@ -25245,7 +25252,7 @@ UE.ui = baidu.editor.ui = {};
        domUtils = baidu.editor.dom.domUtils,
        UIBase = baidu.editor.ui.UIBase,
        uiUtils = baidu.editor.ui.uiUtils;
-    
+
    var Mask = baidu.editor.ui.Mask = function (options){
        this.initOptions(options);
        this.initUIBase();
@ -25541,7 +25548,7 @@ UE.ui = baidu.editor.ui = {};
        }
    };
    utils.inherits(Popup, UIBase);
-    
+
    domUtils.on( document, 'mousedown', function ( evt ) {
        var el = evt.target || evt.srcElement;
        closeAllPopup( evt,el );
@ -25637,7 +25644,7 @@ UE.ui = baidu.editor.ui = {};
    var utils = baidu.editor.utils,
        uiUtils = baidu.editor.ui.uiUtils,
        UIBase = baidu.editor.ui.UIBase;
-    
+
    var TablePicker = baidu.editor.ui.TablePicker = function (options){
        this.initOptions(options);
        this.initTablePicker();
@ -25721,7 +25728,7 @@ UE.ui = baidu.editor.ui = {};
    var browser = baidu.editor.browser,
        domUtils = baidu.editor.dom.domUtils,
        uiUtils = baidu.editor.ui.uiUtils;
-    
+
    var TPL_STATEFUL = 'onmousedown="$$.Stateful_onMouseDown(event, this);"' +
        ' onmouseup="$$.Stateful_onMouseUp(event, this);"' +
        ( browser.ie ? (
@ -25730,7 +25737,7 @@ UE.ui = baidu.editor.ui = {};
        : (
        ' onmouseover="$$.Stateful_onMouseOver(event, this);"' +
        ' onmouseout="$$.Stateful_onMouseOut(event, this);"' ));
-    
+
    baidu.editor.ui.Stateful = {
        alwalysHoverable: false,
        target:null,//目标元素和this指向dom不一样
@ -27355,7 +27362,7 @@ UE.ui = baidu.editor.ui = {};
        setValue : function(value){
            this._value = value;
        }
-        
+
    };
    utils.inherits(MenuButton, SplitButton);
 })();
@ -28985,7 +28992,7 @@ UE.ui = baidu.editor.ui = {};
            //     }
            // });

-            
+
            for(var key in UE._customizeUI){
                var obj = UE._customizeUI[key]
                var itemUI,index;
--- a/public/UEditor/ueditor.all.min.js
+++ b/public/UEditor/ueditor.all.min.js
--- a/public/UEditor/ueditor.config.js
+++ b/public/UEditor/ueditor.config.js
@ -34,17 +34,17 @@

        // 工具栏上的所有的功能按钮和下拉框，可以在new编辑器的实例时选择自己需要的重新定义
        toolbars: [[
-          'previewmobile', 'source', '|', 'undo', 'redo', '|',
+            'source', '|', 'undo', 'redo', '|',
            'bold', 'italic', 'underline', 'strikethrough', '|', 'superscript', 'subscript', '|', 'forecolor', 'backcolor', '|',
            'removeformat', '|', 'insertorderedlist', 'insertunorderedlist', '|', 'selectall', 'cleardoc', 'paragraph', '|',
            'fontfamily', 'fontsize', '|', 'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|',
-            '|', 'horizontal', 'print',  'drafts', 'formula'
+            'horizontal', 'print',  'drafts', 'formula',
            // 'preview',
        ]],
        // 当鼠标放在工具栏上时显示的tooltip提示,留空支持自动多语言配置，否则以配置值为准
-         labelMap:{
-           'previewmobile':'手机预览'
-        },
+        //, labelMap:{
+        //    'anchor':'', 'undo':''
+        // }

        // 语言配置项,默认是zh-cn。有需要的话也可以使用如下这样的方式来自动多语言切换，当然，前提条件是lang文件夹下存在对应的语言文件：
        // lang值也可以通过自动获取 (navigator.language||navigator.browserLanguage ||navigator.userLanguage).toLowerCase()
@ -56,7 +56,7 @@
        //, theme:'default'
        //, themePath:URL +"themes/"

-        //, zIndex : 900     //编辑器层级的基数,默认是900
+         zIndex : 2008,     //编辑器层级的基数,默认是900

        // 针对getAllHtml方法，会在对应的head标签中增加该编码设置。
        //, charset:"utf-8"
@ -418,7 +418,10 @@
            tt: [],
            u: [],
            ul: ['class', 'style'],
-            video: ['autoplay', 'controls', 'loop', 'preload', 'src', 'height', 'width', 'class', 'style']
+            video: ['autoplay', 'controls', 'loop', 'preload', 'src', 'height', 'width', 'class', 'style'],
+            source: ['src', 'type'],
+            embed: ['type', 'class', 'pluginspage', 'src', 'width', 'height', 'align', 'style', 'wmode', 'play',  'autoplay','loop', 'menu', 'allowscriptaccess', 'allowfullscreen', 'controls', 'preload'],
+            iframe: ['src', 'class', 'height', 'width', 'max-width', 'max-height', 'align', 'frameborder', 'allowfullscreen']
        }
    };

--- a/public/index.html
+++ b/public/index.html
@ -2,4 +2,4 @@
            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
 						if(window.location.protocol == 'https:'){
 							document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">')
-						}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.cd02d553.js></script></body></html>
+						}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.d5d290f7.js></script></body></html>
--- a/public/mer.html
+++ b/public/mer.html
--- a/public/mer/css/app.394c4a4f.css
+++ b/public/mer/css/app.394c4a4f.css
--- a/public/mer/css/chunk-486e108c.1b17f413.css
+++ b/public/mer/css/chunk-486e108c.1b17f413.css
@ -0,0 +1 @@
+.selWidth[data-v-5efee90a]{width:330px}.title[data-v-5efee90a]{margin-bottom:16px;color:#17233d;font-weight:500;font-size:14px}.head[data-v-2f11caa9]{padding:30px 35px 25px}.head .full[data-v-2f11caa9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.head .full .order_icon[data-v-2f11caa9]{width:60px;height:60px}.head .full .iconfont[data-v-2f11caa9]{color:#1890ff}.head .full .iconfont.sale-after[data-v-2f11caa9]{color:#90add5}.head .full .text[data-v-2f11caa9]{-ms-flex-item-align:center;align-self:center;-webkit-box-flex:1;-ms-flex:1;flex:1;min-width:0;padding-left:12px;font-size:13px;color:#606266}.head .full .text .title[data-v-2f11caa9]{margin-bottom:10px;font-weight:500;font-size:16px;line-height:16px;color:rgba(0,0,0,.85)}.head .full .text .order-num[data-v-2f11caa9]{padding-top:10px;white-space:nowrap}.head .list[data-v-2f11caa9]{display:-webkit-box;display:-ms-flexbox;display:flex;margin-top:20px;overflow:hidden;list-style:none;padding:0}.head .list .item[data-v-2f11caa9]{-webkit-box-flex:0;-ms-flex:none;flex:none;width:200px;font-size:14px;line-height:14px;color:rgba(0,0,0,.85)}.head .list .item .title[data-v-2f11caa9]{margin-bottom:12px;font-size:13px;line-height:13px;color:#666}.head .list .item .value1[data-v-2f11caa9]{color:#f56022}.head .list .item .value2[data-v-2f11caa9]{color:#1bbe6b}.head .list .item .value3[data-v-2f11caa9]{color:#1890ff}.head .list .item .value4[data-v-2f11caa9]{color:#6a7b9d}.head .list .item .value5[data-v-2f11caa9]{color:#f5222d}.el-tabs--border-card[data-v-2f11caa9]{-webkit-box-shadow:none;box-shadow:none;border-bottom:none}.section[data-v-2f11caa9]{padding:20px 0 5px;border-bottom:1px dashed #eee}.section .title[data-v-2f11caa9]{padding-left:10px;border-left:3px solid #1890ff;font-size:15px;line-height:15px;color:#303133}.section .list[data-v-2f11caa9]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;list-style:none;padding:0}.section .item[data-v-2f11caa9]{-webkit-box-flex:0;-ms-flex:0 0 33.33333%;flex:0 0 33.33333%;display:-webkit-box;display:-ms-flexbox;display:flex;margin-top:16px;font-size:13px;color:#606266}.section .item[data-v-2f11caa9]:nth-child(3n+1){padding-right:20px}.section .item[data-v-2f11caa9]:nth-child(3n+2){padding-right:10px;padding-left:10px}.section .item[data-v-2f11caa9]:nth-child(3n+3){padding-left:20px}.section .value[data-v-2f11caa9]{-webkit-box-flex:1;-ms-flex:1;flex:1}.section .value image[data-v-2f11caa9]{display:inline-block;width:40px;height:40px;margin:0 12px 12px 0;vertical-align:middle}.tab[data-v-2f11caa9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.tab .el-image[data-v-2f11caa9]{width:36px;height:36px;margin-right:10px}[data-v-2f11caa9] .el-drawer__body{overflow:auto}.gary[data-v-2f11caa9]{color:#aaa}.logistics[data-v-2f11caa9]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:10px 0}.logistics .logistics_img[data-v-2f11caa9]{width:45px;height:45px;margin-right:12px}.logistics .logistics_img img[data-v-2f11caa9]{width:100%;height:100%}.logistics .logistics_cent span[data-v-2f11caa9]{display:block;font-size:12px}.tabBox_tit[data-v-2f11caa9]{width:53%;font-size:12px!important;margin:0 2px 0 10px;letter-spacing:1px;padding:5px 0;-webkit-box-sizing:border-box;box-sizing:border-box}.title[data-v-96d4296a]{margin-bottom:16px;color:#17233d;font-weight:500;font-size:14px}.description-term[data-v-96d4296a]{display:table-cell;padding-bottom:10px;line-height:20px;width:50%;font-size:12px}.pictures[data-v-64c2d971]{max-width:100%}.area-desc[data-v-64c2d971]{margin:0;color:#999;font-size:12px}.selWidth[data-v-64c2d971]{width:300px}.spBlock[data-v-64c2d971]{cursor:pointer;display:block;padding:5px 0}.check[data-v-64c2d971]{color:#00a2d4}.el-dropdown-link[data-v-64c2d971]{cursor:pointer;color:#409eff;font-size:12px}.el-icon-arrow-down[data-v-64c2d971]{font-size:12px}.tabBox_tit[data-v-64c2d971]{width:53%;font-size:12px!important;margin:0 2px 0 10px;letter-spacing:1px;padding:5px 0;-webkit-box-sizing:border-box;box-sizing:border-box}[data-v-64c2d971] .row-bg .cell{color:red!important}.headTab[data-v-64c2d971]{position:relative}.headTab .headBtn[data-v-64c2d971]{position:absolute;right:0;top:-6px}.dropdown[data-v-64c2d971]{padding:0 10px;border:1px solid #409eff;margin-right:10px;line-height:28px;border-radius:4px}
--- a/public/mer/css/chunk-52a0f962.fa9b3ceb.css
+++ b/public/mer/css/chunk-52a0f962.fa9b3ceb.css
@ -0,0 +1 @@
+.title[data-v-3500ed7a]{margin-bottom:16px;color:#17233d;font-weight:500;font-size:14px}.description-term[data-v-3500ed7a]{display:table-cell;padding-bottom:10px;line-height:20px;width:50%;font-size:12px}[data-v-3cd1b9b0] .el-cascader{display:block}.dialog-scustom[data-v-3cd1b9b0]{width:1200px;height:600px}.ela-btn[data-v-3cd1b9b0]{color:#2d8cf0}.Box .ivu-radio-wrapper[data-v-3cd1b9b0]{margin-right:25px}.Box .numPut[data-v-3cd1b9b0]{width:80%!important}.lunBox[data-v-3cd1b9b0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;border:1px solid #0bb20c}.pictrueBox[data-v-3cd1b9b0]{display:inline-block}.pictrue[data-v-3cd1b9b0]{width:50px;height:50px;border:1px dotted rgba(0,0,0,.1);display:inline-block;position:relative;cursor:pointer}.pictrue img[data-v-3cd1b9b0]{width:100%;height:100%}.pictrueTab[data-v-3cd1b9b0]{width:40px!important;height:40px!important}.upLoad[data-v-3cd1b9b0]{width:40px;height:40px;border:1px dotted rgba(0,0,0,.1);border-radius:4px;background:rgba(0,0,0,.02);cursor:pointer}.ft[data-v-3cd1b9b0]{color:red}.buttonGroup[data-v-3cd1b9b0]{position:relative;display:inline-block;vertical-align:middle;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-tap-highlight-color:rgba(0,0,0,0)}.buttonGroup .small-btn[data-v-3cd1b9b0]{position:relative;float:left;height:24px;padding:0 7px;font-size:14px;border-radius:3px}.buttonGroup .small-btn[data-v-3cd1b9b0]:first-child{margin-left:0;border-bottom-right-radius:0;border-top-right-radius:0}.virtual_boder[data-v-3cd1b9b0]{border:1px solid #1890ff}.virtual_boder2[data-v-3cd1b9b0]{border:1px solid #e7e7e7}.virtual_san[data-v-3cd1b9b0]{position:absolute;bottom:0;right:0;width:0;height:0;border-bottom:26px solid #1890ff;border-left:26px solid transparent}.virtual_dui[data-v-3cd1b9b0]{position:absolute;bottom:-2px;right:2px;color:#fff;font-family:system-ui}.virtual[data-v-3cd1b9b0]{width:120px;height:60px;background:#fff;border-radius:3px;float:left;text-align:center;padding-top:8px;position:relative;cursor:pointer;line-height:23px}.virtual .virtual_top[data-v-3cd1b9b0]{font-size:14px;font-weight:600;color:rgba(0,0,0,.85)}.virtual .virtual_bottom[data-v-3cd1b9b0]{font-size:12px;font-weight:400;color:#999}.virtual[data-v-3cd1b9b0]:nth-child(2n){margin:0 12px}[data-v-5e47370c] .el-cascader{display:block}.ela-btn[data-v-5e47370c]{color:#2d8cf0}.priceBox[data-v-5e47370c]{width:80px}.pictrue[data-v-5e47370c]{width:50px;height:50px;border:1px dotted rgba(0,0,0,.1);display:inline-block;position:relative;cursor:pointer}.pictrue img[data-v-5e47370c]{width:100%;height:100%}[data-v-5e47370c] .el-input-number__decrease,[data-v-5e47370c] .el-input-number__increase{display:none}[data-v-5e47370c] .el-input-number.is-controls-right .el-input__inner,[data-v-5e47370c] .el-input__inner{padding:0 5px}.pictrueTab[data-v-5e47370c]{width:40px!important;height:40px!important}.upLoad[data-v-5e47370c]{width:40px;height:40px;border:1px dotted rgba(0,0,0,.1);border-radius:4px;background:rgba(0,0,0,.02);cursor:pointer}.bg[data-v-2060f2ce]{z-index:100;position:fixed;left:0;top:0;width:100%;height:100%;background:rgba(0,0,0,.5)}.goods_detail .goods_detail_wrapper[data-v-2060f2ce]{z-index:-10}[data-v-2060f2ce] table.el-input__inner{padding:0}.demo-table-expand[data-v-2060f2ce]{font-size:0}.demo-table-expand1[data-v-2060f2ce] label{width:77px!important;color:#99a9bf}.demo-table-expand .el-form-item[data-v-2060f2ce]{margin-right:0;margin-bottom:0;width:33.33%}.selWidth[data-v-2060f2ce]{width:350px!important}.seachTiele[data-v-2060f2ce]{line-height:35px}
--- a/public/mer/css/chunk-546dc2ee.8760fd66.css
+++ b/public/mer/css/chunk-546dc2ee.8760fd66.css
@ -0,0 +1 @@
+[data-v-2f60d12b] .el-form-item__content{position:static}.box-container[data-v-ca473d28]{overflow:hidden}.box-container .list[data-v-ca473d28]{float:left;line-height:40px}.box-container .sp[data-v-ca473d28]{width:50%}.box-container .sp3[data-v-ca473d28]{width:33.3333%}.box-container .sp100[data-v-ca473d28]{width:100%}.box-container .list .name[data-v-ca473d28]{display:inline-block;width:150px;text-align:right;color:#606266}.box-container .list .blue[data-v-ca473d28]{color:#1890ff}.box-container .list.image[data-v-ca473d28]{margin-bottom:40px}.box-container .list.image img[data-v-ca473d28]{position:relative;top:40px}.el-textarea[data-v-ca473d28]{width:400px}.copyBtn[data-v-ca473d28]{padding:6px 10px}.modalbox[data-v-4d63497b] .el-dialog{min-width:550px}.selWidth[data-v-4d63497b]{width:400px}.seachTiele[data-v-4d63497b]{line-height:35px}.fa[data-v-4d63497b]{color:#0a6aa1;display:block}.sheng[data-v-4d63497b]{color:red;display:block}
--- a/public/mer/css/chunk-7f2544fe.1f63454c.css
+++ b/public/mer/css/chunk-7f2544fe.1f63454c.css
--- a/public/mer/css/chunk-9d6d22b0.ff0afa57.css
+++ b/public/mer/css/chunk-9d6d22b0.ff0afa57.css
@ -0,0 +1 @@
+.box-container[data-v-71c7a22c]{overflow:hidden}.box-container .list[data-v-71c7a22c]{float:left;line-height:40px}.box-container .sp[data-v-71c7a22c]{width:50%}.box-container .sp3[data-v-71c7a22c]{width:33.3333%}.box-container .sp100[data-v-71c7a22c]{width:100%}.box-container .list .name[data-v-71c7a22c]{display:inline-block;width:150px;text-align:right;color:#606266}.box-container .list .blue[data-v-71c7a22c]{color:#1890ff}.box-container .list.image[data-v-71c7a22c]{margin-bottom:40px}.box-container .list.image img[data-v-71c7a22c]{position:relative;top:40px}.el-textarea[data-v-71c7a22c]{width:400px}.customHeight[data-v-aed747c2]{height:800px}.container[data-v-76a17d47]{margin-top:30px;text-align:right}.customHeight[data-v-76a17d47]{height:800px}.table-cont[data-v-76a17d47]{max-height:300px;overflow-y:scroll}.modalbox[data-v-4e9cef11] .el-dialog{min-width:550px}.selWidth[data-v-4e9cef11]{width:400px}.seachTiele[data-v-4e9cef11]{line-height:35px}.fa[data-v-4e9cef11]{color:#0a6aa1;display:block}.sheng[data-v-4e9cef11]{color:red;display:block}
--- a/public/mer/css/chunk-dadf4114.6823e97f.css
+++ b/public/mer/css/chunk-dadf4114.6823e97f.css
--- a/public/mer/css/chunk-libs.d3e86ffa.css
+++ b/public/mer/css/chunk-libs.d3e86ffa.css
--- a/public/mer/img/iconfont.e9f41a95.svg
+++ b/public/mer/img/iconfont.e9f41a95.svg
--- a/public/mer/js/app.eced62c7.js
+++ b/public/mer/js/app.eced62c7.js
--- a/public/mer/js/chunk-00584afe.bd702eea.js
+++ b/public/mer/js/chunk-00584afe.bd702eea.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-00584afe"],{"94ad":function(t,e,a){"use strict";a("f851")},e15a:function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("div",{staticClass:"container"},[a("el-form",{attrs:{inline:""}},[a("el-form-item",{staticClass:"mr10",attrs:{label:"搜索:"}},[a("el-input",{staticClass:"selWidth",attrs:{placeholder:"请输入物流公司名称或者编码"},on:{input:function(e){return t.getList(1)}},model:{value:t.tableFrom.keyword,callback:function(e){t.$set(t.tableFrom,"keyword",e)},expression:"tableFrom.keyword"}}),t._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:function(e){return t.getList(1)}}},[t._v("搜索")])],1)],1)],1)]),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.listLoading,expression:"listLoading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"mini"}},[a("el-table-column",{attrs:{prop:"id",label:"ID","min-width":"150"}}),t._v(" "),a("el-table-column",{attrs:{prop:"name",label:"物流公司名称","min-width":"200"}}),t._v(" "),a("el-table-column",{attrs:{prop:"code",label:"编码","min-width":"200"}}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"80",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(e){return[1==e.row.partner_id||1==e.row.partner_key||1==e.row.net_name?a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.handleEdit(e.row.id)}}},[t._v("月结账号编辑")]):t._e()]}}])})],1),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},n=[],l=a("8593"),s={name:"ExpressFreight",data:function(){return{tableData:{data:[],total:0},listLoading:!0,tableFrom:{page:1,limit:20,date:"",keyword:""},tabClickIndex:""}},mounted:function(){this.getList(1)},methods:{handleEdit:function(t){var e=this;this.$modalForm(Object(l["a"])(t)).then((function(){return e.getList("")}))},getList:function(t){var e=this;this.listLoading=!0,this.tableFrom.page=t||this.tableFrom.page,Object(l["p"])(this.tableFrom).then((function(t){e.tableData.data=t.data.list,e.tableData.total=t.data.count,e.listLoading=!1})).catch((function(t){e.listLoading=!1,e.$message.error(t.message)}))},pageChange:function(t){this.tableFrom.page=t,this.getList("")},handleSizeChange:function(t){this.tableFrom.limit=t,this.getList("")}}},o=s,r=(a("94ad"),a("2877")),c=Object(r["a"])(o,i,n,!1,null,"66122ae6",null);e["default"]=c.exports},f851:function(t,e,a){}}]);
--- a/public/mer/js/chunk-02ea1cc8.f5253547.js
+++ b/public/mer/js/chunk-02ea1cc8.f5253547.js
--- a/public/mer/js/chunk-031de214.328a7c6e.js
+++ b/public/mer/js/chunk-031de214.328a7c6e.js
--- a/public/mer/js/chunk-03944393.d4f326f6.js
+++ b/public/mer/js/chunk-03944393.d4f326f6.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-03944393"],{"26f0":function(t,e,i){"use strict";i("78e5")},"283f":function(t,e,i){"use strict";i.r(e);var l=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{staticClass:"divBox"},[i("div",{staticClass:"header clearfix"},[i("div",{staticClass:"filter-container"},[i("div",{staticClass:"demo-input-suffix acea-row"},[i("span",{staticClass:"seachTiele"},[t._v("商品搜索：")]),t._v(" "),i("el-input",{staticClass:"selWidth",attrs:{placeholder:"请输入商品名称，关键字，产品编号",size:"small"},model:{value:t.tableFrom.keyword,callback:function(e){t.$set(t.tableFrom,"keyword",e)},expression:"tableFrom.keyword"}},[i("el-button",{staticClass:"el-button-solt",attrs:{slot:"append",icon:"el-icon-search",size:"small"},on:{click:function(e){return t.getList()}},slot:"append"})],1)],1)])]),t._v(" "),i("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.listLoading,expression:"listLoading"}],ref:"multipleSelection",staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"mini","highlight-current-row":"","row-key":function(t){return t.id}},on:{"selection-change":t.handleSelectionChange}},[i("el-table-column",{attrs:{type:"selection",width:"55"}}),t._v(" "),i("el-table-column",{attrs:{prop:"broadcast_goods_id",label:"ID","min-width":"50"}}),t._v(" "),i("el-table-column",{attrs:{label:"商品图","min-width":"80"},scopedSlots:t._u([{key:"default",fn:function(t){return[i("div",{staticClass:"demo-image__preview"},[i("el-image",{staticStyle:{width:"36px",height:"36px"},attrs:{src:t.row.cover_img,"preview-src-list":[t.row.cover_img]}})],1)]}}])}),t._v(" "),i("el-table-column",{attrs:{prop:"name",label:"商品名称","min-width":"200"}})],1),t._v(" "),i("div",{staticClass:"block mb20"},[i("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)},a=[],n=(i("ac6a"),i("b7be")),o=i("83d6"),s={name:"GoodList",data:function(){return{templateRadio:0,merCateList:[],roterPre:o["roterPre"],listLoading:!0,tableData:{data:[],total:0},tableFrom:{page:1,limit:20,status_tag:1,keyword:"",mer_valid:1},multipleSelectionAll:window.form_create_helper.get(this.$route.query.field)||[],multipleSelection:[],checked:[],broadcast_room_id:""}},mounted:function(){this.getList();var t=[];this.multipleSelectionAll=t,form_create_helper.onOk(this.unloadHandler)},methods:{unloadHandler:function(){this.multipleSelectionAll.length>0?this.$route.query.field&&(form_create_helper.set(this.$route.query.field,this.multipleSelectionAll.map((function(t){return{id:t.product_id,src:t.cover_img}}))),console.log(this.multipleSelectionAll),localStorage.setItem("broadcastPro",JSON.stringify(this.multipleSelectionAll))):this.$message.warning("请先选择商品")},handleSelectionChange:function(t){var e=this;this.multipleSelection=t,this.multipleSelectionAll=t,setTimeout((function(){e.changePageCoreRecordData()}),50)},setSelectRow:function(){if(this.multipleSelectionAll&&!(this.multipleSelectionAll.length<=0)){var t=this.idKey,e=[];this.multipleSelectionAll.forEach((function(i){e.push(i[t])})),this.$refs.table.clearSelection();for(var i=0;i<this.tableData.data.length;i++)e.indexOf(this.tableData.data[i][t])>=0&&this.$refs.table.toggleRowSelection(this.tableData.data[i],!0)}},changePageCoreRecordData:function(){var t=this.idKey,e=this;if(this.multipleSelectionAll.length<=0)this.multipleSelectionAll=this.multipleSelection;else{var i=[];this.multipleSelectionAll.forEach((function(e){i.push(e[t])}));var l=[];this.multipleSelection.forEach((function(a){l.push(a[t]),i.indexOf(a[t])<0&&e.multipleSelectionAll.push(a)}));var a=[];this.tableData.data.forEach((function(e){l.indexOf(e[t])<0&&a.push(e[t])})),a.forEach((function(l){if(i.indexOf(l)>=0)for(var a=0;a<e.multipleSelectionAll.length;a++)if(e.multipleSelectionAll[a][t]==l){e.multipleSelectionAll.splice(a,1);break}}))}},getList:function(){var t=this;this.listLoading=!0,Object(n["j"])(this.tableFrom).then((function(e){t.tableData.data=[],t.tableData.data=e.data.list,t.tableData.total=e.data.count,t.$nextTick((function(){this.setSelectRow()})),t.listLoading=!1})).catch((function(e){t.listLoading=!1,t.$message.error(e.message)}))},pageChange:function(t){this.changePageCoreRecordData(),this.tableFrom.page=t,this.getList()},handleSizeChange:function(t){this.changePageCoreRecordData(),this.tableFrom.limit=t,this.getList()}}},r=s,c=(i("26f0"),i("2877")),h=Object(c["a"])(r,l,a,!1,null,"35e2eac8",null);e["default"]=h.exports},"78e5":function(t,e,i){}}]);
--- a/public/mer/js/chunk-03cdbf88.51814491.js
+++ b/public/mer/js/chunk-03cdbf88.51814491.js
--- a/public/mer/js/chunk-048e53ee.bec8c769.js
+++ b/public/mer/js/chunk-048e53ee.bec8c769.js
--- a/public/mer/js/chunk-0493956f.d1762138.js
+++ b/public/mer/js/chunk-0493956f.d1762138.js
--- a/public/mer/js/chunk-09296115.94eeb932.js
+++ b/public/mer/js/chunk-09296115.94eeb932.js
--- a/public/mer/js/chunk-0b1f3772.f5dc427b.js
+++ b/public/mer/js/chunk-0b1f3772.f5dc427b.js
--- a/public/mer/js/chunk-0d2c1415.5909de03.js
+++ b/public/mer/js/chunk-0d2c1415.5909de03.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0d2c1415","chunk-2d0da983"],{4553:function(e,t,i){"use strict";i.r(t);var o=function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",[i("div",{staticClass:"mt20 ml20"},[i("el-input",{staticStyle:{width:"300px"},attrs:{placeholder:"请输入视频链接"},model:{value:e.videoLink,callback:function(t){e.videoLink=t},expression:"videoLink"}}),e._v(" "),i("input",{ref:"refid",staticStyle:{display:"none"},attrs:{type:"file"},on:{change:e.zh_uploadFile_change}}),e._v(" "),i("el-button",{staticClass:"ml10",attrs:{type:"primary",icon:"ios-cloud-upload-outline"},on:{click:e.zh_uploadFile}},[e._v(e._s(e.videoLink?"确认添加":"上传视频"))]),e._v(" "),e.upload.videoIng?i("el-progress",{staticStyle:{"margin-top":"20px"},attrs:{"stroke-width":20,percentage:e.progress,"text-inside":!0}}):e._e(),e._v(" "),e.formValidate.video_link?i("div",{staticClass:"iview-video-style"},[i("video",{staticStyle:{width:"100%",height:"100%!important","border-radius":"10px"},attrs:{src:e.formValidate.video_link,controls:"controls"}},[e._v("\n        您的浏览器不支持 video 标签。\n      ")]),e._v(" "),i("div",{staticClass:"mark"}),e._v(" "),i("i",{staticClass:"iconv el-icon-delete",on:{click:e.delVideo}})]):e._e()],1),e._v(" "),i("div",{staticClass:"mt50 ml20"},[i("el-button",{attrs:{type:"primary"},on:{click:e.uploads}},[e._v("确认")])],1)])},a=[],n=(i("7f7f"),i("c4c8")),s=(i("6bef"),{name:"Vide11o",props:{isDiy:{type:Boolean,default:!1}},data:function(){return{upload:{videoIng:!1},progress:20,videoLink:"",formValidate:{video_link:""}}},methods:{delVideo:function(){var e=this;e.$set(e.formValidate,"video_link","")},zh_uploadFile:function(){this.videoLink?this.formValidate.video_link=this.videoLink:this.$refs.refid.click()},zh_uploadFile_change:function(e){var t=this,i=e.target.files[0].name.substr(e.target.files[0].name.indexOf("."));if(".mp4"!==i)return t.$message.error("只能上传MP4文件");Object(n["db"])().then((function(i){t.$videoCloud.videoUpload({type:i.data.type,evfile:e,res:i,uploading:function(e,i){t.upload.videoIng=e,console.log(e,i)}}).then((function(e){t.formValidate.video_link=e.url||e.data.src,t.$message.success("视频上传成功"),t.progress=100,t.upload.videoIng=!1})).catch((function(e){t.$message.error(e)}))}))},uploads:function(){this.formValidate.video_link||this.videoLink?!this.videoLink||this.formValidate.video_link?this.isDiy?this.$emit("getVideo",this.formValidate.video_link):nowEditor&&(nowEditor.dialog.close(!0),nowEditor.editor.setContent("<video src='"+this.formValidate.video_link+"' controls='controls'></video>",!0)):this.$message.error("请点击确认添加按钮！"):this.$message.error("您还没有上传视频！")}}}),r=s,d=(i("8307"),i("2877")),l=Object(d["a"])(r,o,a,!1,null,"732b6bbd",null);t["default"]=l.exports},"6bef":function(e,t,i){"use strict";i.r(t);i("28a5"),i("a481");(function(){if(window.frameElement&&window.frameElement.id){var e=window.parent,t=e.$EDITORUI[window.frameElement.id.replace(/_iframe$/,"")],i=t.editor,o=e.UE,a=o.dom.domUtils,n=o.utils,s=(o.browser,o.ajax,function(e){return document.getElementById(e)});window.nowEditor={editor:i,dialog:t},n.loadFile(document,{href:i.options.themePath+i.options.theme+"/dialogbase.css?cache="+Math.random(),tag:"link",type:"text/css",rel:"stylesheet"});var r=i.getLang(t.className.split("-")[2]);r&&a.on(window,"load",(function(){var e=i.options.langPath+i.options.lang+"/images/";for(var t in r["static"]){var o=s(t);if(o){var d=o.tagName,l=r["static"][t];switch(l.src&&(l=n.extend({},l,!1),l.src=e+l.src),l.style&&(l=n.extend({},l,!1),l.style=l.style.replace(/url\s*\(/g,"url("+e)),d.toLowerCase()){case"var":o.parentNode.replaceChild(document.createTextNode(l),o);break;case"select":for(var c,u=o.options,v=0;c=u[v];)c.innerHTML=l.options[v++];for(var p in l)"options"!=p&&o.setAttribute(p,l[p]);break;default:a.setAttributes(o,l)}}}}))}})()},8307:function(e,t,i){"use strict";i("f5ee")},f5ee:function(e,t,i){}}]);
--- a/public/mer/js/chunk-0fa0e81e.2e32067a.js
+++ b/public/mer/js/chunk-0fa0e81e.2e32067a.js
--- a/public/mer/js/chunk-1306dfb6.18d6f5b2.js
+++ b/public/mer/js/chunk-1306dfb6.18d6f5b2.js
--- a/public/mer/js/chunk-154b4748.e97f6746.js
+++ b/public/mer/js/chunk-154b4748.e97f6746.js
--- a/public/mer/js/chunk-18fda1e0.e001e47f.js
+++ b/public/mer/js/chunk-18fda1e0.e001e47f.js
--- a/public/mer/js/chunk-1df22872.81e310c6.js
+++ b/public/mer/js/chunk-1df22872.81e310c6.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-1df22872"],{"0bd9":function(t,e,a){},"7b74":function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("div",{staticClass:"container"},[a("el-form",{attrs:{size:"small","label-width":"84px"}},[a("el-form-item",{staticClass:"width100",attrs:{label:"模板名称："}},[a("el-input",{staticClass:"selWidth",attrs:{placeholder:"请输入模板名称",size:"small"},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.getList(e)}},model:{value:t.tableFrom.name,callback:function(e){t.$set(t.tableFrom,"name",e)},expression:"tableFrom.name"}},[a("el-button",{staticClass:"el-button-solt",attrs:{slot:"append",icon:"el-icon-search",size:"small"},on:{click:t.getList},slot:"append"})],1)],1)],1)],1),t._v(" "),a("el-button",{attrs:{size:"small",type:"primary"},on:{click:t.add}},[t._v("添加运费模板")])],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.listLoading,expression:"listLoading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"samll","highlight-current-row":""}},[a("el-table-column",{attrs:{prop:"shipping_template_id",label:"ID","min-width":"60"}}),t._v(" "),a("el-table-column",{attrs:{prop:"name",label:"模板名称","min-width":"150"}}),t._v(" "),a("el-table-column",{attrs:{label:"计费方式","min-width":"100"},scopedSlots:t._u([{key:"default",fn:function(e){var i=e.row;return[a("span",[t._v(t._s(t._f("typeFilter")(i.type)))])]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"指定包邮","min-width":"100"},scopedSlots:t._u([{key:"default",fn:function(e){var i=e.row;return[a("span",[t._v(t._s(t._f("statusFilter")(i.appoint)))])]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"指定区域不配送","min-width":"150"},scopedSlots:t._u([{key:"default",fn:function(e){var i=e.row;return[a("span",[t._v(t._s(t._f("statusFilter")(i.undelivery)))])]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"sort",label:"排序","min-width":"100"}}),t._v(" "),a("el-table-column",{attrs:{prop:"create_time",label:"创建时间","min-width":"150"}}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"100",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.onEdit(e.row.shipping_template_id)}}},[t._v("编辑")]),t._v(" "),a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.handleDelete(e.row.shipping_template_id,e.$index)}}},[t._v("删除")])]}}])})],1),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},l=[],n=a("8a9d"),s={name:"ShippingTemplates",filters:{statusFilter:function(t){var e={1:"自定义",2:"开启",0:"关闭"};return e[t]},typeFilter:function(t){var e={0:"按件数",1:"按重量",2:"按体积"};return e[t]}},data:function(){return{dialogVisible:!1,tableFrom:{page:1,limit:20,name:""},tableData:{data:[],total:0},listLoading:!0,componentKey:0}},mounted:function(){this.getList()},methods:{add:function(){var t=this;this.$modalTemplates(0,(function(){t.getList()}))},getList:function(){var t=this;this.listLoading=!0,Object(n["e"])(this.tableFrom).then((function(e){t.tableData.data=e.data.list,t.tableData.total=e.data.count,t.listLoading=!1})).catch((function(e){t.listLoading=!1,t.$message.error(e.message)}))},pageChange:function(t){this.tableFrom.page=t,this.getList()},handleSizeChange:function(t){this.tableFrom.limit=t,this.getList()},onEdit:function(t){var e=this;this.$modalTemplates(t,(function(){e.getList()}),this.componentKey+=1)},handleDelete:function(t,e){var a=this;this.$modalSure().then((function(){Object(n["c"])(t).then((function(t){var i=t.message;a.$message.success(i),a.tableData.data.splice(e,1)})).catch((function(t){var e=t.message;a.$message.error(e)}))}))}}},o=s,r=(a("8ad1"),a("2877")),c=Object(r["a"])(o,i,l,!1,null,"21e688d4",null);e["default"]=c.exports},"8ad1":function(t,e,a){"use strict";a("0bd9")}}]);
--- a/public/mer/js/chunk-2d0ab2c5.d09da955.js
+++ b/public/mer/js/chunk-2d0ab2c5.d09da955.js
--- a/public/mer/js/chunk-2d0aba79.c56ad754.js
+++ b/public/mer/js/chunk-2d0aba79.c56ad754.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0aba79"],{"15cb":function(t,e,a){"use strict";a.r(e);var n=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("el-button",{attrs:{size:"small",type:"primary"},on:{click:t.onAdd}},[t._v("添加用户标签")])],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.listLoading,expression:"listLoading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"small","highlight-current-row":""}},[a("el-table-column",{attrs:{label:"ID","min-width":"60"},scopedSlots:t._u([{key:"default",fn:function(e){var n=e.row;return[a("span",{domProps:{textContent:t._s(-1!==t.$route.path.indexOf("group")?n.group_id:n.label_id)}})]}}])}),t._v(" "),a("el-table-column",{attrs:{label:-1!==t.$route.path.indexOf("group")?"分组名称":"标签名称","min-width":"180"},scopedSlots:t._u([{key:"default",fn:function(e){var n=e.row;return[a("span",{domProps:{textContent:t._s(-1!==t.$route.path.indexOf("group")?n.group_name:n.label_name)}})]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"create_time",label:"创建时间","min-width":"150"}}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"100",fixed:"right",align:"center"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){t.onEdit(-1!==t.$route.path.indexOf("group")?e.row.group_id:e.row.label_id)}}},[t._v("编辑")]),t._v(" "),a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){t.handleDelete(-1!==t.$route.path.indexOf("group")?e.row.group_id:e.row.label_id,e.$index)}}},[t._v("删除")])]}}])})],1),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},i=[],o=a("c24f"),l={name:"UserGroup",data:function(){return{tableFrom:{page:1,limit:20},tableData:{data:[],total:0},listLoading:!0}},mounted:function(){this.getList()},methods:{getList:function(){var t=this;this.listLoading=!0,Object(o["p"])(this.tableFrom).then((function(e){t.tableData.data=e.data.list,t.tableData.total=e.data.count,t.listLoading=!1})).catch((function(e){t.listLoading=!1,t.$message.error(e.message)}))},pageChange:function(t){this.tableFrom.page=t,this.getList()},handleSizeChange:function(t){this.tableFrom.limit=t,this.getList()},onAdd:function(){var t=this;this.$modalForm(Object(o["o"])()).then((function(){return t.getList()}))},onEdit:function(t){var e=this;this.$modalForm(Object(o["n"])(t)).then((function(){return e.getList()}))},handleDelete:function(t,e){var a=this;this.$modalSure("删除该标签").then((function(){Object(o["m"])(t).then((function(t){var n=t.message;a.$message.success(n),a.tableData.data.splice(e,1)})).catch((function(t){var e=t.message;a.$message.error(e)}))}))}}},s=l,r=a("2877"),c=Object(r["a"])(s,n,i,!1,null,"d05d8040",null);e["default"]=c.exports}}]);
--- a/public/mer/js/chunk-2d0aed35.78b0a18b.js
+++ b/public/mer/js/chunk-2d0aed35.78b0a18b.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0aed35"],{"0c5a":function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},c=[],r=t("2877"),a={},l=Object(r["a"])(a,u,c,!1,null,null,null);n["default"]=l.exports}}]);
--- a/public/mer/js/chunk-2d0b1e40.355b8488.js
+++ b/public/mer/js/chunk-2d0b1e40.355b8488.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0b1e40"],{"227a":function(e,t,a){"use strict";a.r(t);var n=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("upload-from")],1)],1)},o=[],c=a("b5b8"),s={name:"Picture",components:{uploadFrom:c["default"]},data:function(){return{}},methods:{}},r=s,u=a("2877"),d=Object(u["a"])(r,n,o,!1,null,"2e674e22",null);t["default"]=d.exports}}]);
--- a/public/mer/js/chunk-2d0ba554.ae7872d1.js
+++ b/public/mer/js/chunk-2d0ba554.ae7872d1.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ba554"],{3782:function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},r=[],c=t("2877"),l={},a=Object(c["a"])(l,u,r,!1,null,null,null);n["default"]=a.exports}}]);
--- a/public/mer/js/chunk-2d0c212a.6d759dcd.js
+++ b/public/mer/js/chunk-2d0c212a.6d759dcd.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c212a"],{"496e":function(t,e,a){"use strict";a.r(e);var n=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("el-button",{attrs:{size:"small",type:"primary"},on:{click:t.add}},[t._v("添加商品规格")])],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.listLoading,expression:"listLoading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"small","highlight-current-row":""}},[a("el-table-column",{attrs:{prop:"attr_template_id",label:"ID","min-width":"60"}}),t._v(" "),a("el-table-column",{attrs:{prop:"template_name",label:"规格名称","min-width":"150"}}),t._v(" "),a("el-table-column",{attrs:{label:"商品规格","min-width":"150"},scopedSlots:t._u([{key:"default",fn:function(e){return t._l(e.row.template_value,(function(e,n){return a("span",{key:n,staticClass:"mr10",domProps:{textContent:t._s(e.value)}})}))}}])}),t._v(" "),a("el-table-column",{attrs:{label:"商品属性","min-width":"300"},scopedSlots:t._u([{key:"default",fn:function(e){return t._l(e.row.template_value,(function(e,n){return a("div",{key:n,domProps:{textContent:t._s(e.detail.join(","))}})}))}}])}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"100",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.onEdit(e.row)}}},[t._v("编辑")]),t._v(" "),a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.handleDelete(e.row.attr_template_id,e.$index)}}},[t._v("删除\n          ")])]}}])})],1),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},i=[],l=a("c4c8"),s={name:"ProductAttr",data:function(){return{formDynamic:{template_name:"",template_value:[]},tableFrom:{page:1,limit:20},tableData:{data:[],total:0},listLoading:!0}},mounted:function(){this.getList()},methods:{add:function(){var t=this;t.formDynamic={template_name:"",template_value:[]},this.$modalAttr(Object.assign({},t.formDynamic),(function(){t.getList()}))},getList:function(){var t=this;this.listLoading=!0,Object(l["Mb"])(this.tableFrom).then((function(e){t.tableData.data=e.data.list,t.tableData.total=e.data.count,t.listLoading=!1})).catch((function(e){t.listLoading=!1,t.$message.error(e.message)}))},pageChange:function(t){this.tableFrom.page=t,this.getList()},handleSizeChange:function(t){this.tableFrom.limit=t,this.getList()},handleDelete:function(t,e){var a=this;this.$modalSure().then((function(){Object(l["k"])(t).then((function(t){var n=t.message;a.$message.success(n),a.tableData.data.splice(e,1)})).catch((function(t){var e=t.message;a.$message.error(e)}))}))},onEdit:function(t){var e=this;this.$modalAttr(JSON.parse(JSON.stringify(t)),(function(){e.getList(),this.formDynamic={template_name:"",template_value:[]}}))}}},o=s,r=a("2877"),c=Object(r["a"])(o,n,i,!1,null,null,null);e["default"]=c.exports}}]);
--- a/public/mer/js/chunk-2d0c481a.1bf724ef.js
+++ b/public/mer/js/chunk-2d0c481a.1bf724ef.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c481a"],{"3ab8":function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},c=[],r=t("2877"),a={},l=Object(r["a"])(a,u,c,!1,null,null,null);n["default"]=l.exports}}]);
--- a/public/mer/js/chunk-2d0c8a44.7efb8f71.js
+++ b/public/mer/js/chunk-2d0c8a44.7efb8f71.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c8a44"],{"566c":function(t,a,e){"use strict";e.r(a);var n=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{staticClass:"divBox"},[e("el-card",{staticClass:"box-card"},[t.FormData?e("form-create",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],ref:"fc",staticClass:"formBox",attrs:{option:t.option,rule:t.FormData.rule,"handle-icon":"false"},on:{submit:t.onSubmit}}):t._e()],1)],1)},o=[],s=e("c7eb"),r=(e("96cf"),e("1da1")),i=e("30ba"),c=e.n(i),u=e("b7be"),d=e("0c6d"),l=e("83d6"),f={name:"CreatCoupon",data:function(){return{option:{form:{labelWidth:"150px"},submitBtn:{loading:!1},global:{upload:{props:{onSuccess:function(t,a){200===t.status&&(a.url=t.data.src)}}}}},FormData:null,loading:!1}},components:{formCreate:c.a.$form()},mounted:function(){this.getFrom()},methods:{getFrom:function(){var t=this;this.loading=!0,Object(u["J"])().then(function(){var a=Object(r["a"])(Object(s["a"])().mark((function a(e){return Object(s["a"])().wrap((function(a){while(1)switch(a.prev=a.next){case 0:t.FormData=e.data,t.loading=!1,t.$store.dispatch("settings/setEdit",!0);case 3:case"end":return a.stop()}}),a)})));return function(t){return a.apply(this,arguments)}}()).catch((function(a){t.$message.error(a.message),t.loading=!1}))},onSubmit:function(t){var a=this;this.$refs.fc.$f.btn.loading(!0),d["a"][this.FormData.method.toLowerCase()](this.FormData.api,t).then((function(t){a.$refs.fc.$f.btn.loading(!1),a.$message.success(t.message||"提交成功"),a.$store.dispatch("settings/setEdit",!1),a.$router.push({path:"".concat(l["roterPre"],"/marketing/studio/list")})})).catch((function(t){a.$refs.fc.$f.btn.loading(!1),a.$message.error(t.message||"提交失败")}))}}},m=f,p=e("2877"),h=Object(p["a"])(m,n,o,!1,null,"c1581826",null);a["default"]=h.exports}}]);
--- a/public/mer/js/chunk-2d0d095b.e9ecb872.js
+++ b/public/mer/js/chunk-2d0d095b.e9ecb872.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0d095b"],{6935:function(a,t,e){"use strict";e.r(t);var n=function(){var a=this,t=a.$createElement,e=a._self._c||t;return e("div",{staticClass:"divBox"},[e("el-card",{staticClass:"box-card"},[a.FormData?e("form-create",{directives:[{name:"loading",rawName:"v-loading",value:a.loading,expression:"loading"}],ref:"fc",staticClass:"formBox",attrs:{option:a.option,rule:a.FormData.rule,"handle-icon":"false"},on:{submit:a.onSubmit}}):a._e()],1)],1)},o=[],r=e("c7eb"),s=(e("96cf"),e("1da1")),i=e("30ba"),c=e.n(i),u=e("b7be"),l=e("0c6d"),d={name:"IntegralConfig",data:function(){return{option:{form:{labelWidth:"150px"},global:{upload:{props:{onSuccess:function(a,t){200===a.status&&(t.url=a.data.src)}}}}},FormData:null,loading:!1}},components:{formCreate:c.a.$form()},mounted:function(){this.getFrom()},methods:{getFrom:function(){var a=this;this.loading=!0,Object(u["R"])("integral").then(function(){var t=Object(s["a"])(Object(r["a"])().mark((function t(e){return Object(r["a"])().wrap((function(t){while(1)switch(t.prev=t.next){case 0:a.FormData=e.data,a.loading=!1;case 2:case"end":return t.stop()}}),t)})));return function(a){return t.apply(this,arguments)}}()).catch((function(t){a.$message.error(t.message),a.loading=!1}))},onSubmit:function(a){var t=this;l["a"][this.FormData.method.toLowerCase()](this.FormData.api,a).then((function(a){t.$message.success(a.message||"提交成功")})).catch((function(a){t.$message.error(a.message||"提交失败")}))}}},m=d,f=e("2877"),p=Object(f["a"])(m,n,o,!1,null,"2c447d1a",null);t["default"]=p.exports}}]);
--- a/public/mer/js/chunk-2d0d3300.96be884e.js
+++ b/public/mer/js/chunk-2d0d3300.96be884e.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0d3300"],{"5c62":function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("el-button",{attrs:{size:"small",type:"primary"},on:{click:t.onAdd}},[t._v("添加专场")])],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"small"}},[t._l(t.columns,(function(e,i){return a("el-table-column",{key:i,attrs:{prop:e.key,label:e.title,"min-width":e.minWidth},scopedSlots:t._u([{key:"default",fn:function(i){return[["img","image","pic"].indexOf(e.key)>-1||e.key.indexOf("pic")>-1||e.key.indexOf("img")>-1||e.key.indexOf("image")>-1||e.key.indexOf("banner")>-1?a("div",{staticClass:"demo-image__preview"},[Array.isArray(i.row[e.key])?a("div",t._l(i.row[e.key],(function(t,e){return a("span",{key:e},[a("el-image",{staticStyle:{width:"36px",height:"36px","margin-right":"5px"},attrs:{src:t}})],1)})),0):a("div",[a("el-image",{staticStyle:{width:"36px",height:"36px"},attrs:{src:i.row[e.key]}})],1)]):"type"==e.key?a("span",[t._v("\n            "+t._s(1==i.row[e.key]?"小图":2==i.row[e.key]?"中图":"大图")+"\n          ")]):a("span",[t._v(t._s(i.row[e.key]))])]}}],null,!0)})})),t._v(" "),a("el-table-column",{attrs:{prop:"status",label:"是否显示","min-width":"100"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-switch",{attrs:{"active-value":1,"inactive-value":0,"active-text":"显示","inactive-text":"隐藏"},on:{change:function(a){return t.onchangeIsShow(e.row)}},model:{value:e.row.status,callback:function(a){t.$set(e.row,"status",a)},expression:"scope.row.status"}})]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"100",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.onEdit(e.row.group_data_id)}}},[t._v("编辑")]),t._v(" "),a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.handleDelete(e.row.group_data_id,e.$index)}}},[t._v("删除")])]}}])})],2),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableData.limit,"current-page":t.tableData.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},n=[],s=(a("7f7f"),a("ac6a"),a("8593")),o={name:"Data",data:function(){return{tableData:{page:1,limit:20,data:[],total:0},loading:!1,groupId:null,groupDetail:null}},computed:{columns:function(){if(!this.groupDetail)return[];var t=[{title:"ID",key:"group_data_id",minWidth:60}];return this.groupDetail.fields.forEach((function(e){t.push({title:e.name,key:e.field,minWidth:80})})),t.push({title:"添加时间",key:"create_time",minWidth:200}),t}},watch:{"$route.params.id":function(t){this.groupId=t},groupId:function(t){this.getGroupDetail(t)}},mounted:function(){this.groupId=this.$route.params.id},methods:{getGroupDetail:function(t){var e=this;Object(s["t"])(t).then((function(t){e.groupDetail=t.data,e.tableData.page=1,e.getList()}))},getList:function(){var t=this;this.loading=!0,Object(s["s"])(this.$route.params.id,this.tableData.page,this.tableData.limit).then((function(e){t.tableData.data=e.data.list,t.tableData.total=e.data.count,t.loading=!1})).catch((function(e){t.loading=!1,t.$message.error(e.message)}))},pageChange:function(t){this.tableData.page=t,this.getList()},handleSizeChange:function(t){this.tableData.limit=t,this.getList()},onAdd:function(){var t=this;this.$modalForm(Object(s["m"])(this.$route.params.id)).then((function(){return t.getList()}))},onEdit:function(t){var e=this;this.$modalForm(Object(s["J"])(this.$route.params.id,t)).then((function(){return e.getList()}))},onchangeIsShow:function(t){var e=this;Object(s["r"])(t.group_data_id,t.status).then((function(t){var a=t.message;e.$message.success(a)})).catch((function(t){var a=t.message;e.$message.error(a)}))},handleDelete:function(t,e){var a=this;this.$modalSure("删除该专场").then((function(){Object(s["o"])(t).then((function(t){var i=t.message;a.$message.success(i),a.tableData.data.splice(e,1)})).catch((function(t){var e=t.message;a.$message.error(e)}))}))}}},r=o,l=a("2877"),c=Object(l["a"])(r,i,n,!1,null,"174ef35a",null);e["default"]=c.exports}}]);
--- a/public/mer/js/chunk-2d0e276e.90504006.js
+++ b/public/mer/js/chunk-2d0e276e.90504006.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0e276e"],{"7f8a":function(a,t,e){"use strict";e.r(t);var n=function(){var a=this,t=a.$createElement,e=a._self._c||t;return e("div",{staticClass:"divBox"},[e("el-card",{staticClass:"box-card"},[a.FormData?e("form-create",{directives:[{name:"loading",rawName:"v-loading",value:a.loading,expression:"loading"}],ref:"fc",staticClass:"formBox",attrs:{option:a.option,rule:a.FormData.rule,"handle-icon":"false"},on:{submit:a.onSubmit}}):a._e()],1)],1)},o=[],s=e("c7eb"),r=(e("96cf"),e("1da1")),c=e("30ba"),i=e.n(c),u=e("2801"),l=e("0c6d"),m=(e("83d6"),{name:"payType",data:function(){return{option:{form:{labelWidth:"150px"},global:{upload:{props:{onSuccess:function(a,t){200===a.status&&(t.url=a.data.src)}}}}},FormData:null,loading:!1}},components:{formCreate:i.a.$form()},mounted:function(){this.getFrom()},methods:{getFrom:function(){var a=this;this.loading=!0,Object(u["j"])().then(function(){var t=Object(r["a"])(Object(s["a"])().mark((function t(e){return Object(s["a"])().wrap((function(t){while(1)switch(t.prev=t.next){case 0:a.FormData=e.data,a.loading=!1;case 2:case"end":return t.stop()}}),t)})));return function(a){return t.apply(this,arguments)}}()).catch((function(t){a.$message.error(t.message),a.loading=!1}))},onSubmit:function(a){var t=this;l["a"][this.FormData.method.toLowerCase()](this.FormData.api,a).then((function(a){t.$message.success(a.message||"提交成功")})).catch((function(a){t.$message.error(a.message||"提交失败")}))}}}),d=m,f=e("2877"),p=Object(f["a"])(d,n,o,!1,null,"c11bae1c",null);t["default"]=p.exports}}]);
--- a/public/mer/js/chunk-2d0e5b8e.87918be3.js
+++ b/public/mer/js/chunk-2d0e5b8e.87918be3.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0e5b8e"],{9661:function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},r=[],c=t("2877"),l={},o=Object(c["a"])(l,u,r,!1,null,null,null);n["default"]=o.exports}}]);
--- a/public/mer/js/chunk-2d0e6675.a96fc657.js
+++ b/public/mer/js/chunk-2d0e6675.a96fc657.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0e6675"],{9932:function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},r=[],c=t("2877"),l={},o=Object(c["a"])(l,u,r,!1,null,null,null);n["default"]=o.exports}}]);
--- a/public/mer/js/chunk-2d207706.0ae6ce46.js
+++ b/public/mer/js/chunk-2d207706.0ae6ce46.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d207706"],{a111:function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("el-button",{attrs:{size:"small",type:"primary"},on:{click:t.onAdd}},[t._v("添加数据")])],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"small"}},[t._l(t.columns,(function(e,i){return a("el-table-column",{key:i,attrs:{prop:e.key,label:e.title,"min-width":e.minWidth},scopedSlots:t._u([{key:"default",fn:function(i){return[["img","image","pic"].indexOf(e.key)>-1||e.key.indexOf("pic")>-1||e.key.indexOf("img")>-1||e.key.indexOf("image")>-1||e.key.indexOf("banner")>-1?a("div",{staticClass:"demo-image__preview"},[Array.isArray(i.row[e.key])?a("div",t._l(i.row[e.key],(function(t,e){return a("span",{key:e},[a("el-image",{staticStyle:{width:"36px",height:"36px","margin-right":"5px"},attrs:{src:t}})],1)})),0):a("div",[a("el-image",{staticStyle:{width:"36px",height:"36px"},attrs:{src:i.row[e.key]}})],1)]):a("span",[t._v(t._s(i.row[e.key]))])]}}],null,!0)})})),t._v(" "),a("el-table-column",{attrs:{prop:"status",label:"是否显示","min-width":"100"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-switch",{attrs:{"active-value":1,"inactive-value":0,"active-text":"显示","inactive-text":"隐藏"},on:{change:function(a){return t.onchangeIsShow(e.row)}},model:{value:e.row.status,callback:function(a){t.$set(e.row,"status",a)},expression:"scope.row.status"}})]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"100",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.onEdit(e.row.group_data_id)}}},[t._v("编辑")]),t._v(" "),a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.handleDelete(e.row.group_data_id,e.$index)}}},[t._v("删除")])]}}])})],2),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableData.limit,"current-page":t.tableData.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},n=[],s=(a("7f7f"),a("ac6a"),a("8593")),o={name:"Data",data:function(){return{tableData:{page:1,limit:20,data:[],total:0},loading:!1,groupId:null,groupDetail:null}},computed:{columns:function(){if(!this.groupDetail)return[];var t=[{title:"ID",key:"group_data_id",minWidth:60}];return this.groupDetail.fields.forEach((function(e){t.push({title:e.name,key:e.field,minWidth:80})})),t.push({title:"添加时间",key:"create_time",minWidth:200}),t}},watch:{"$route.params.id":function(t){this.groupId=t},groupId:function(t){this.getGroupDetail(t)}},mounted:function(){this.groupId=this.$route.params.id},methods:{getGroupDetail:function(t){var e=this;Object(s["t"])(t).then((function(t){e.groupDetail=t.data,e.tableData.page=1,e.getList()}))},getList:function(){var t=this;this.loading=!0,Object(s["s"])(this.$route.params.id,this.tableData.page,this.tableData.limit).then((function(e){t.tableData.data=e.data.list,t.tableData.total=e.data.count,t.loading=!1})).catch((function(e){t.loading=!1,t.$message.error(e.message)}))},pageChange:function(t){this.tableData.page=t,this.getList()},handleSizeChange:function(t){this.tableData.limit=t,this.getList()},onAdd:function(){var t=this;this.$modalForm(Object(s["m"])(this.$route.params.id)).then((function(){return t.getList()}))},onEdit:function(t){var e=this;this.$modalForm(Object(s["J"])(this.$route.params.id,t)).then((function(){return e.getList()}))},onchangeIsShow:function(t){},handleDelete:function(t,e){var a=this;this.$modalSure("删除该数据").then((function(){Object(s["o"])(t).then((function(t){var i=t.message;a.$message.success(i),a.tableData.data.splice(e,1)})).catch((function(t){var e=t.message;a.$message.error(e)}))}))}}},l=o,r=a("2877"),u=Object(r["a"])(l,i,n,!1,null,"393d859a",null);e["default"]=u.exports}}]);
--- a/public/mer/js/chunk-2d209391.e8066978.js
+++ b/public/mer/js/chunk-2d209391.e8066978.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d209391"],{a7af:function(t,e,a){"use strict";a.r(e);var n=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("el-button",{attrs:{size:"small",type:"primary"},on:{click:t.onAdd}},[t._v("添加商品标签")])],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.listLoading,expression:"listLoading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"small"}},[a("el-table-column",{attrs:{prop:"label_name",label:"标签名称","min-width":"60"}}),t._v(" "),a("el-table-column",{attrs:{prop:"info",label:"标签说明","min-width":"150"}}),t._v(" "),a("el-table-column",{attrs:{prop:"sort",label:"排序","min-width":"50"}}),t._v(" "),a("el-table-column",{attrs:{prop:"status",label:"是否显示","min-width":"100"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-switch",{attrs:{"active-value":1,"inactive-value":0,"active-text":"显示","inactive-text":"隐藏"},on:{change:function(a){return t.onchangeIsShow(e.row)}},model:{value:e.row.status,callback:function(a){t.$set(e.row,"status",a)},expression:"scope.row.status"}})]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"create_time",label:"创建时间","min-width":"150"}}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"100",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.onEdit(e.row.product_label_id)}}},[t._v("编辑")]),t._v(" "),a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.handleDelete(e.row.product_label_id,e.$index)}}},[t._v("删除")])]}}])})],1),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},i=[],s=a("c4c8"),l={name:"LabelList",data:function(){return{tableFrom:{page:1,limit:20},tableData:{data:[],total:0},listLoading:!0}},mounted:function(){this.getList("")},methods:{add:function(){},getList:function(t){var e=this;this.listLoading=!0,this.tableFrom.page=t||this.tableFrom.page,Object(s["J"])(this.tableFrom).then((function(t){e.tableData.data=t.data.list,e.tableData.total=t.data.count,e.listLoading=!1})).catch((function(t){e.listLoading=!1,e.$message.error(t.message)}))},pageChange:function(t){this.tableFrom.page=t,this.getList("")},handleSizeChange:function(t){this.tableFrom.limit=t,this.getList("")},onAdd:function(){var t=this;this.$modalForm(Object(s["H"])()).then((function(){return t.getList("")}))},onEdit:function(t){var e=this;this.$modalForm(Object(s["L"])(t)).then((function(){return e.getList("")}))},handleDelete:function(t,e){var a=this;this.$modalSure("删除该标签").then((function(){Object(s["I"])(t).then((function(t){var e=t.message;a.$message.success(e),a.getList("")})).catch((function(t){var e=t.message;a.$message.error(e)}))}))},onchangeIsShow:function(t){var e=this;Object(s["K"])(t.product_label_id,t.status).then((function(t){var a=t.message;e.$message.success(a),e.getList("")})).catch((function(t){var a=t.message;e.$message.error(a)}))}}},o=l,r=a("2877"),c=Object(r["a"])(o,n,i,!1,null,null,null);e["default"]=c.exports}}]);
--- a/public/mer/js/chunk-2d213182.95a6f5ae.js
+++ b/public/mer/js/chunk-2d213182.95a6f5ae.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d213182"],{aae1:function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},r=[],a=t("2877"),c={},l=Object(a["a"])(c,u,r,!1,null,null,null);n["default"]=l.exports}}]);
--- a/public/mer/js/chunk-2d213ed3.01b8d5f3.js
+++ b/public/mer/js/chunk-2d213ed3.01b8d5f3.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d213ed3"],{af80:function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},r=[],c=t("2877"),l={},a=Object(c["a"])(l,u,r,!1,null,null,null);n["default"]=a.exports}}]);
--- a/public/mer/js/chunk-2d21d8a3.cda9aa58.js
+++ b/public/mer/js/chunk-2d21d8a3.cda9aa58.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d21d8a3"],{d276:function(t,a,e){"use strict";e.r(a);var i=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{staticClass:"divBox"},[e("el-card",{staticClass:"box-card"},[e("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[e("el-button",{attrs:{size:"small",type:"primary"},on:{click:t.onAdd}},[t._v("添加组合数据")])],1),t._v(" "),e("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"small"}},[e("el-table-column",{attrs:{prop:"group_id",label:"ID","min-width":"60"}}),t._v(" "),e("el-table-column",{attrs:{prop:"group_name",label:"数据组名称","min-width":"130"}}),t._v(" "),e("el-table-column",{attrs:{prop:"group_key",label:"数据组key","min-width":"130"}}),t._v(" "),e("el-table-column",{attrs:{prop:"group_info",label:"数据组说明","min-width":"130"}}),t._v(" "),e("el-table-column",{attrs:{prop:"create_time",label:"创建时间","min-width":"150"}}),t._v(" "),e("el-table-column",{attrs:{label:"操作","min-width":"100",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(a){return[e("el-button",{attrs:{type:"text",size:"small"},on:{click:function(e){return t.goList(a.row.group_id,a.$index)}}},[t._v("数据列表")]),t._v(" "),e("el-button",{attrs:{type:"text",size:"small"},on:{click:function(e){return t.onEdit(a.row.group_id)}}},[t._v("编辑")])]}}])})],1),t._v(" "),e("div",{staticClass:"block"},[e("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableData.limit,"current-page":t.tableData.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},n=[],l=e("8593"),o={name:"List",data:function(){return{tableData:{page:1,limit:20,data:[],total:0},loading:!1}},mounted:function(){this.getList()},methods:{getList:function(){var t=this;this.loading=!0,Object(l["u"])(this.tableData.page,this.tableData.limit).then((function(a){t.tableData.data=a.data.list,t.tableData.total=a.data.count,t.loading=!1})).catch((function(a){t.loading=!1,t.$message.error(a.message)}))},pageChange:function(t){this.tableData.page=t,this.getList()},handleSizeChange:function(t){this.tableData.limit=t,this.getList()},onAdd:function(){var t=this;this.$modalForm(Object(l["n"])()).then((function(){return t.getLst()}))},onEdit:function(t){var a=this;this.$modalForm(Object(l["K"])(t)).then((function(){return a.getLst()}))},goList:function(t){this.$router.push("/group/data/".concat(t))}}},s=o,r=e("2877"),c=Object(r["a"])(s,i,n,!1,null,"57d51cbc",null);a["default"]=c.exports}}]);
--- a/public/mer/js/chunk-2d229240.e6284493.js
+++ b/public/mer/js/chunk-2d229240.e6284493.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d229240"],{dbd0:function(t,e,a){"use strict";a.r(e);var o=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[t.FormData?a("form-create",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],ref:"fc",staticClass:"formBox",attrs:{option:t.option,rule:t.FormData.rule,"handle-icon":"false",cmovies:t.movies},on:{submit:t.onSubmit}}):t._e()],1)],1)},n=[],s=a("c7eb"),r=(a("96cf"),a("1da1")),i=a("30ba"),c=a.n(i),u=a("b7be"),l=a("0c6d"),m=a("83d6"),d={name:"CreatCoupon",data:function(){return{option:{form:{labelWidth:"150px"},global:{upload:{props:{onSuccess:function(t,e){200===t.status&&(e.url=t.data.src)}}}}},FormData:null,loading:!1,movies:1}},components:{formCreate:c.a.$form()},mounted:function(){this.getFrom()},methods:{getFrom:function(){var t=this;this.loading=!0,sessionStorage.setItem("singleChoice",1),Object(u["K"])().then(function(){var e=Object(r["a"])(Object(s["a"])().mark((function e(a){return Object(s["a"])().wrap((function(e){while(1)switch(e.prev=e.next){case 0:t.FormData=a.data,t.loading=!1;case 2:case"end":return e.stop()}}),e)})));return function(t){return e.apply(this,arguments)}}()).catch((function(e){t.$message.error(e.message),t.loading=!1}))},onSubmit:function(t){var e=this;l["a"][this.FormData.method.toLowerCase()](this.FormData.api,t).then((function(t){e.$message.success(t.message||"提交成功"),e.$router.push({path:"".concat(m["roterPre"],"/marketing/broadcast/list")})})).catch((function(t){e.$message.error(t.message||"提交失败")}))}}},f=d,p=a("2877"),h=Object(p["a"])(f,o,n,!1,null,null,null);e["default"]=h.exports}}]);
--- a/public/mer/js/chunk-2d230c26.b7a5a724.js
+++ b/public/mer/js/chunk-2d230c26.b7a5a724.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d230c26"],{ee3c:function(t,e,a){"use strict";a.r(e);var n=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[t.FormData?a("form-create",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],ref:"fc",staticClass:"formBox",attrs:{option:t.option,rule:t.FormData.rule,"handle-icon":"false"},on:{submit:t.onSubmit}}):t._e()],1)],1)},o=[],r=a("c7eb"),s=(a("96cf"),a("1da1")),c=a("30ba"),i=a.n(c),u=a("b7be"),l=a("0c6d"),m=a("83d6"),d={name:"CreatCoupon",data:function(){return{option:{form:{labelWidth:"150px"},global:{upload:{props:{onSuccess:function(t,e){200===t.status&&(e.url=t.data.src)}}}}},FormData:null,loading:!1}},components:{formCreate:i.a.$form()},mounted:function(){this.getFrom(),sessionStorage.setItem("singleChoice",0)},methods:{getFrom:function(){var t=this;this.loading=!0,this.$route.params.id?Object(u["y"])(this.$route.params.id).then(function(){var e=Object(s["a"])(Object(r["a"])().mark((function e(a){return Object(r["a"])().wrap((function(e){while(1)switch(e.prev=e.next){case 0:t.FormData=a.data,t.loading=!1;case 2:case"end":return e.stop()}}),e)})));return function(t){return e.apply(this,arguments)}}()).catch((function(e){t.$message.error(e.message),t.loading=!1})):Object(u["C"])().then(function(){var e=Object(s["a"])(Object(r["a"])().mark((function e(a){return Object(r["a"])().wrap((function(e){while(1)switch(e.prev=e.next){case 0:t.FormData=a.data,t.loading=!1;case 2:case"end":return e.stop()}}),e)})));return function(t){return e.apply(this,arguments)}}()).catch((function(e){t.$message.error(e.message),t.loading=!1}))},onSubmit:function(t){var e=this;l["a"][this.FormData.method.toLowerCase()](this.FormData.api,t).then((function(t){e.$message.success(t.message||"提交成功"),e.$router.push({path:"".concat(m["roterPre"],"/marketing/coupon/list")})})).catch((function(t){e.$message.error(t.message||"提交失败")}))}}},p=d,f=a("2877"),h=Object(f["a"])(p,n,o,!1,null,"66ea4727",null);e["default"]=h.exports}}]);
--- a/public/mer/js/chunk-2f105f7b.39d87c67.js
+++ b/public/mer/js/chunk-2f105f7b.39d87c67.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2f105f7b"],{bff0:function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("el-form",{attrs:{inline:"",size:"small"}},[a("el-form-item",[a("el-input",{staticClass:"selWidth",attrs:{placeholder:"请输入用户名称"},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.getList(1)}},model:{value:t.tableFrom.nickname,callback:function(e){t.$set(t.tableFrom,"nickname",e)},expression:"tableFrom.nickname"}},[a("el-button",{staticClass:"el-button-solt",attrs:{slot:"append",icon:"el-icon-search"},on:{click:function(e){return t.getList(1)}},slot:"append"})],1)],1),t._v(" "),a("el-form-item",[a("span",{staticStyle:{"font-size":"12px",color:"#C0C4CC"}},[t._v("注：将用户添加为客服时,请确保用户先关注本店铺")])])],1)],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"small"}},[a("el-table-column",{attrs:{label:"","min-width":"65"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-radio",{attrs:{label:e.row.uid},nativeOn:{change:function(a){return t.getTemplateRow(e.$index,e.row)}},model:{value:t.templateRadio,callback:function(e){t.templateRadio=e},expression:"templateRadio"}},[t._v(" ")])]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"uid",label:"ID","min-width":"60"}}),t._v(" "),a("el-table-column",{attrs:{prop:"nickname",label:"微信用户名称","min-width":"130"}}),t._v(" "),a("el-table-column",{attrs:{label:"客服头像","min-width":"80"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"demo-image__preview"},[a("el-image",{staticClass:"tabImage",attrs:{src:e.row.avatar?e.row.avatar:t.moren,"preview-src-list":[e.row.avatar||t.moren]}})],1)]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"用户类型","min-width":"130"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("span",[t._v(t._s(t._f("statusFilter")(e.row.user_type)))])]}}])})],1),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},l=[],n=a("8593"),s={name:"UserList",filters:{saxFilter:function(t){var e={0:"未知",1:"男",2:"女"};return e[t]},statusFilter:function(t){var e={wechat:"微信用户",routine:"小程序用户",h5:"H5用户",app:"APP用户",pc:"PC用户"};return e[t]}},data:function(){return{moren:a("cdfe"),templateRadio:0,loading:!1,tableData:{data:[],total:0},tableFrom:{page:1,limit:20,nickname:""}}},mounted:function(){this.getList(1)},methods:{getTemplateRow:function(t,e){form_create_helper.set(this.$route.query.field,{src:e.avatar||this.moren,id:e.uid}),form_create_helper.close(this.$route.query.field)},getList:function(t){var e=this;this.loading=!0,this.tableFrom.page=t||this.tableFrom.page,Object(n["L"])(this.tableFrom).then((function(t){e.tableData.data=t.data.list,e.tableData.total=t.data.count,e.loading=!1})).catch((function(t){e.$message.error(t.message),e.loading=!1}))},pageChange:function(t){this.tableFrom.page=t,this.getList("")},handleSizeChange:function(t){this.tableFrom.limit=t,this.getList("")}}},r=s,o=a("2877"),c=Object(o["a"])(r,i,l,!1,null,"41147e5e",null);e["default"]=c.exports},cdfe:function(t,e,a){t.exports=a.p+"mer/img/f.5aa43cd3.png"}}]);
--- a/public/mer/js/chunk-32c5a54a.21fef6cd.js
+++ b/public/mer/js/chunk-32c5a54a.21fef6cd.js
--- a/public/mer/js/chunk-344a4872.337757a3.js
+++ b/public/mer/js/chunk-344a4872.337757a3.js
--- a/public/mer/js/chunk-35013ff2.679b1a4b.js
+++ b/public/mer/js/chunk-35013ff2.679b1a4b.js
--- a/public/mer/js/chunk-39a0bfcb.bb969818.js
+++ b/public/mer/js/chunk-39a0bfcb.bb969818.js
--- a/public/mer/js/chunk-3e2c114c.3eb395f5.js
+++ b/public/mer/js/chunk-3e2c114c.3eb395f5.js
--- a/public/mer/js/chunk-3ec8e821.5bb5c27e.js
+++ b/public/mer/js/chunk-3ec8e821.5bb5c27e.js
--- a/public/mer/js/chunk-406e1b8e.bbf8bf19.js
+++ b/public/mer/js/chunk-406e1b8e.bbf8bf19.js
--- a/public/mer/js/chunk-40dcbfe7.b2b9307a.js
+++ b/public/mer/js/chunk-40dcbfe7.b2b9307a.js
--- a/public/mer/js/chunk-412170ef.150daa68.js
+++ b/public/mer/js/chunk-412170ef.150daa68.js
--- a/public/mer/js/chunk-412d33f7.bfd72ad9.js
+++ b/public/mer/js/chunk-412d33f7.bfd72ad9.js
@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-412d33f7"],{"12e6":function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{attrs:{slot:"header"},slot:"header"},[a("div",{staticClass:"container"},[a("div",{staticClass:"demo-input-suffix acea-row"},[a("el-form",{attrs:{inline:"",size:"small","label-width":"100px"}},[a("el-form-item",{attrs:{label:"搜索："}},[a("el-input",{staticClass:"selWidth",attrs:{placeholder:"请输入参数模板名称"},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.getList(1)}},model:{value:t.tableFrom.template_name,callback:function(e){t.$set(t.tableFrom,"template_name",e)},expression:"tableFrom.template_name"}},[a("el-button",{staticClass:"el-button-solt",attrs:{slot:"append",icon:"el-icon-search"},on:{click:function(e){return t.getList(1)}},slot:"append"})],1)],1)],1)],1)]),t._v(" "),a("el-button",{attrs:{size:"small",type:"primary"},on:{click:t.onAdd}},[t._v("添加参数模板")])],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.listLoading,expression:"listLoading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"small"}},[a("el-table-column",{attrs:{prop:"template_id",label:"ID","min-width":"60"}}),t._v(" "),a("el-table-column",{attrs:{prop:"template_name",label:"参数模板名称","min-width":"60"}}),t._v(" "),a("el-table-column",{attrs:{prop:"sort",label:"排序","min-width":"60"}}),t._v(" "),a("el-table-column",{attrs:{prop:"create_time",label:"创建时间","min-width":"60"}}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"100",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.onEdit(e.row.template_id)}}},[t._v("编辑")]),t._v(" "),a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.onDetail(e.row.template_id)}}},[t._v("查看")]),t._v(" "),a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.handleDelete(e.row.template_id,e.$index)}}},[t._v("删除")])]}}])})],1),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1),t._v(" "),a("el-dialog",{attrs:{title:t.title,visible:t.dialogVisible,width:"400px"},on:{"update:visible":function(e){t.dialogVisible=e}}},[a("div",{staticStyle:{"min-height":"500px"}},[a("div",{staticClass:"description"},[a("div",{staticClass:"acea-row"},t._l(t.specsInfo.parameter,(function(e,i){return a("div",{key:i,staticClass:"description-term"},[a("span",{staticClass:"name"},[t._v(t._s(e.name))]),t._v(" "),a("span",{staticClass:"value"},[t._v(t._s(e.value))])])})),0)])])])],1)},n=[],s=(a("ac6a"),a("83d6")),l=a("c4c8"),o={name:"SpecsList",data:function(){return{listLoading:!0,cateList:[],tableData:{data:[],total:0},tableFrom:{page:1,limit:20},specsInfo:{},dialogVisible:!1,title:""}},mounted:function(){this.getCategorySelect(),this.getList("")},methods:{getList:function(t){var e=this;this.listLoading=!0,this.tableFrom.page=t||this.tableFrom.page,Object(l["kb"])(this.tableFrom).then((function(t){t.data.list.forEach((function(t,e){t.cate_name=[],t.cateId.forEach((function(e,a){t.cate_name.push(e.category.cate_name)}))})),e.tableData.data=t.data.list,e.tableData.total=t.data.count,e.listLoading=!1})).catch((function(t){e.listLoading=!1,e.$message.error(t.message)}))},pageChange:function(t){this.tableFrom.page=t,this.getList("")},handleSizeChange:function(t){this.tableFrom.limit=t,this.getList("")},getCategorySelect:function(){var t=this;Object(l["q"])().then((function(e){t.cateList=e.data})).catch((function(e){t.$message.error(e.message)}))},onAdd:function(){this.$router.push("".concat(s["roterPre"],"/product/specs/create"))},onEdit:function(t){this.$router.push("".concat(s["roterPre"],"/product/specs/create/").concat(t))},onDetail:function(t){var e=this;Object(l["xb"])(t).then((function(t){e.specsInfo=t.data,e.title=t.data.template_name,e.dialogVisible=!0})).catch((function(t){e.$message.error(t.message)}))},handleDelete:function(t,e){var a=this;this.$modalSure("确定删除该模板").then((function(){Object(l["yb"])(t).then((function(t){var e=t.message;a.$message.success(e),a.getList("")})).catch((function(t){var e=t.message;a.$message.error(e)}))}))}}},c=o,r=(a("b28c"),a("2877")),u=Object(r["a"])(c,i,n,!1,null,"8e659c8e",null);e["default"]=u.exports},"5ef1":function(t,e,a){},b28c:function(t,e,a){"use strict";a("5ef1")}}]);
--- a/public/mer/js/chunk-486e108c.79d1832f.js
+++ b/public/mer/js/chunk-486e108c.79d1832f.js
--- a/public/mer/js/chunk-4a9f6d94.2310dd4b.js
+++ b/public/mer/js/chunk-4a9f6d94.2310dd4b.js
--- a/public/mer/js/chunk-4bf3fbdc.0c88935b.js
+++ b/public/mer/js/chunk-4bf3fbdc.0c88935b.js
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				.selWidth[data-v-5efee90a]{width:330px}.title[data-v-5efee90a]{margin-bottom:16px;color:#17233d;font-weight:500;font-size:14px}.head[data-v-2f11caa9]{padding:30px 35px 25px}.head .full[data-v-2f11caa9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.head .full .order_icon[data-v-2f11caa9]{width:60px;height:60px}.head .full .iconfont[data-v-2f11caa9]{color:#1890ff}.head .full .iconfont.sale-after[data-v-2f11caa9]{color:#90add5}.head .full .text[data-v-2f11caa9]{-ms-flex-item-align:center;align-self:center;-webkit-box-flex:1;-ms-flex:1;flex:1;min-width:0;padding-left:12px;font-size:13px;color:#606266}.head .full .text .title[data-v-2f11caa9]{margin-bottom:10px;font-weight:500;font-size:16px;line-height:16px;color:rgba(0,0,0,.85)}.head .full .text .order-num[data-v-2f11caa9]{padding-top:10px;white-space:nowrap}.head .list[data-v-2f11caa9]{display:-webkit-box;display:-ms-flexbox;display:flex;margin-top:20px;overflow:hidden;list-style:none;padding:0}.head .list .item[data-v-2f11caa9]{-webkit-box-flex:0;-ms-flex:none;flex:none;width:200px;font-size:14px;line-height:14px;color:rgba(0,0,0,.85)}.head .list .item .title[data-v-2f11caa9]{margin-bottom:12px;font-size:13px;line-height:13px;color:#666}.head .list .item .value1[data-v-2f11caa9]{color:#f56022}.head .list .item .value2[data-v-2f11caa9]{color:#1bbe6b}.head .list .item .value3[data-v-2f11caa9]{color:#1890ff}.head .list .item .value4[data-v-2f11caa9]{color:#6a7b9d}.head .list .item .value5[data-v-2f11caa9]{color:#f5222d}.el-tabs--border-card[data-v-2f11caa9]{-webkit-box-shadow:none;box-shadow:none;border-bottom:none}.section[data-v-2f11caa9]{padding:20px 0 5px;border-bottom:1px dashed #eee}.section .title[data-v-2f11caa9]{padding-left:10px;border-left:3px solid #1890ff;font-size:15px;line-height:15px;color:#303133}.section .list[data-v-2f11caa9]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;list-style:none;padding:0}.section .item[data-v-2f11caa9]{-webkit-box-flex:0;-ms-flex:0 0 33.33333%;flex:0 0 33.33333%;display:-webkit-box;display:-ms-flexbox;display:flex;margin-top:16px;font-size:13px;color:#606266}.section .item[data-v-2f11caa9]:nth-child(3n+1){padding-right:20px}.section .item[data-v-2f11caa9]:nth-child(3n+2){padding-right:10px;padding-left:10px}.section .item[data-v-2f11caa9]:nth-child(3n+3){padding-left:20px}.section .value[data-v-2f11caa9]{-webkit-box-flex:1;-ms-flex:1;flex:1}.section .value image[data-v-2f11caa9]{display:inline-block;width:40px;height:40px;margin:0 12px 12px 0;vertical-align:middle}.tab[data-v-2f11caa9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.tab .el-image[data-v-2f11caa9]{width:36px;height:36px;margin-right:10px}[data-v-2f11caa9] .el-drawer__body{overflow:auto}.gary[data-v-2f11caa9]{color:#aaa}.logistics[data-v-2f11caa9]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:10px 0}.logistics .logistics_img[data-v-2f11caa9]{width:45px;height:45px;margin-right:12px}.logistics .logistics_img img[data-v-2f11caa9]{width:100%;height:100%}.logistics .logistics_cent span[data-v-2f11caa9]{display:block;font-size:12px}.tabBox_tit[data-v-2f11caa9]{width:53%;font-size:12px!important;margin:0 2px 0 10px;letter-spacing:1px;padding:5px 0;-webkit-box-sizing:border-box;box-sizing:border-box}.title[data-v-96d4296a]{margin-bottom:16px;color:#17233d;font-weight:500;font-size:14px}.description-term[data-v-96d4296a]{display:table-cell;padding-bottom:10px;line-height:20px;width:50%;font-size:12px}.pictures[data-v-64c2d971]{max-width:100%}.area-desc[data-v-64c2d971]{margin:0;color:#999;font-size:12px}.selWidth[data-v-64c2d971]{width:300px}.spBlock[data-v-64c2d971]{cursor:pointer;display:block;padding:5px 0}.check[data-v-64c2d971]{color:#00a2d4}.el-dropdown-link[data-v-64c2d971]{cursor:pointer;color:#409eff;font-size:12px}.el-icon-arrow-down[data-v-64c2d971]{font-size:12px}.tabBox_tit[data-v-64c2d971]{width:53%;font-size:12px!important;margin:0 2px 0 10px;letter-spacing:1px;padding:5px 0;-webkit-box-sizing:border-box;box-sizing:border-box}[data-v-64c2d971] .row-bg .cell{color:red!important}.headTab[data-v-64c2d971]{position:relative}.headTab .headBtn[data-v-64c2d971]{position:absolute;right:0;top:-6px}.dropdown[data-v-64c2d971]{padding:0 10px;border:1px solid #409eff;margin-right:10px;line-height:28px;border-radius:4px}
				`@ -0,0 +1 @@`
				.title[data-v-3500ed7a]{margin-bottom:16px;color:#17233d;font-weight:500;font-size:14px}.description-term[data-v-3500ed7a]{display:table-cell;padding-bottom:10px;line-height:20px;width:50%;font-size:12px}[data-v-3cd1b9b0] .el-cascader{display:block}.dialog-scustom[data-v-3cd1b9b0]{width:1200px;height:600px}.ela-btn[data-v-3cd1b9b0]{color:#2d8cf0}.Box .ivu-radio-wrapper[data-v-3cd1b9b0]{margin-right:25px}.Box .numPut[data-v-3cd1b9b0]{width:80%!important}.lunBox[data-v-3cd1b9b0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;border:1px solid #0bb20c}.pictrueBox[data-v-3cd1b9b0]{display:inline-block}.pictrue[data-v-3cd1b9b0]{width:50px;height:50px;border:1px dotted rgba(0,0,0,.1);display:inline-block;position:relative;cursor:pointer}.pictrue img[data-v-3cd1b9b0]{width:100%;height:100%}.pictrueTab[data-v-3cd1b9b0]{width:40px!important;height:40px!important}.upLoad[data-v-3cd1b9b0]{width:40px;height:40px;border:1px dotted rgba(0,0,0,.1);border-radius:4px;background:rgba(0,0,0,.02);cursor:pointer}.ft[data-v-3cd1b9b0]{color:red}.buttonGroup[data-v-3cd1b9b0]{position:relative;display:inline-block;vertical-align:middle;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-tap-highlight-color:rgba(0,0,0,0)}.buttonGroup .small-btn[data-v-3cd1b9b0]{position:relative;float:left;height:24px;padding:0 7px;font-size:14px;border-radius:3px}.buttonGroup .small-btn[data-v-3cd1b9b0]:first-child{margin-left:0;border-bottom-right-radius:0;border-top-right-radius:0}.virtual_boder[data-v-3cd1b9b0]{border:1px solid #1890ff}.virtual_boder2[data-v-3cd1b9b0]{border:1px solid #e7e7e7}.virtual_san[data-v-3cd1b9b0]{position:absolute;bottom:0;right:0;width:0;height:0;border-bottom:26px solid #1890ff;border-left:26px solid transparent}.virtual_dui[data-v-3cd1b9b0]{position:absolute;bottom:-2px;right:2px;color:#fff;font-family:system-ui}.virtual[data-v-3cd1b9b0]{width:120px;height:60px;background:#fff;border-radius:3px;float:left;text-align:center;padding-top:8px;position:relative;cursor:pointer;line-height:23px}.virtual .virtual_top[data-v-3cd1b9b0]{font-size:14px;font-weight:600;color:rgba(0,0,0,.85)}.virtual .virtual_bottom[data-v-3cd1b9b0]{font-size:12px;font-weight:400;color:#999}.virtual[data-v-3cd1b9b0]:nth-child(2n){margin:0 12px}[data-v-5e47370c] .el-cascader{display:block}.ela-btn[data-v-5e47370c]{color:#2d8cf0}.priceBox[data-v-5e47370c]{width:80px}.pictrue[data-v-5e47370c]{width:50px;height:50px;border:1px dotted rgba(0,0,0,.1);display:inline-block;position:relative;cursor:pointer}.pictrue img[data-v-5e47370c]{width:100%;height:100%}[data-v-5e47370c] .el-input-number__decrease,[data-v-5e47370c] .el-input-number__increase{display:none}[data-v-5e47370c] .el-input-number.is-controls-right .el-input__inner,[data-v-5e47370c] .el-input__inner{padding:0 5px}.pictrueTab[data-v-5e47370c]{width:40px!important;height:40px!important}.upLoad[data-v-5e47370c]{width:40px;height:40px;border:1px dotted rgba(0,0,0,.1);border-radius:4px;background:rgba(0,0,0,.02);cursor:pointer}.bg[data-v-2060f2ce]{z-index:100;position:fixed;left:0;top:0;width:100%;height:100%;background:rgba(0,0,0,.5)}.goods_detail .goods_detail_wrapper[data-v-2060f2ce]{z-index:-10}[data-v-2060f2ce] table.el-input__inner{padding:0}.demo-table-expand[data-v-2060f2ce]{font-size:0}.demo-table-expand1[data-v-2060f2ce] label{width:77px!important;color:#99a9bf}.demo-table-expand .el-form-item[data-v-2060f2ce]{margin-right:0;margin-bottom:0;width:33.33%}.selWidth[data-v-2060f2ce]{width:350px!important}.seachTiele[data-v-2060f2ce]{line-height:35px}
				`@ -0,0 +1 @@`
				[data-v-2f60d12b] .el-form-item__content{position:static}.box-container[data-v-ca473d28]{overflow:hidden}.box-container .list[data-v-ca473d28]{float:left;line-height:40px}.box-container .sp[data-v-ca473d28]{width:50%}.box-container .sp3[data-v-ca473d28]{width:33.3333%}.box-container .sp100[data-v-ca473d28]{width:100%}.box-container .list .name[data-v-ca473d28]{display:inline-block;width:150px;text-align:right;color:#606266}.box-container .list .blue[data-v-ca473d28]{color:#1890ff}.box-container .list.image[data-v-ca473d28]{margin-bottom:40px}.box-container .list.image img[data-v-ca473d28]{position:relative;top:40px}.el-textarea[data-v-ca473d28]{width:400px}.copyBtn[data-v-ca473d28]{padding:6px 10px}.modalbox[data-v-4d63497b] .el-dialog{min-width:550px}.selWidth[data-v-4d63497b]{width:400px}.seachTiele[data-v-4d63497b]{line-height:35px}.fa[data-v-4d63497b]{color:#0a6aa1;display:block}.sheng[data-v-4d63497b]{color:red;display:block}
				`@ -0,0 +1 @@`
				.box-container[data-v-71c7a22c]{overflow:hidden}.box-container .list[data-v-71c7a22c]{float:left;line-height:40px}.box-container .sp[data-v-71c7a22c]{width:50%}.box-container .sp3[data-v-71c7a22c]{width:33.3333%}.box-container .sp100[data-v-71c7a22c]{width:100%}.box-container .list .name[data-v-71c7a22c]{display:inline-block;width:150px;text-align:right;color:#606266}.box-container .list .blue[data-v-71c7a22c]{color:#1890ff}.box-container .list.image[data-v-71c7a22c]{margin-bottom:40px}.box-container .list.image img[data-v-71c7a22c]{position:relative;top:40px}.el-textarea[data-v-71c7a22c]{width:400px}.customHeight[data-v-aed747c2]{height:800px}.container[data-v-76a17d47]{margin-top:30px;text-align:right}.customHeight[data-v-76a17d47]{height:800px}.table-cont[data-v-76a17d47]{max-height:300px;overflow-y:scroll}.modalbox[data-v-4e9cef11] .el-dialog{min-width:550px}.selWidth[data-v-4e9cef11]{width:400px}.seachTiele[data-v-4e9cef11]{line-height:35px}.fa[data-v-4e9cef11]{color:#0a6aa1;display:block}.sheng[data-v-4e9cef11]{color:red;display:block}
				`@ -0,0 +1 @@`
				(window["webpackJsonp"]=window["webpackJsonp"]\|\|[]).push([["chunk-00584afe"],{"94ad":function(t,e,a){"use strict";a("f851")},e15a:function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c\|\|e;return a("div",{staticClass:"divBox"},[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[a("div",{staticClass:"container"},[a("el-form",{attrs:{inline:""}},[a("el-form-item",{staticClass:"mr10",attrs:{label:"搜索:"}},[a("el-input",{staticClass:"selWidth",attrs:{placeholder:"请输入物流公司名称或者编码"},on:{input:function(e){return t.getList(1)}},model:{value:t.tableFrom.keyword,callback:function(e){t.$set(t.tableFrom,"keyword",e)},expression:"tableFrom.keyword"}}),t._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:function(e){return t.getList(1)}}},[t._v("搜索")])],1)],1)],1)]),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.listLoading,expression:"listLoading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData.data,size:"mini"}},[a("el-table-column",{attrs:{prop:"id",label:"ID","min-width":"150"}}),t._v(" "),a("el-table-column",{attrs:{prop:"name",label:"物流公司名称","min-width":"200"}}),t._v(" "),a("el-table-column",{attrs:{prop:"code",label:"编码","min-width":"200"}}),t._v(" "),a("el-table-column",{attrs:{label:"操作","min-width":"80",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(e){return[1==e.row.partner_id\|\|1==e.row.partner_key\|\|1==e.row.net_name?a("el-button",{attrs:{type:"text",size:"small"},on:{click:function(a){return t.handleEdit(e.row.id)}}},[t._v("月结账号编辑")]):t._e()]}}])})],1),t._v(" "),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"page-sizes":[20,40,60,80],"page-size":t.tableFrom.limit,"current-page":t.tableFrom.page,layout:"total, sizes, prev, pager, next, jumper",total:t.tableData.total},on:{"size-change":t.handleSizeChange,"current-change":t.pageChange}})],1)],1)],1)},n=[],l=a("8593"),s={name:"ExpressFreight",data:function(){return{tableData:{data:[],total:0},listLoading:!0,tableFrom:{page:1,limit:20,date:"",keyword:""},tabClickIndex:""}},mounted:function(){this.getList(1)},methods:{handleEdit:function(t){var e=this;this.$modalForm(Object(l["a"])(t)).then((function(){return e.getList("")}))},getList:function(t){var e=this;this.listLoading=!0,this.tableFrom.page=t\|\|this.tableFrom.page,Object(l["p"])(this.tableFrom).then((function(t){e.tableData.data=t.data.list,e.tableData.total=t.data.count,e.listLoading=!1})).catch((function(t){e.listLoading=!1,e.$message.error(t.message)}))},pageChange:function(t){this.tableFrom.page=t,this.getList("")},handleSizeChange:function(t){this.tableFrom.limit=t,this.getList("")}}},o=s,r=(a("94ad"),a("2877")),c=Object(r["a"])(o,i,n,!1,null,"66122ae6",null);e["default"]=c.exports},f851:function(t,e,a){}}]);
				`@ -0,0 +1 @@`
				`(window["webpackJsonp"]=window["webpackJsonp"]\|\|[]).push([["chunk-2d0aed35"],{"0c5a":function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c\|\|n;return t("router-view")},c=[],r=t("2877"),a={},l=Object(r["a"])(a,u,c,!1,null,null,null);n["default"]=l.exports}}]);`