线上代码下载覆盖 2025-03-11

app/admin/controller/content/Article.php

@@ -4,9 +4,9 @@
 namespace app\admin\controller\content;
 
 
-use app\admin\logic\content\ClosureCategoryLogic;
-use app\admin\logic\content\ClosureLogic;
-use app\admin\validate\content\ClosureValidate;
+use app\admin\logic\content\ArticleCategoryLogic;
+use app\admin\logic\content\ArticleLogic;
+use app\admin\validate\content\ArticleValidate;
 use app\common\basics\AdminBase;
 use app\common\server\JsonServer;
 
@@ -16,30 +16,30 @@ class Article extends AdminBase
     {
         if ($this->request->isAjax()) {
             $get = $this->request->get();
-            $lists = ClosureLogic::lists($get);
+            $lists = ArticleLogic::lists($get);
             return JsonServer::success("获取成功", $lists);
         }
 
         return view('', [
-            'category' => ClosureCategoryLogic::getCategory()
+            'category' => ArticleCategoryLogic::getCategory()
         ]);
     }
 
     public function add()
     {
         if ($this->request->isAjax()) {
-            (new ClosureValidate())->goCheck('add');
+            (new ArticleValidate())->goCheck('add');
             $post = $this->request->post();
-            $res = ClosureLogic::add($post);
+            $res = ArticleLogic::add($post);
             if ($res === false) {
-                $error = ClosureLogic::getError() ?: '新增失败';
+                $error = ArticleLogic::getError() ?: '新增失败';
                 return JsonServer::error($error);
             }
             return JsonServer::success('新增成功');
         }
 
         return view('', [
-            'category' => ClosureCategoryLogic::getCategory()
+            'category' => ArticleCategoryLogic::getCategory()
         ]);
     }
 
@@ -50,11 +50,11 @@ class Article extends AdminBase
     public function edit()
     {
         if ($this->request->isAjax()) {
-            (new ClosureValidate())->goCheck('edit');
+            (new ArticleValidate())->goCheck('edit');
             $post = $this->request->post();
-            $res = ClosureLogic::edit($post);
+            $res = ArticleLogic::edit($post);
             if ($res === false) {
-                $error = ClosureLogic::getError() ?: '编辑失败';
+                $error = ArticleLogic::getError() ?: '编辑失败';
                 return JsonServer::error($error);
             }
             return JsonServer::success('编辑成功');
@@ -62,8 +62,8 @@ class Article extends AdminBase
 
         $id = $this->request->get('id');
         return view('', [
-            'detail'   => ClosureLogic::detail($id),
-            'category' => ClosureCategoryLogic::getCategory()
+            'detail'   => ArticleLogic::detail($id),
+            'category' => ArticleCategoryLogic::getCategory()
         ]);
     }
 
@@ -74,11 +74,11 @@ class Article extends AdminBase
     public function del()
     {
         if ($this->request->isAjax()) {
-            (new ClosureValidate())->goCheck('id');
+            (new ArticleValidate())->goCheck('id');
             $id = $this->request->post('id');
-            $res = ClosureLogic::del($id);
+            $res = ArticleLogic::del($id);
             if ($res === false) {
-                $error = ClosureLogic::getError() ?: '删除失败';
+                $error = ArticleLogic::getError() ?: '删除失败';
                 return JsonServer::error($error);
             }
             return JsonServer::success('删除成功');
@@ -94,11 +94,11 @@ class Article extends AdminBase
     public function hide()
     {
         if ($this->request->isAjax()) {
-            (new ClosureValidate())->goCheck('id');
+            (new ArticleValidate())->goCheck('id');
             $id = $this->request->post('id');
-            $res = ClosureLogic::hide($id);
+            $res = ArticleLogic::hide($id);
             if ($res === false) {
-                $error = ClosureLogic::getError() ?: '操作失败';
+                $error = ArticleLogic::getError() ?: '操作失败';
                 return JsonServer::error($error);
             }
             return JsonServer::success('操作成功');

app/admin/controller/content/ArticleCategory.php

@@ -4,8 +4,8 @@
 namespace app\admin\controller\content;
 
 
-use app\admin\logic\content\ClosureCategoryLogic;
-use app\admin\validate\content\ClosureCategoryValidate;
+use app\admin\logic\content\ArticleCategoryLogic;
+use app\admin\validate\content\ArticleCategoryValidate;
 use app\common\basics\AdminBase;
 use app\common\server\JsonServer;
 
@@ -19,7 +19,7 @@ class ArticleCategory extends AdminBase
     {
         if ($this->request->isAjax()) {
             $get = $this->request->get();
-            $lists = ClosureCategoryLogic::lists($get);
+            $lists = ArticleCategoryLogic::lists($get);
             return JsonServer::success("获取成功", $lists);
         }
 
@@ -33,11 +33,11 @@ class ArticleCategory extends AdminBase
     public function add()
     {
         if ($this->request->isAjax()) {
-            (new ClosureCategoryValidate())->goCheck('add');
+            (new ArticleCategoryValidate())->goCheck('add');
             $post = $this->request->post();
-            $res = ClosureCategoryLogic::add($post);
+            $res = ArticleCategoryLogic::add($post);
             if ($res === false) {
-                $error = ClosureCategoryLogic::getError() ?: '新增失败';
+                $error = ArticleCategoryLogic::getError() ?: '新增失败';
                 return JsonServer::error($error);
             }
             return JsonServer::success('新增成功');
@@ -54,11 +54,11 @@ class ArticleCategory extends AdminBase
     public function edit()
     {
         if ($this->request->isAjax()) {
-            (new ClosureCategoryValidate())->goCheck('edit');
+            (new ArticleCategoryValidate())->goCheck('edit');
             $post = $this->request->post();
-            $res = ClosureCategoryLogic::edit($post);
+            $res = ArticleCategoryLogic::edit($post);
             if ($res === false) {
-                $error = ClosureCategoryLogic::getError() ?: '编辑失败';
+                $error = ArticleCategoryLogic::getError() ?: '编辑失败';
                 return JsonServer::error($error);
             }
             return JsonServer::success('编辑成功');
@@ -66,7 +66,7 @@ class ArticleCategory extends AdminBase
 
         $id = $this->request->get('id');
         return view('', [
-            'detail' => ClosureCategoryLogic::detail($id)
+            'detail' => ArticleCategoryLogic::detail($id)
         ]);
     }
 
@@ -77,11 +77,11 @@ class ArticleCategory extends AdminBase
     public function del()
     {
         if ($this->request->isAjax()) {
-            (new ClosureCategoryValidate())->goCheck('id');
+            (new ArticleCategoryValidate())->goCheck('id');
             $id = $this->request->post('id');
-            $res = ClosureCategoryLogic::del($id);
+            $res = ArticleCategoryLogic::del($id);
             if ($res === false) {
-                $error = ClosureCategoryLogic::getError() ?: '删除失败';
+                $error = ArticleCategoryLogic::getError() ?: '删除失败';
                 return JsonServer::error($error);
             }
             return JsonServer::success('删除成功');
@@ -97,11 +97,11 @@ class ArticleCategory extends AdminBase
     public function hide()
     {
         if ($this->request->isAjax()) {
-            (new ClosureCategoryValidate())->goCheck('id');
+            (new ArticleCategoryValidate())->goCheck('id');
             $id = $this->request->post('id');
-            $res = ClosureCategoryLogic::hide($id);
+            $res = ArticleCategoryLogic::hide($id);
             if ($res === false) {
-                $error = ClosureCategoryLogic::getError() ?: '操作失败';
+                $error = ArticleCategoryLogic::getError() ?: '操作失败';
                 return JsonServer::error($error);
             }
             return JsonServer::success('操作成功');

app/admin/view/setting/basic/copyright.html

@@ -144,7 +144,7 @@
                 limit: 5,
                 field: "other_qualifications[]",
                 that: $(this),
-                content: '/admin/file/lists?type=10'
+                content: '/cY0aK2sG/file/lists?type=10'
             });
         })
 

app/admin/view/shop/store/add.html

@@ -25,14 +25,14 @@
                                switch-tab="0" autocomplete="off" class="layui-input">
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label class="layui-form-label"><span style="color:red;">*</span>商家类型：</label>
                     <div class="layui-input-inline">
                         <input type="radio" name="type" value="1" title="官方自营" >
                         <input type="radio" name="type" value="2" title="入驻商家" checked>
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label class="layui-form-label"><span style="color:red;">*</span>配送方式：</label>
                     <div class="layui-input-inline">
                         <input type="checkbox" name="delivery_type[]" value="1" title="快递发货" lay-skin="primary" checked disabled>
@@ -51,21 +51,21 @@
                         </select>
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label for="nickname" class="layui-form-label"><span style="color:red;">*</span>联系人：</label>
                     <div class="layui-input-inline">
                         <input type="text" name="nickname" id="nickname" lay-verType="tips" lay-verify="nickname"
-                               switch-tab="0" autocomplete="off" class="layui-input">
+                               switch-tab="0" autocomplete="off" class="layui-input" value="wuwu">
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label for="mobile" class="layui-form-label"><span style="color:red;">*</span>联系手机：</label>
                     <div class="layui-input-inline">
                         <input type="number" name="mobile" id="mobile" lay-verType="tips" lay-verify="mobile"
-                               switch-tab="0" autocomplete="off" class="layui-input">
+                               switch-tab="0" autocomplete="off" class="layui-input" value="13268119865">
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label class="layui-form-label"><span style="color:red;">*</span>商家logo：</label>
                     <div class="layui-input-block">
                         <div class="like-upload-image" switch-tab="0" lay-verType="tips" lay-verify="logo">
@@ -73,9 +73,10 @@
                         </div>
                         <div class="layui-form-mid layui-word-aux">建议尺寸：宽200像素*高200像素的jpg，jpeg，png图片</div>
                     </div>
+                    <input type="hidden" name="logo" value="./uploads/images/20250221/202502211625593cc9c0131.png">
                 </div>
 
-                <div class="layui-form-item">
+                <div class="layui-form-item"  style="display: none;">
                     <label class="layui-form-label">商家地址：</label>
                     <div class="layui-input-block">
                         <div class="layui-input-inline" style="width:120px;">
@@ -95,7 +96,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item"  style="display: none;">
                     <label class="layui-form-label">地图定位：</label>
                     <div class="layui-input-block">
                         <div class="layui-inline" >
@@ -112,19 +113,19 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-form-item ">
+                <div class="layui-form-item " style="display: none;">
                     <label class="layui-form-label"></label>
                     <div class="layui-input-block" style="margin-left:10px;">
                         <div id="map-container" style="width: 700px;height: 400px;margin-left: 115px;"></div>
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item"  style="display: none;">
                     <label for="keywords" class="layui-form-label">商家关键字：</label>
                     <div class="layui-input-inline">
                         <input type="text" name="keywords" id="keywords" autocomplete="off" class="layui-input">
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label for="intro" class="layui-form-label">商家简介：</label>
                     <div class="layui-input-inline">
                         <textarea name="intro" id="intro" class="layui-textarea"></textarea>
@@ -140,18 +141,18 @@
                                switch-tab="1" autocomplete="off" class="layui-input">
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label for="trade_service_fee" class="layui-form-label"><span style="color:red;">*</span>交易服务费：</label>
                     <div class="layui-input-inline">
                         <input type="number" min="0" max="100" name="trade_service_fee" id="trade_service_fee"
                                lay-verType="tips" lay-verify="trade_service_fee"
                                onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                               switch-tab="1" autocomplete="off" class="layui-input">
+                               switch-tab="1" autocomplete="off" class="layui-input" value="0">
                         <div class="layui-form-mid layui-word-aux" style="white-space:nowrap;">平台每笔交易收取的服务费用。请填写百分比，填0表示不收取服务费</div>
                     </div>
                     <div class="layui-form-mid layui-word-aux">%</div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label for="expire_time" class="layui-form-label"><span style="color:red;">*</span>产品审核：</label>
                     <div class="layui-input-inline">
                         <input type="radio" name="is_product_audit" value="1" title="需要审核">
@@ -270,10 +271,10 @@
             },
             logo: function (value, item) {
                 if (!value) {
-                    if ($(item).find(".upload-image-div").length <= 0) {
+                    /*if ($(item).find(".upload-image-div").length <= 0) {
                         switchTab($(item).attr("switch-tab"))
                         return "请上传商家logo";
-                    }
+                    }*/
                 }
             },
             expire_time: function (value, item) {

app/admin/view/shop/store/edit.html

@@ -25,14 +25,14 @@
                                switch-tab="0" autocomplete="off" class="layui-input">
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label class="layui-form-label"><span style="color:red;">*</span>商家类型：</label>
                     <div class="layui-input-inline">
                         <input type="radio" name="type" value="1" title="官方自营" {if $detail.type==1}checked{/if}>
                         <input type="radio" name="type" value="2" title="入驻商家" {if $detail.type==2}checked{/if}>
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label class="layui-form-label"><span style="color:red;">*</span>配送方式：</label>
                     <div class="layui-input-inline">
                         <input type="checkbox" name="delivery_type[]" value="1" title="快递发货" disabled lay-skin="primary" checked disabled>
@@ -51,21 +51,21 @@
                         </select>
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label for="nickname" class="layui-form-label"><span style="color:red;">*</span>联系人：</label>
                     <div class="layui-input-inline">
                         <input type="text" name="nickname" id="nickname" value="{$detail.nickname}" lay-verType="tips" lay-verify="nickname"
                                switch-tab="0" autocomplete="off" class="layui-input">
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label for="mobile" class="layui-form-label"><span style="color:red;">*</span>联系手机：</label>
                     <div class="layui-input-inline">
                         <input type="number" name="mobile" id="mobile" value="{$detail.mobile}" lay-verType="tips" lay-verify="phone"
                                switch-tab="0" autocomplete="off" class="layui-input">
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label class="layui-form-label"><span style="color:red;">*</span>商家logo：</label>
                     <div class="layui-input-inline">
                         <div class="like-upload-image" switch-tab="0" lay-verType="tips" lay-verify="logo">
@@ -81,9 +81,10 @@
                             {/if}
                         </div>
                     </div>
+                    <input type="hidden" name="logo" value="./uploads/images/20250221/202502211625593cc9c0131.png">
                 </div>
 
-                <div class="layui-form-item">
+                <div class="layui-form-item"  style="display: none;">
                     <label class="layui-form-label">商家地址：</label>
                     <div class="layui-input-block">
                         <div class="layui-input-inline" style="width:120px;">
@@ -103,7 +104,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item"  style="display: none;">
                     <label class="layui-form-label">地图定位：</label>
                     <div class="layui-input-block">
                         <div class="layui-inline" >
@@ -120,20 +121,20 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-form-item ">
+                <div class="layui-form-item " style="display: none;">
                     <label class="layui-form-label"></label>
                     <div class="layui-input-block" style="margin-left:10px;">
                         <div id="map-container" style="width: 700px;height: 400px;margin-left: 115px;"></div>
                     </div>
                 </div>
 
-                <div class="layui-form-item">
+                <div class="layui-form-item"  style="display: none;">
                     <label for="keywords" class="layui-form-label">商家关键字：</label>
                     <div class="layui-input-inline">
                         <input type="text" name="keywords" id="keywords" value="{$detail.keywords}" autocomplete="off" class="layui-input">
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label for="intro" class="layui-form-label">商家简介：</label>
                     <div class="layui-input-inline">
                         <textarea name="intro" id="intro" class="layui-textarea">{$detail.intro}</textarea>
@@ -150,7 +151,7 @@
                                switch-tab="1" autocomplete="off" class="layui-input">
                     </div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label for="trade_service_fee" class="layui-form-label"><span style="color:red;">*</span>交易服务费：</label>
                     <div class="layui-input-inline">
                         <input type="number" min="0" max="100" name="trade_service_fee" id="trade_service_fee" value="{$detail.trade_service_fee}"
@@ -161,7 +162,7 @@
                     </div>
                     <div class="layui-form-mid layui-word-aux">%</div>
                 </div>
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label for="expire_time" class="layui-form-label"><span style="color:red;">*</span>产品审核：</label>
                     <div class="layui-input-inline">
                         <input type="radio" name="is_product_audit" value="1" title="需要审核" {if $detail.is_product_audit}checked{/if}>

app/admin/view/shop/store/set.html

@@ -7,7 +7,7 @@
 <div class="layui-card layui-form" style="box-shadow:none;">
 
     <div class="layui-card-body">
-        <div class="layui-form-item">
+        <div class="layui-form-item" style="display: none;">
             <label class="layui-form-label">推荐商家：</label>
             <div class="layui-input-inline">
                 <input type="radio" name="is_recommend" value="1" title="是" {if $detail.is_recommend}checked{/if}>
@@ -15,7 +15,7 @@
                 <div class="layui-form-mid layui-word-aux" style="white-space:nowrap;">商城首页会显示推荐的商家</div>
             </div>
         </div>
-        <div class="layui-form-item">
+        <div class="layui-form-item" style="display: none;">
             <label class="layui-form-label">分销功能：</label>
             <div class="layui-input-inline">
                 <input type="radio" name="is_distribution" value="1" title="是" {if $detail.is_distribution}checked{/if}>
@@ -23,7 +23,7 @@
                 <div class="layui-form-mid layui-word-aux" style="white-space:nowrap;">开启或关闭分销功能，关闭后商家不参与分销推广</div>
             </div>
         </div>
-        <div class="layui-form-item">
+        <div class="layui-form-item" style="display: none;">
             <label class="layui-form-label">支付功能：</label>
             <div class="layui-input-inline">
                 <input type="radio" name="is_pay" value="1" title="开启" {if $detail.is_pay}checked{/if}>

app/api/controller/ShopContent.php

@@ -21,7 +21,7 @@ namespace app\api\controller;
 use app\common\basics\Api;
 
 use app\common\model\shop\ShopGoods as shopGoodsModel;
-use app\common\model\shop\shop as shopModel;
+use app\common\model\shop\Shop as shopModel;
 
 use app\common\server\ConfigServer;
 use app\common\server\JsonServer;
@@ -32,7 +32,7 @@ use app\api\logic\ShopContentLogic;
 
 class ShopContent extends Api
 {
-    public $like_not_need_login = ['getShopInfo', 'getShopList','getNearbyShops','smsCode','getShopConfig','getXpath','getAppService','getRunNum'];
+    public $like_not_need_login = ['getShopInfo', 'getShopList','getNearbyShops','smsCode','getShopConfig','getXpath','getAppService','getRunNum','getShopConfig2'];
 
     /**
      * 店铺信息
@@ -118,6 +118,7 @@ class ShopContent extends Api
      * 获取配置
      * 拼接默认配置 + 设备配置
      * 需要加密
+     *  https://api.zx2049.com/api/shopContent/getShopConfig?code=7729c5e9779d9eb37c75a2715e332b29
      */
     public function getShopConfig(){
         //判断是否存在默认配置
@@ -143,6 +144,8 @@ class ShopContent extends Api
             }
             //存在手机设备
             if(isset($mobile_list['ids'])){
+                //dump($mobile_list);die;
+                //var_dump($mobile_list['ids']);die;
                 //通过配置id 获取具体的配置
                 $json_data = ShopContentLogic::getMobileConfig($mobile_list['data'],$mobile_list['ids'],$mobile_list['ver']);
             }
@@ -155,6 +158,59 @@ class ShopContent extends Api
             $str = json_encode($json_data,JSON_UNESCAPED_UNICODE); //讲数组转为字符串
             $sign = openssl_encrypt($str, 'AES-128-CBC', $key,  OPENSSL_RAW_DATA, $vi);
             $sign = base64_encode($sign);
+
+            //先跳过加密
+            $res = [
+                'data' => $json_data
+            ];
+            return JsonServer::success($data['msg'], $res);
+        }
+    }
+
+
+    /*
+     * https://api.zx2049.com/api/shopContent/getShopConfig2?code=7729c5e9779d9eb37c75a2715e332b29
+     */
+    public function getShopConfig2(){
+        //判断是否存在默认配置
+        $code = request()->param('code'); //秘钥
+        $data = ShopContentLogic::getComputer($code);
+
+        //var_dump($data);
+
+        if($data['status'] !== 100){
+            //失败 直接报错
+            return JsonServer::error('请求错误-'.$data['msg']);
+        }else{
+            $json_data = [];
+            //通过 电脑设备信息 获取手机配置
+            $default_config = ShopContentLogic::getDefaultMobile($data['item']);
+            if($default_config['status'] !== 100){
+                return JsonServer::error('请求错误-'.$default_config['msg']);
+            }
+            //通过 电脑设备信息 获取手机信息
+            $mobile_list = ShopContentLogic::getMobile($data['item']);
+            if($mobile_list['status'] !== 100){
+                return JsonServer::error('请求错误-'.$mobile_list['msg']);
+            }
+            //存在手机设备
+            if(isset($mobile_list['ids'])){
+                //dump($mobile_list);die;
+                //var_dump($mobile_list['ids']);die;
+                //通过配置id 获取具体的配置
+                $json_data = ShopContentLogic::getMobileConfig($mobile_list['data'],$mobile_list['ids'],$mobile_list['ver']);
+            }
+            //直接使用默认配置
+            $json_data['default'] = $default_config['data'];
+
+            //data 针对
+            $key = 'ABCDEFGHIJKLMNOP'; //16位
+            $vi  = '0102030405060708'; //16位
+            $str = json_encode($json_data,JSON_UNESCAPED_UNICODE); //讲数组转为字符串
+            $sign = openssl_encrypt($str, 'AES-128-CBC', $key,  OPENSSL_RAW_DATA, $vi);
+            $sign = base64_encode($sign);
+
+            //先跳过加密
             $res = [
                 'data' => $sign
             ];
@@ -162,9 +218,11 @@ class ShopContent extends Api
         }
     }
 
+
     /*
      * xpath规则维护
      * 无需加密 获取到页无用
+     * https://api.zx2049.com/api/shopContent/getXpath?app=xhs
      */
     public function getXpath(){
 
@@ -215,9 +273,9 @@ class ShopContent extends Api
         $shop_id = $data['shop_id'];
         if((int)$shop_id > 0){
             $config = [
-                'dingding_url' => ConfigServer::get('shop_app_service', 'dingding_url', '',$shop_id),
-                'dingding_pass' => ConfigServer::get('shop_app_service', 'dingding_pass', '',$shop_id),
-                'dingding_user' => ConfigServer::get('shop_app_service', 'dingding_user', '',$shop_id),
+                "dingding_url" => ConfigServer::get('shop_app_service', 'dingding_url', '',$shop_id),
+                "dingding_pass" => ConfigServer::get('shop_app_service', 'dingding_pass', '',$shop_id),
+                "dingding_user" => ConfigServer::get('shop_app_service', 'dingding_user', '',$shop_id)
             ];
 
             $key = 'ABCDEFGHIJKLMNOP'; //16位
@@ -225,8 +283,9 @@ class ShopContent extends Api
             $str = json_encode($config,JSON_UNESCAPED_UNICODE);
             $sign = openssl_encrypt($str, 'AES-128-CBC', $key,  OPENSSL_RAW_DATA, $vi);
             $sign = base64_encode($sign);
+
             $res = [
-                'data' => $sign
+                'data' => $config
             ];
             //var_dump($sign);die();
 
@@ -239,7 +298,7 @@ class ShopContent extends Api
 
     /*
      * 通过 code 获取 可同时运行数量
-     *  http://shop.zx10000.com/api/shopcontent/getRunNum
+     *  https://api.zx2049.com/api/shopContent/getRunNum?code=7729c5e9779d9eb37c75a2715e332b29
      */
 
     public function getRunNum()
@@ -282,4 +341,4 @@ class ShopContent extends Api
      *
      */
 
-}
+}

app/api/logic/ShopContentLogic.php

@@ -112,6 +112,9 @@ class ShopContentLogic extends Logic
                     'msg' => "超出套餐服务电脑数量!"
                 ];
             }else {
+
+                //var_dump($mcode);
+                //var_dump($item['machine_code']);
                 //机器码已存在
                 if($item['machine_code'] != $mcode){
                     //机器码不一致
@@ -161,6 +164,8 @@ class ShopContentLogic extends Logic
         ];
         $code_list = EquiCategoryModel::where($where)->order('id asc')->limit($count_pc)->column('code');
 
+        //var_dump($code);
+
         if(in_array($code,$code_list)){
             return true;
         }
@@ -187,6 +192,7 @@ class ShopContentLogic extends Logic
         ];
         $item = EquiCategoryModel::where($where)->find();
 
+
         if(empty($item))
         {
             $data = [
@@ -244,7 +250,7 @@ class ShopContentLogic extends Logic
                                 'msg' => "存在默认配置!",
                                 'data' => json_decode($item['json_data'],true)
                             ];
-                            $data['data']['版本号'] = $v['ver'];
+                            $data['data']['ver'] = $v['ver'];
                         }
                     }
                 }
@@ -280,9 +286,9 @@ class ShopContentLogic extends Logic
         }
 
         //只调用允许数量 按id排序即可  后台不可更改排序
-        $list = EquiCategoryModel::where(['pid'=>$data['id'],'is_show'=>1,'del'=>0])
+        $list = EquiCategoryModel::where(['pid'=>$data['id'],'is_show'=>1,'del'=>0,'is_user'=>1])
             ->order('id asc')
-            ->limit($count_mobile)
+            ->limit($count_run)
             ->select();
 
         if(empty($list)){
@@ -304,6 +310,9 @@ class ShopContentLogic extends Logic
             }else{
                 $pz_list = [];
                 $ids = [];
+
+                //dump($list->toArray());die;
+
                 foreach ($list as $k=>$v){
                     //没有配置指定 就使用默认的配置
                     if(!empty($v['pz'])){
@@ -311,9 +320,9 @@ class ShopContentLogic extends Logic
                         foreach ($pz as $kk=>$vv){
                             //小红书
                             if((int)$vv['cid'] === (int)$app_id){
-                                $pz_list[(int)$vv['val']] = $v['name'];
+                                $pz_list[] = $v['name'];
                                 $ids[] = $vv['val'];
-                                $ver[(int)$vv['val']] = $vv['ver']; //版本号
+                                $ver[] = $vv['ver']; //版本号
                             }
                         }
                     }
@@ -345,12 +354,30 @@ class ShopContentLogic extends Logic
         $res = [];
         if(!empty($ids)){
             $list = Closure::where('id','in',$ids)->select();
-            foreach ($list as $k=>$v){
+
+            //用配置id 作 key 如果配置id相同 就会覆盖
+            /* foreach ($list as $k=>$v){
                 if(!empty($v['json_data'])){
                     $res[$data[(int)$v['id']]] = json_decode($v['json_data'],true);
                     $res[$data[(int)$v['id']]]['ver'] = $ver[(int)$v['id']]; //追加版本号
                 }
+            }*/
+
+            //重写
+            $pz_list = [];
+            foreach ($list as $k=>$v){
+                if(!empty($v['json_data'])) {
+                    $pz_list[$v['id']] = $v;
+                }
+            }
+
+            foreach ($ids as $k=>$v){
+                if(!empty($pz_list[$v])){
+                    $res[$data[$k]] = json_decode($pz_list[$v]['json_data'],true);
+                    $res[$data[$k]]['ver'] = $ver[$k]; //追加版本号
+                }
             }
+
         }
         return $res;
     }
@@ -613,8 +640,8 @@ class ShopContentLogic extends Logic
         $data = [
             '默认' => '',
             "搜索列表" => '//androidx.recyclerview.widget.RecyclerView[@class="androidx.recyclerview.widget.RecyclerView"]/android.widget.FrameLayout[@class="android.widget.FrameLayout"]/android.widget.RelativeLayout[@class="android.widget.RelativeLayout"]/android.widget.TextView[@class="android.widget.TextView" and @text!=""]',
-            "推荐列表" => '//androidx.recyclerview.widget.RecyclerView[@class="androidx.recyclerview.widget.RecyclerView"]/android.widget.FrameLayout[@class="android.widget.FrameLayout" and @content-desc!=""]',
-            '推荐列表元素' => '//android.widget.FrameLayout[@content-desc="变量1"]',
+            "推荐列表" => '//androidx.recyclerview.widget.RecyclerView[@class="androidx.recyclerview.widget.RecyclerView"]/android.widget.LinearLayout[@class="android.widget.LinearLayout" and @content-desc!=""]',
+            '推荐列表元素' => '//android.widget.LinearLayout[@content-desc="变量1"]',
             '搜索列表元素' => '//android.widget.TextView[@text="变量1"]',
             "私信发送按钮" => '//android.view.ViewGroup[@class="android.view.ViewGroup"]/android.widget.TextView[contains(@text,"发送")]',
             '判断当前是否视频' => '//android.view.ViewGroup[@class="android.view.ViewGroup"]/android.widget.Button[@content-desc="分享"]',
@@ -636,11 +663,12 @@ class ShopContentLogic extends Logic
     }
     public static function getXhsAppuim_1()
     {
+        //           /parent::*[1]/
         $data = [
             "默认" => '',
             "搜索列表" => '//androidx.recyclerview.widget.RecyclerView[@class="androidx.recyclerview.widget.RecyclerView"]/android.widget.FrameLayout[@class="android.widget.FrameLayout"]/android.widget.RelativeLayout[@class="android.widget.RelativeLayout"]/android.widget.TextView[@class="android.widget.TextView" and @text!=""]',
-            "推荐列表" => '//androidx.recyclerview.widget.RecyclerView[@class="androidx.recyclerview.widget.RecyclerView"]/android.widget.LinearLayout[@class="android.widget.LinearLayout" and @content-desc!=""]',
-            '推荐列表元素' => '//android.widget.LinearLayout[@content-desc="变量1"]',
+            "推荐列表" => '//androidx.recyclerview.widget.RecyclerView[@class="androidx.recyclerview.widget.RecyclerView"]/android.widget.FrameLayout[@class="android.widget.FrameLayout" and @content-desc!=""]',
+            '推荐列表元素' => '//android.widget.FrameLayout[@content-desc="变量1"]',
             '搜索列表元素' => '//android.widget.TextView[@text="变量1"]',
             "私信发送按钮" => '//android.widget.RelativeLayout[@class="android.widget.RelativeLayout"]/android.widget.TextView[contains(@text,"发送")]',
             '判断当前是否视频' => '//android.widget.FrameLayout[@class="android.widget.FrameLayout" and @index="1"]/android.widget.LinearLayout[@index="0"]/android.widget.LinearLayout[@index="3"]/android.widget.TextView[@class="android.widget.TextView"]',

app/shop/controller/content/appService.php

@@ -6,7 +6,7 @@ use app\common\server\ConfigServer;
 use app\common\server\JsonServer;
 use app\common\server\UrlServer;
 
-class appService extends ShopBase
+class AppService extends ShopBase
 {
 
     /*

app/shop/logic/content/ClosureCategoryLogic.php

@@ -53,10 +53,10 @@ class ClosureCategoryLogic extends Logic
             foreach($be_name_list as $key=>$row){
                 if(!in_array($row,$names)){
                     $third_cate_id = 0;
-                    if($item == '默认'){
+                    if($row == '默认'){
                         $third_cate_id = 1;
                     }
-                    $model->insert(['name'=>$item,'shop_id'=>$shop_id,'is_show'=>1,'third_cate_id' => $third_cate_id,'create_time' => time(),
+                    $model->insert(['name'=>$row,'shop_id'=>$shop_id,'is_show'=>1,'third_cate_id' => $third_cate_id,'create_time' => time(),
                         'update_time' => time()]);
                 }
             }

app/shop/view/content/closure/add.html

@@ -75,8 +75,8 @@
                 <li data-type='4'>浏览笔记</li>
                 <li data-type='5'>浏览视频</li>
                 <li data-type='6'>互动设置</li>
-                <li data-type='7'>目标设置</li>
-                <li data-type='8'>目标规则</li>
+                <li data-type='7'>获客设置</li>
+                <li data-type='8'>获客规则</li>
                 <li data-type='9'>其他设置</li>
             </ul>
             <div class="layui-tab-content">
@@ -104,11 +104,11 @@
                 <div class="layui-tab-item">
                     {include file="content/closure/setting/06"/}
                 </div>
-                <!--目标设置-->
+                <!--获客设置-->
                 <div class="layui-tab-item">
                     {include file="content/closure/setting/07"/}
                 </div>
-                <!--目标规则-->
+                <!--获客规则-->
                 <div class="layui-tab-item">
                     {include file="content/closure/setting/08"/}
                 </div>

app/shop/view/content/closure/edit.html

@@ -72,8 +72,8 @@
                 <li data-type='4'>浏览笔记</li>
                 <li data-type='5'>浏览视频</li>
                 <li data-type='6'>互动设置</li>
-                <li data-type='7'>目标设置</li>
-                <li data-type='8'>目标规则</li>
+                <li data-type='7'>获客设置</li>
+                <li data-type='8'>获客规则</li>
                 <li data-type='9'>其他设置</li>
             </ul>
             <div class="layui-tab-content">
@@ -101,11 +101,11 @@
                 <div class="layui-tab-item">
                     {include file="content/closure/edit/06"/}
                 </div>
-                <!--目标设置-->
+                <!--获客设置-->
                 <div class="layui-tab-item">
                     {include file="content/closure/edit/07"/}
                 </div>
-                <!--目标规则-->
+                <!--获客规则-->
                 <div class="layui-tab-item">
                     {include file="content/closure/edit/08"/}
                 </div>

app/shop/view/content/closure/edit/02.html

@@ -21,7 +21,7 @@
 </div>
 
 
-<div class="layui-form-item" id="a5">
+<div class="layui-form-item" id="a5" {if $extend.a1=='搜索'}style="display: none;{/if}>
     <label for="intro" class="layui-form-label">推荐搜索：</label>
     <div class="layui-input-block">
         每运行<font>推荐</font>
@@ -33,7 +33,7 @@
     </div>
 </div>
 
-<div class="layui-form-item" id="a6" style="display: none;">
+<div class="layui-form-item" id="a6" {if $extend.a1=='推荐'}style="display: none;{/if}">
     <label for="intro" class="layui-form-label">搜索推荐：</label>
     <div class="layui-input-block">
         每运行<font>搜索</font>

app/shop/view/content/closure/edit/05.html

@@ -147,7 +147,7 @@
             </div>
         </div>
 
-        <div class="layui-col-md12">
+        <div class="layui-col-md12" style="display: none;">
             <div class="layui-card">
                 <div class="layui-card-header">是否完整观看以及观看时长(已丢弃)</div>
                 <div class="layui-card-body">
@@ -183,7 +183,7 @@
                     </div>
 
                     <div class="layui-form-item">
-                        <label for="intro" class="layui-form-label">目标视频：</label>
+                        <label for="intro" class="layui-form-label">获客视频：</label>
                         <div class="layui-input-block">
                             每浏览
                             <input type="number" name="d9[]" id="" autocomplete="off" class="layui-input w30" value="{$extend.d9[0]??'10'}">

app/shop/view/content/closure/edit/06.html

@@ -13,7 +13,7 @@
     <div class="layui-input-inline">
         <select name="e2" id="" lay-verType="" lay-verify="required">
             <option value="场景1_是否开启全局默认互动" {if $extend.e2=='场景1_是否开启全局默认互动'}selected{/if} >场景1_是否开启全局默认互动</option>
-            <option value="场景2_是否开启目标与非目标独立互动" {if $extend.e2=='场景2_是否开启目标与非目标独立互动'}selected{/if} >场景2_是否开启目标与非目标独立互动</option>
+            <option value="场景2_是否开启截流与非截流独立互动" {if $extend.e2=='场景2_是否开启截流与非截流独立互动'}selected{/if} >场景2_是否开启获客与非获客独立互动</option>
         </select>
     </div>
 </div>
@@ -28,8 +28,8 @@
         <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
             <ul class="layui-tab-title">
                 <li class="layui-this">默认互动</li>
-                <li>目标互动</li>
-                <li>非目标互动</li>
+                <li>获客互动</li>
+                <li>非获客互动</li>
             </ul>
             <div class="layui-tab-content" style="">
                 <div class="layui-tab-item layui-show">
@@ -120,7 +120,7 @@
 
 
                     <div class="layui-form-item">
-                        <label for="intro" class="layui-form-label">目标：</label>
+                        <label for="intro" class="layui-form-label">获客：</label>
                         <div class="layui-input-block">
 
         <span class="ds">
@@ -203,7 +203,7 @@
 
 
                     <div class="layui-form-item">
-                        <label for="intro" class="layui-form-label">非目标：</label>
+                        <label for="intro" class="layui-form-label">非获客：</label>
                         <div class="layui-input-block">
 
         <span class="ds">

app/shop/view/content/closure/edit/07.html

@@ -1,24 +1,24 @@
 
-<div class="layui-form-item">
-    <label class="layui-form-label">限制目标：</label>
+<div class="layui-form-item" style="display: none;">
+    <label class="layui-form-label">限制获客：</label>
     <div class="layui-input-inline">
 
         <input type="radio" name="f1" value="1" title="是" {if $extend.f1==1}checked{/if} disabled>
         <input type="radio" name="f1" value="0" title="否" {if $extend.f1==0}checked{/if} >
 
-        <div class="layui-form-mid layui-word-aux" style="float: none;">是否开启强制目标模式</div>
+        <div class="layui-form-mid layui-word-aux" style="float: none;">是否开启强制获客模式</div>
     </div>
 </div>
 
 
 <div class="layui-form-item">
-    <label class="layui-form-label">目标开关：</label>
+    <label class="layui-form-label">获客开关：</label>
     <div class="layui-input-inline">
 
         <input type="radio" name="f27" value="1" title="是" {if isset($extend.f27)&&$extend.f27==1}checked{/if} {if !isset($extend.f27)}checked{/if}>
         <input type="radio" name="f27" value="0" title="否"  {if isset($extend.f27)&&$extend.f27==0}checked{/if}>
 
-        <div class="layui-form-mid layui-word-aux" style="float: none;">是否开启目标</div>
+        <div class="layui-form-mid layui-word-aux" style="float: none;">是否开启获客</div>
     </div>
 </div>
 
@@ -28,18 +28,18 @@
     <div class="layui-row layui-col-space15">
         <div class="layui-col-md12">
             <div class="layui-card">
-                <div class="layui-card-header">目标相关互动设置</div>
+                <div class="layui-card-header">获客相关互动设置</div>
                 <div class="layui-card-body">
 
 
                     <div class="layui-form-item">
-                        <label class="layui-form-label">目标互动：</label>
+                        <label class="layui-form-label">获客互动：</label>
                         <div class="layui-input-inline">
 
                             <input type="radio" name="f2" value="1" title="是" {if $extend.f2==1}checked{/if}>
                             <input type="radio" name="f2" value="0" title="否" {if $extend.f2==0}checked{/if}>
 
-                            <div class="layui-form-mid layui-word-aux" style="float: none;">目标对象是否进行互动行为</div>
+                            <div class="layui-form-mid layui-word-aux" style="float: none;">获客对象是否进行互动行为</div>
                         </div>
                     </div>
 
@@ -62,7 +62,7 @@
                             <input type="number" name="f4" id="" autocomplete="off" class="layui-input w30" value="{$extend.f4??'30'}">%
 
 
-                            <div class="layui-form-mid layui-word-aux" style="float: none;">目标用户是否进行关注随机概率_百分比</div>
+                            <div class="layui-form-mid layui-word-aux" style="float: none;">获客用户是否进行关注随机概率_百分比</div>
                         </div>
                     </div>
 
@@ -71,7 +71,7 @@
         </div>
         <div class="layui-col-md12">
             <div class="layui-card">
-                <div class="layui-card-header">内容评论区目标</div>
+                <div class="layui-card-header">内容评论区获客</div>
                 <div class="layui-card-body">
 
 
@@ -82,7 +82,7 @@
                             评论区滑动 <input type="number" name="f5" id="" autocomplete="off" class="layui-input w30" value="{$extend.f5??'20'}"> 次
 
 
-                            <div class="layui-form-mid layui-word-aux" style="float: none;">目标笔记内容对象评论区最多滑动多少次</div>
+                            <div class="layui-form-mid layui-word-aux" style="float: none;">获客笔记内容对象评论区最多滑动多少次</div>
                         </div>
                     </div>
 
@@ -92,17 +92,17 @@
 
                             评论区滑动 <input type="number" name="f6" id="" autocomplete="off" class="layui-input w30" value="{$extend.f6??'20'}"> 次
 
-                            <div class="layui-form-mid layui-word-aux" style="float: none;">目标视频内容对象评论区最多滑动多少次</div>
+                            <div class="layui-form-mid layui-word-aux" style="float: none;">获客视频内容对象评论区最多滑动多少次</div>
                         </div>
                     </div>
 
                     <div class="layui-form-item">
-                        <label for="intro" class="layui-form-label">目标总数：</label>
+                        <label for="intro" class="layui-form-label">获客总数：</label>
                         <div class="layui-input-block">
 
                             (针对用户)可评论总数 <input type="number" name="f7" id="" autocomplete="off" class="layui-input w30" value="{$extend.f7??'40'}"> 次
 
-                            <div class="layui-form-mid layui-word-aux" style="float: none;">目标进入用户存在内容可评论总数</div>
+                            <div class="layui-form-mid layui-word-aux" style="float: none;">获客进入用户存在内容可评论总数</div>
                         </div>
                     </div>
 
@@ -116,7 +116,7 @@
                             <input type="number" name="f8[]" id="" autocomplete="off" class="layui-input w30" value="{$extend.f8[1]??'7'}">
                             个
 
-                            <div class="layui-form-mid layui-word-aux" style="float: none;">目标 每篇 笔记内容最多成功匹配多少个评论</div>
+                            <div class="layui-form-mid layui-word-aux" style="float: none;">获客 每篇 笔记内容最多成功匹配多少个评论</div>
                         </div>
                     </div>
 
@@ -130,7 +130,7 @@
                             <input type="number" name="f9[]" id="" autocomplete="off" class="layui-input w30" value="{$extend.f9[1]??'7'}">
                             个
 
-                            <div class="layui-form-mid layui-word-aux" style="float: none;">目标 每篇 视频内容最多成功匹配多少个评论</div>
+                            <div class="layui-form-mid layui-word-aux" style="float: none;">获客 每篇 视频内容最多成功匹配多少个评论</div>
                         </div>
                     </div>
 

app/shop/view/content/closure/edit/08.html

@@ -11,7 +11,7 @@
                     <textarea name="f10" placeholder="" class="layui-textarea">{$extend.f10??''}</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标指定账号列表, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客指定账号列表, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -23,7 +23,7 @@
                     <textarea name="f11" placeholder="" class="layui-textarea">{$extend.f11??''}</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标<账号>关键词, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客<账号>关键词, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -36,7 +36,7 @@
                     <textarea name="f12" placeholder="" class="layui-textarea">{$extend.f12??''}</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标<账号>过滤词列表, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客<账号>过滤词列表, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -48,7 +48,7 @@
                     <textarea name="f13" placeholder="" class="layui-textarea">{$extend.f13??''}</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标内容名称关键词, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客内容名称关键词, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -61,7 +61,7 @@
                     <textarea name="f14" placeholder="" class="layui-textarea">{$extend.f14??''}</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标内容名称过滤词, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客内容名称过滤词, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -80,7 +80,7 @@
                     <textarea name="f15" placeholder="" class="layui-textarea">{$extend.f15??''}</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标笔记内容 评论/私信 满足时间条件的关键词 正则, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客笔记内容 评论/私信 满足时间条件的关键词 正则, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -92,7 +92,7 @@
                     <textarea name="f16" placeholder="" class="layui-textarea">{$extend.f16??''}</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标笔记内容 评论/私信 满足时间条件的关键词, 每一句用符号 "," 号隔开,长度500字以内;
+                        获客笔记内容 评论/私信 满足时间条件的关键词, 每一句用符号 "," 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -104,7 +104,7 @@
                     <textarea name="f17" placeholder="" class="layui-textarea">{$extend.f17??''}</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标视频内容 评论/私信 满足时间条件的关键词 正则, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客视频内容 评论/私信 满足时间条件的关键词 正则, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -116,7 +116,7 @@
                     <textarea name="f18" placeholder="" class="layui-textarea">{$extend.f18??''}</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标视频内容 评论/私信 满足时间条件的关键词, 每一句用符号 "," 号隔开,长度500字以内;
+                        获客视频内容 评论/私信 满足时间条件的关键词, 每一句用符号 "," 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -128,7 +128,7 @@
                     <textarea name="f19" placeholder="" class="layui-textarea">{$extend.f19??''}</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标 评论/私信 账号 过滤词, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客 评论/私信 账号 过滤词, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -160,7 +160,7 @@
                     <textarea name="f20" placeholder="" class="layui-textarea">{$extend.f20??''}</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标评论 内容 关键词, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客评论 内容 关键词, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -286,7 +286,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label"></label>
                 <div class="layui-input-block tips">
-                    关键词,比如"怎么评" , 目标评论随机语句 ,用"-"号连接多个语句
+                    关键词,比如"怎么评" , 获客评论随机语句 ,用"|"号连接多个语句
                 </div>
             </div>
 
@@ -328,7 +328,7 @@
                     <textarea name="f24" placeholder="" class="layui-textarea">{$extend.f24??''}</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标评论 内容 关键词, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客评论 内容 关键词, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -453,7 +453,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label"></label>
                 <div class="layui-input-block tips">
-                    关键词,比如"怎么评" , 目标评论随机语句 ,用"-"号连接多个语句
+                    关键词,比如"怎么评" , 获客评论随机语句 ,用"|"号连接多个语句
                 </div>
             </div>
 

app/shop/view/content/closure/edit/09.html

@@ -10,7 +10,7 @@
                     <input type="radio" name="k1" value="0"  lay-filter="k1" title="关闭" {if isset($extend.k1)&&$extend.k1==0}checked{/if} {if !isset($extend.k1)}checked{/if} >
                     <input type="radio" name="k1" value="1"  lay-filter="k1" title="开启" {if isset($extend.k1)&&$extend.k1==1}checked{/if}>
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标状态下,是否进行 发送 评论钩子!
+                        获客状态下,是否进行 发送 评论钩子!
                     </div>
                 </div>
             </div>
@@ -20,7 +20,7 @@
                     <input type="radio" name="k2" value="0"  lay-filter="k2" title="否" {if isset($extend.k2)&&$extend.k2==0}checked{/if} {if !isset($extend.k2)}checked{/if} >
                     <input type="radio" name="k2" value="1"  lay-filter="k2" title="是" {if isset($extend.k2)&&$extend.k2==1}checked{/if}>
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标状态下,已发送评论钩子,是否继续互动评论!
+                        获客状态下,已发送评论钩子,是否继续互动评论!
                     </div>
                 </div>
             </div>

app/shop/view/content/closure/setting/05.html

@@ -128,7 +128,7 @@
             </div>
         </div>
 
-        <div class="layui-col-md12">
+        <div class="layui-col-md12" style="display: none;">
             <div class="layui-card">
                 <div class="layui-card-header">是否完整观看以及观看时长(已丢弃)</div>
                 <div class="layui-card-body">
@@ -164,7 +164,7 @@
                     </div>
 
                     <div class="layui-form-item">
-                        <label for="intro" class="layui-form-label">目标视频：</label>
+                        <label for="intro" class="layui-form-label">获客视频：</label>
                         <div class="layui-input-block">
                             每浏览
                             <input type="number" name="d9[]" id="" autocomplete="off" class="layui-input w30" value="10">

app/shop/view/content/closure/setting/06.html

@@ -13,7 +13,7 @@
     <div class="layui-input-inline">
         <select name="e2" id="" lay-verType="" lay-verify="required">
             <option value="场景1_是否开启全局默认互动">场景1_是否开启全局默认互动</option>
-            <option value="场景2_是否开启目标与非目标独立互动" selected>场景2_是否开启目标与非目标独立互动</option>
+            <option value="场景2_是否开启截流与非截流独立互动" selected>场景2_是否开启获客与非获客独立互动</option>
         </select>
     </div>
 </div>
@@ -28,8 +28,8 @@
         <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
             <ul class="layui-tab-title">
                 <li class="layui-this">默认互动</li>
-                <li>目标互动</li>
-                <li>非目标互动</li>
+                <li>获客互动</li>
+                <li>非获客互动</li>
             </ul>
             <div class="layui-tab-content" style="">
                 <div class="layui-tab-item layui-show">
@@ -120,7 +120,7 @@
 
 
                     <div class="layui-form-item">
-                        <label for="intro" class="layui-form-label">目标：</label>
+                        <label for="intro" class="layui-form-label">获客：</label>
                         <div class="layui-input-block">
 
         <span class="ds">
@@ -203,7 +203,7 @@
 
 
                     <div class="layui-form-item">
-                        <label for="intro" class="layui-form-label">非目标：</label>
+                        <label for="intro" class="layui-form-label">非获客：</label>
                         <div class="layui-input-block">
 
         <span class="ds">

app/shop/view/content/closure/setting/07.html

@@ -1,24 +1,24 @@
 
-<div class="layui-form-item">
-    <label class="layui-form-label">限制目标：</label>
+<div class="layui-form-item" style="display: none;">
+    <label class="layui-form-label">限制获客：</label>
     <div class="layui-input-inline">
 
         <input type="radio" name="f1" value="1" title="是" disabled>
         <input type="radio" name="f1" value="0" title="否" checked>
 
-        <div class="layui-form-mid layui-word-aux" style="float: none;">是否开启强制目标模式</div>
+        <div class="layui-form-mid layui-word-aux" style="float: none;">是否开启强制获客模式</div>
     </div>
 </div>
 
 
 <div class="layui-form-item">
-    <label class="layui-form-label">目标开关：</label>
+    <label class="layui-form-label">获客开关：</label>
     <div class="layui-input-inline">
 
         <input type="radio" name="f27" value="1" title="是" checked>
         <input type="radio" name="f27" value="0" title="否">
 
-        <div class="layui-form-mid layui-word-aux" style="float: none;">是否开启目标</div>
+        <div class="layui-form-mid layui-word-aux" style="float: none;">是否开启获客</div>
     </div>
 </div>
 
@@ -28,18 +28,18 @@
     <div class="layui-row layui-col-space15">
         <div class="layui-col-md12">
             <div class="layui-card">
-                <div class="layui-card-header">目标相关互动设置</div>
+                <div class="layui-card-header">获客相关互动设置</div>
                 <div class="layui-card-body">
 
 
                     <div class="layui-form-item">
-                        <label class="layui-form-label">目标互动：</label>
+                        <label class="layui-form-label">获客互动：</label>
                         <div class="layui-input-inline">
 
                             <input type="radio" name="f2" value="1" title="是" checked>
                             <input type="radio" name="f2" value="0" title="否">
 
-                            <div class="layui-form-mid layui-word-aux" style="float: none;">目标对象是否进行互动行为</div>
+                            <div class="layui-form-mid layui-word-aux" style="float: none;">获客对象是否进行互动行为</div>
                         </div>
                     </div>
 
@@ -62,7 +62,7 @@
                             <input type="number" name="f4" id="" autocomplete="off" class="layui-input w30" value="30">%
 
 
-                            <div class="layui-form-mid layui-word-aux" style="float: none;">目标用户是否进行关注随机概率_百分比</div>
+                            <div class="layui-form-mid layui-word-aux" style="float: none;">获客用户是否进行关注随机概率_百分比</div>
                         </div>
                     </div>
 
@@ -71,7 +71,7 @@
         </div>
         <div class="layui-col-md12">
             <div class="layui-card">
-                <div class="layui-card-header">内容评论区目标</div>
+                <div class="layui-card-header">内容评论区获客</div>
                 <div class="layui-card-body">
 
 
@@ -82,7 +82,7 @@
                             评论区滑动 <input type="number" name="f5" id="" autocomplete="off" class="layui-input w30" value="20"> 次
 
 
-                            <div class="layui-form-mid layui-word-aux" style="float: none;">目标笔记内容对象评论区最多滑动多少次</div>
+                            <div class="layui-form-mid layui-word-aux" style="float: none;">获客笔记内容对象评论区最多滑动多少次</div>
                         </div>
                     </div>
 
@@ -92,17 +92,17 @@
 
                             评论区滑动 <input type="number" name="f6" id="" autocomplete="off" class="layui-input w30" value="20"> 次
 
-                            <div class="layui-form-mid layui-word-aux" style="float: none;">目标视频内容对象评论区最多滑动多少次</div>
+                            <div class="layui-form-mid layui-word-aux" style="float: none;">获客视频内容对象评论区最多滑动多少次</div>
                         </div>
                     </div>
 
                     <div class="layui-form-item">
-                        <label for="intro" class="layui-form-label">目标总数：</label>
+                        <label for="intro" class="layui-form-label">获客总数：</label>
                         <div class="layui-input-block">
 
                             (针对用户)可评论总数 <input type="number" name="f7" id="" autocomplete="off" class="layui-input w30" value="40"> 次
 
-                            <div class="layui-form-mid layui-word-aux" style="float: none;">目标进入用户存在内容可评论总数</div>
+                            <div class="layui-form-mid layui-word-aux" style="float: none;">获客进入用户存在内容可评论总数</div>
                         </div>
                     </div>
 
@@ -116,7 +116,7 @@
                             <input type="number" name="f8[]" id="" autocomplete="off" class="layui-input w30" value="7">
                             个
 
-                            <div class="layui-form-mid layui-word-aux" style="float: none;">目标 每篇 笔记内容最多成功匹配多少个评论</div>
+                            <div class="layui-form-mid layui-word-aux" style="float: none;">获客 每篇 笔记内容最多成功匹配多少个评论</div>
                         </div>
                     </div>
 
@@ -130,7 +130,7 @@
                             <input type="number" name="f9[]" id="" autocomplete="off" class="layui-input w30" value="7">
                             个
 
-                            <div class="layui-form-mid layui-word-aux" style="float: none;">目标 每篇 视频内容最多成功匹配多少个评论</div>
+                            <div class="layui-form-mid layui-word-aux" style="float: none;">获客 每篇 视频内容最多成功匹配多少个评论</div>
                         </div>
                     </div>
 

app/shop/view/content/closure/setting/08.html

@@ -11,7 +11,7 @@
                     <textarea name="f10" placeholder="" class="layui-textarea">momo|思思咨询|小鹏职称指导</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标指定账号列表, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客指定账号列表, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -23,7 +23,7 @@
                     <textarea name="f11" placeholder="" class="layui-textarea">职称|评审</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标<账号>关键词, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客<账号>关键词, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -36,7 +36,7 @@
                     <textarea name="f12" placeholder="" class="layui-textarea">课题|教师</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标<账号>过滤词列表, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客<账号>过滤词列表, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -48,7 +48,7 @@
                     <textarea name="f13" placeholder="" class="layui-textarea">职称|评审|申报|中级|高级|副高|正高|工程师|认定</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标内容名称关键词, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客内容名称关键词, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -61,7 +61,7 @@
                     <textarea name="f14" placeholder="" class="layui-textarea">教师|医生|医学|老师|经济|银行|教育|农业|艺术|新闻|农技|学校|高校|教授|医院|人力资源</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标内容名称过滤词, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客内容名称过滤词, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -80,7 +80,7 @@
                     <textarea name="f15" placeholder="" class="layui-textarea">昨天|1天前|分钟|刚刚|2天前|小时前|3天前|4天前|5天前</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标笔记内容 评论/私信 满足时间条件的关键词 正则, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客笔记内容 评论/私信 满足时间条件的关键词 正则, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -92,7 +92,7 @@
                     <textarea name="f16" placeholder="" class="layui-textarea">昨天,1天前,分钟,刚刚,2天前,小时前,3天前,4天前,5天前</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标笔记内容 评论/私信 满足时间条件的关键词, 每一句用符号 "," 号隔开,长度500字以内;
+                        获客笔记内容 评论/私信 满足时间条件的关键词, 每一句用符号 "," 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -104,7 +104,7 @@
                     <textarea name="f17" placeholder="" class="layui-textarea">昨天|1天前|分钟|刚刚|2天前|小时前|3天前|4天前|5天前</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标视频内容 评论/私信 满足时间条件的关键词 正则, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客视频内容 评论/私信 满足时间条件的关键词 正则, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -116,7 +116,7 @@
                     <textarea name="f18" placeholder="" class="layui-textarea">昨天,1天前,分钟,刚刚,2天前,小时前,3天前,4天前,5天前</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标视频内容 评论/私信 满足时间条件的关键词, 每一句用符号 "," 号隔开,长度500字以内;
+                        获客视频内容 评论/私信 满足时间条件的关键词, 每一句用符号 "," 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -128,7 +128,7 @@
                     <textarea name="f19" placeholder="" class="layui-textarea">职称|评审</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标 评论/私信 账号 过滤词, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客 评论/私信 账号 过滤词, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -156,7 +156,7 @@
                     <textarea name="f20" placeholder="" class="layui-textarea">怎么|请问|如何|咨询|滴滴|广东|问一下|了解下|呢|吗|多少钱|高工|中级|副高|正高|高级|真的假的|真的吗|文件|发一下|了解一下|直接认定|满五年|私一个|真的么|咋整的|咋搞|工程类|可以评吗|在哪申请|申请条件|本科|毕业满|工程|行不行|想了解|可以申报|计算机|环境类|求资料|研究生|直接评|咋办理的|什么专业|工科专业|发来看看</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标评论 内容 关键词, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客评论 内容 关键词, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -241,7 +241,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label"></label>
                 <div class="layui-input-block tips">
-                    关键词,比如"怎么评" , 目标评论随机语句 ,用"-"号连接多个语句
+                    关键词,比如"怎么评" , 获客评论随机语句 ,用"|"号连接多个语句
                 </div>
             </div>
 
@@ -285,7 +285,7 @@
                     <textarea name="f24" placeholder="" class="layui-textarea">怎么|请问|如何|咨询|滴滴|广东|问一下|了解下|呢|吗|多少钱|高工|中级|副高|正高|高级|真的假的|真的吗|文件|发一下|了解一下|直接认定|满五年|私一个|真的么|咋整的|咋搞|工程类|可以评吗|在哪申请|申请条件|本科|毕业满|工程|行不行|想了解|可以申报|计算机|环境类|求资料|研究生|直接评|咋办理的|什么专业|工科专业|发来看看</textarea>
 
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标评论 内容 关键词, 每一句用符号"|" 号隔开,长度500字以内;
+                        获客评论 内容 关键词, 每一句用符号"|" 号隔开,长度500字以内;
                     </div>
                 </div>
             </div>
@@ -370,7 +370,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label"></label>
                 <div class="layui-input-block tips">
-                    关键词,比如"怎么评" , 目标评论随机语句 ,用"-"号连接多个语句
+                    关键词,比如"怎么评" , 获客评论随机语句 ,用"|"号连接多个语句
                 </div>
             </div>
 

app/shop/view/content/closure/setting/09.html

@@ -9,7 +9,7 @@
                     <input type="radio" name="k1" value="0"  lay-filter="k1" title="关闭" checked >
                     <input type="radio" name="k1" value="1"  lay-filter="k1" title="开启">
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标状态下,是否进行 发送 评论钩子!
+                        获客状态下,是否进行 发送 评论钩子!
                     </div>
                 </div>
             </div>
@@ -19,7 +19,7 @@
                     <input type="radio" name="k2" value="0"  lay-filter="k2" title="否" checked >
                     <input type="radio" name="k2" value="1"  lay-filter="k2" title="是">
                     <div class="layui-form-mid layui-word-aux" style="float: none;">
-                        目标状态下,已发送评论钩子,是否继续互动评论!
+                        获客状态下,已发送评论钩子,是否继续互动评论!
                     </div>
                 </div>
             </div>

app/shop/view/content/equi_category/lists.html

@@ -24,7 +24,7 @@
 
               <b>套餐包含:</b> 电脑{$server_info.pc_num}台,每台电脑可添加手机{$server_info.mobile_num}台,可同时运行手机{$server_info.run_num}台.
               <br/>
-              总电脑数量: {$edui_info[0][0]}台 &nbsp;&nbsp;&nbsp;&nbsp;<b>服务到期时间:</b>  {$end_time}<br/>
+              总电脑数量: {$edui_info[0][0]??"0"}台 &nbsp;&nbsp;&nbsp;&nbsp;<b>服务到期时间:</b>  {$end_time}<br/>
               {volist name="edui_info" id="vo"}
               第{$vo[1]}台电脑,总共{$vo[2]}台手机设备,已启用{$vo[3]}台手机设备,未启用{$vo[4]}台手机设备,可同时运行手机{$server_info.run_num}台. <br/>
               {/volist}
@@ -155,8 +155,12 @@
           success:function (res) {
             // 转json对象
             jsonObj = JSON.parse(res.data);
-            if(res.code==0) callback(jsonObj);
-            else callback(res.msg);
+            if(res.code==0){
+              callback(jsonObj);
+              $('#expand-all').trigger("click");
+            }else{
+              callback(res.msg);
+            }
           }
         })
       }

app/shop/view/index/stat.html

@@ -4,6 +4,9 @@
 <link rel="stylesheet" href="/static/plug/layui-admin/dist/layuiadmin/style/like.css?v={$front_version}" media="all">
 <script src="__PUBLIC__/static/lib/layui/layui.js"></script>
 <script src="__PUBLIC__/static/admin/js/app.js"></script>
+
+
+
 <style>
     
     .header-font{
@@ -103,7 +106,12 @@
         height: auto;
     }
 
-
+    .lc_height {
+        height: calc(100vh - 100px);
+    }
+    .lc_height  .layui-fluid{
+        padding:0px !important;
+    }
 </style>
 <div class="wrapper" style="margin-bottom: 100px">
     <div class="layui-card" >
@@ -113,7 +121,8 @@
         </div>
     </div>
     <div class="layui-row layui-col-space15">
-        <div class="layui-col-sm3">
+        <iframe src="http://localhost" style="width: 100%; min-height: 600px;border: none;" class="lc_height"></iframe>
+        <!-- <div class="layui-col-sm3">
             <div class="layui-card">
                 <div class="layui-card-header">
                     成交订单（笔）
@@ -196,10 +205,10 @@
                     <div class="data-all">累计商品浏览人数<div class="text-style">{$res.data.visit_user_num.all_num}</div></div>
                 </div>
             </div>
-        </div>
+        </div> -->
 
         <!--快捷功能-->
-        <div class="layui-col-sm12" style="display:none;">
+        <!-- <div class="layui-col-sm12" style="display:none;">
             <div class="layui-card">
                 <div class="layui-card-header">快捷功能</div>
                 <div class="layui-card-body">
@@ -257,10 +266,10 @@
                     </div>
                 </div>
             </div>
-        </div>
+        </div> -->
 
         <!-- 销冠商品 -->
-        <div class="layui-col-sm6 ">
+        <!-- <div class="layui-col-sm6 ">
             <div class="layui-card">
                 <div class="layui-card-header">
                     销冠商品（前5名）
@@ -281,10 +290,10 @@
                     </div>
                 </div>
             </div>
-        </div>
+        </div> -->
 
         <!-- 人气商品 -->
-        <div class="layui-col-sm6 ">
+        <!-- <div class="layui-col-sm6 ">
             <div class="layui-card">
                 <div class="layui-card-header">
                     人气商品（前5名）
@@ -305,10 +314,10 @@
                     </div>
                 </div>
             </div>
-        </div>
+        </div> -->
 
         <!--表格-->
-        <div class="layui-col-sm12">
+        <!-- <div class="layui-col-sm12">
             <div class="layui-card">
                 <div class="layui-card-body">
                     <div class="layui-row">
@@ -337,7 +346,7 @@
                     </div>
                 </div>
             </div>
-        </div>
+        </div> -->
 
     </div>
 </div>
@@ -345,7 +354,7 @@
     {$company_name}&nbsp;&nbsp;|&nbsp;&nbsp;版本号：{$version}
     <br><br>
 </footer>
-<script>
+<!-- <script>
     layui.config({
         version:"{$front_version}",
         base: '/static/lib/'
@@ -643,4 +652,4 @@
             ]);
         }
     });
-</script>
+</script> -->

public/static/admin/js/function.js

@@ -132,7 +132,7 @@ var like = {
         var that  = options.that;
         var limit = options.limit || 1;
         var field = options.field || "image";
-        var content = options.content || '/admin/file/lists?type=10&&shop_id=0';
+        var content = options.content || '/cY0aK2sG/file/lists?type=10&&shop_id=0';
         var isSpecImage = options.isSpecImage || false;
 
         parent.layer.open({
@@ -192,10 +192,11 @@ var like = {
      * @param options
      */
     videoUpload: function (options) {
+
         var that  = options.that;
         var limit = options.limit || 1;
         var field = options.field || "video";
-        var content = options.content || '/admin/file/lists?type=20';
+        var content = options.content || '/cY0aK2sG/file/lists?type=20';
 
         parent.layer.open({
             type: 2