chore: 去掉多余的注释

2026-01-17 08:45:12 +08:00
parent 0f1ef3757f
commit 1f60f84bc3
622 changed files with 14123 additions and 18365 deletions
--- a/src/app/shop/controller/Account.php
+++ b/src/app/shop/controller/Account.php
@@ -1,14 +1,5 @@
 <?php

-/**
- 
- 
- 
-
-
- 
- */
-
 namespace app\shop\controller;

 use app\model\member\Withdraw;
--- a/src/app/shop/controller/Articlecategory.php
+++ b/src/app/shop/controller/Articlecategory.php
@@ -1,13 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/BaseShop.php
+++ b/src/app/shop/controller/BaseShop.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Cashorder.php
+++ b/src/app/shop/controller/Cashorder.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Config.php
+++ b/src/app/shop/controller/Config.php
@@ -44,7 +44,7 @@ class Config extends BaseShop
            $res = $config_model->setCopyright($data, $this->site_id, $this->app_module);
            return $res;
        }
-        $this->assign('is_auth', ( $auth_info[ 'code' ] >= 0 ? 1 : 0 ));
+        $this->assign('is_auth', ($auth_info[ 'code' ] >= 0 ? 1 : 0));
        $this->assign('copyright_config', $copyright[ 'data' ][ 'value' ]);
        return $this->fetch('config/copyright');
    }
@@ -210,6 +210,33 @@ class Config extends BaseShop

    }

+    /**
+     * 企业微信配置
+     */
+    public function wxwork()
+    {
+        $config_model = new ConfigModel();
+        if (request()->isJson()) {
+            $data = [
+                'corp_id' => input('corp_id', ''),
+                'agent_id' => input('agent_id', ''),
+                'secret' => input('secret', ''),
+                'contact_id' => input('contact_id', ''),
+                'contact_url' => input('contact_url', ''),
+                'timestamp' => input('timestamp', ''),
+                'nonceStr' => input('nonceStr', ''),
+                'signature' => input('signature', ''),
+                'enabled' => input('enabled', 0)
+            ];
+            $this->addLog('修改企业微信配置');
+            return $config_model->setWxworkConfig($data, $this->site_id, $this->app_module);
+        } else {
+            $config_result = $config_model->getWxworkConfig($this->site_id, $this->app_module);
+            $this->assign('wxwork_config', $config_result[ 'data' ][ 'value' ]);
+            return $this->fetch('config/wxwork');
+        }
+    }
+
    /**
     * 域名跳转配置
     */
--- a/src/app/shop/controller/Delivery.php
+++ b/src/app/shop/controller/Delivery.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Error.php
+++ b/src/app/shop/controller/Error.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Express.php
+++ b/src/app/shop/controller/Express.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Gamesrecords.php
+++ b/src/app/shop/controller/Gamesrecords.php
@@ -1,15 +1,7 @@
 <?php

-/**
- 
- 
- 


-
- 
- */
-
 namespace app\shop\controller;

 use app\model\games\Record as RecordModel;
--- a/src/app/shop/controller/Goodsattr.php
+++ b/src/app/shop/controller/Goodsattr.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Goodslabel.php
+++ b/src/app/shop/controller/Goodslabel.php
@@ -1,13 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Goodsservice.php
+++ b/src/app/shop/controller/Goodsservice.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/H5.php
+++ b/src/app/shop/controller/H5.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Help.php
+++ b/src/app/shop/controller/Help.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Local.php
+++ b/src/app/shop/controller/Local.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Localorder.php
+++ b/src/app/shop/controller/Localorder.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Memberaccount.php
+++ b/src/app/shop/controller/Memberaccount.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Membercluster.php
+++ b/src/app/shop/controller/Membercluster.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Memberlabel.php
+++ b/src/app/shop/controller/Memberlabel.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Memberlevel.php
+++ b/src/app/shop/controller/Memberlevel.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Memberwithdraw.php
+++ b/src/app/shop/controller/Memberwithdraw.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Message.php
+++ b/src/app/shop/controller/Message.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

@@ -54,7 +46,7 @@ class Message extends BaseShop
        $weapp_config = ( new WeappConfig() )->getWeappConfig($this->site_id)[ 'data' ][ 'value' ];
        $this->assign('weapp_config', $weapp_config);

-       
+        // 牛云短信余额查询
        if (addon_is_exit('niusms', $this->site_id)) {
            $sms_config = ( new NiuSmsConfig() )->getSmsConfig($this->site_id)[ 'data' ];
            if ($sms_config[ 'is_use' ]) {
--- a/src/app/shop/controller/Notice.php
+++ b/src/app/shop/controller/Notice.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Orderimportfile.php
+++ b/src/app/shop/controller/Orderimportfile.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Orderrefund.php
+++ b/src/app/shop/controller/Orderrefund.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Printer.php
+++ b/src/app/shop/controller/Printer.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Promotion.php
+++ b/src/app/shop/controller/Promotion.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Shopacceptmessage.php
+++ b/src/app/shop/controller/Shopacceptmessage.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Shophelp.php
+++ b/src/app/shop/controller/Shophelp.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Store.php
+++ b/src/app/shop/controller/Store.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Storeorder.php
+++ b/src/app/shop/controller/Storeorder.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/System.php
+++ b/src/app/shop/controller/System.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Ueditor.php
+++ b/src/app/shop/controller/Ueditor.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Upload.php
+++ b/src/app/shop/controller/Upload.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/User.php
+++ b/src/app/shop/controller/User.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Verify.php
+++ b/src/app/shop/controller/Verify.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Virtualgoods.php
+++ b/src/app/shop/controller/Virtualgoods.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/controller/Virtualorder.php
+++ b/src/app/shop/controller/Virtualorder.php
@@ -1,12 +1,4 @@
 <?php
-/**
- 
- 
- 
-
-
- 
- */

 namespace app\shop\controller;

--- a/src/app/shop/view/cashorder/detail.html
+++ b/src/app/shop/view/cashorder/detail.html
@@ -1,12 +1,11 @@
-
-
 <link rel="stylesheet" href="SHOP_CSS/order_detail.css"/>

-
 <!-- 订单详情、订单状态 -->
-<div class="order-detail">
-    <div class="title">订单详情</div>
-    <div class="order-information order-information-bottom">
+<div class="order-detail layui-card card-common card-brief">
+    <div class="layui-card-header">
+        <span class="card-title">订单详情</span>
+    </div>
+    <div class="order-information order-information-bottom layui-card-body">
        <div class="order-information-contentOne">
            <div class="contentOne-content">
                <div class="contentOne-content-title">交易流水号：</div>
@@ -68,21 +67,26 @@
        <div class="order-information-contentTwo"></div>
    </div>
    
-    <div class="title">订单状态</div>
-    <div class="order-information-contentOne order-orderStatus-contentOne ">
+    <div class="layui-card-header">
+        <span class="card-title">订单状态</span>
+    </div>
+    <div class="order-information-contentOne order-orderStatus-contentOne layui-card-body">
        <div class="contentOne-content">
            <div class="contentOne-content-title">订单状态：</div>
            <div class="contentOne-content-text contentOne-content-textNew">{$order_detail.order_status_name}</div>
        </div>
        <div class="contentTow-operation">
-            <div class="contentTow-operation-content" onclick="orderRemark('{$order_detail.order_id}')">备注</div>
+            <div class="contentTow-operation-content bg-color-light-9 contentTow-operation-new" onclick="orderRemark('{$order_detail.order_id}')">备注</div>
            {php}
            $order_json_data = json_decode($order_detail['order_status_action'], true);
            $action = $order_json_data['action'];
            {/php}
            {foreach $action as $action_k => $action_item}
-                <a class="contentTow-operation-content contentTow-operation-new" href="javascript:orderAction('{$action_item.action}', '{$order_detail.order_id}')">{$action_item.title}</a>
+                <a class="contentTow-operation-content bg-color-light-9 contentTow-operation-new" href="javascript:orderAction('{$action_item.action}', '{$order_detail.order_id}')">{$action_item.title}</a>
            {/foreach}
+            {if addon_is_exit("printer") && $order_detail.order_status != -1}
+            <a class="contentTow-operation-content bg-color-light-9 contentTow-operation-new bg-color-light-9" href="javascript:printTicket('{$order_detail.order_id}');" >打印小票</a>
+            {/if}
        </div>
        <div class="orderStatus">
            <div class="orderStatus-content-title">提醒：</div>
@@ -96,8 +100,10 @@
    {if isset($order_detail.form)}
        <!-- 表单信息 -->
        <div class="formFields">
-            <div class="title">表单信息</div>
-            <div class="order-information order-formFields">
+            <div class="layui-card-header">
+                <span class="card-title">表单信息</span>
+            </div>
+            <div class="order-information order-formFields layui-card-body">
                {foreach name="$order_detail.form" item="vo"}
                <div class="contentOne-content">
                    <div class="contentOne-content-title">{$vo.title}：</div>
@@ -125,8 +131,10 @@
    {if  $order_detail['is_invoice'] == 1}
        <!-- 发票信息 -->
        <div class="formFields">
-            <div class="title">发票信息</div>
-            <div class="order-information order-formFields">
+            <div class="layui-card-header">
+                <span class="card-title">发票信息</span>
+            </div>
+            <div class="order-information order-formFields layui-card-body">
                <div class="contentOne-content">
                    <div class="contentOne-content-title">发票类型：</div>
                    <div class="contentOne-content-text">{if $order_detail['invoice_type'] == 1}纸质{else/}电子{/if}{if $order_detail['is_tax_invoice'] == 1}专票{else/}普票{/if}</div>
@@ -178,9 +186,11 @@
 </div>

 <!-- 商品信息、订单操作日志 -->
-<div class="shop-information">
-    <div class="title">商品信息</div>
-    <div class="shop-information-table">
+<div class="shop-information layui-card card-common card-brief">
+    <div class="layui-card-header">
+        <span class="card-title">商品信息</span>
+    </div>
+    <div class="shop-information-table layui-card-body">
        <table lay-filter="parse-table-order-product" lay-skin="line">
            <thead>
                <tr class="table-trOne">
@@ -250,9 +260,11 @@

 {notempty name="$order_detail.order_log"}
 <!-- 订单操作 -->
-<div class="shop-operation">
-    <div class="title">订单操作日志</div>
-    <div class="shop-operation-time">
+<div class="shop-operation layui-card card-common card-brief">
+    <div class="layui-card-header">
+        <span class="card-title">订单操作日志</span>
+    </div>
+    <div class="shop-operation-time layui-card-body">
        <ul class="layui-timeline">
            {foreach name="$order_detail.order_log" item="vo"}
            <li class="layui-timeline-item">
@@ -276,5 +288,3 @@
 {include file="order/order_common_action" /}
 <!-- 修改订单收货地址 -->
 {include file="order/order_action" /}
-
-
--- a/src/app/shop/view/config/map.html
+++ b/src/app/shop/view/config/map.html
@@ -1,12 +1,7 @@
-
-
-
 <style type="text/css">
 	.inline-block{display: inline-block;}
 </style>

-
-
 <div class="layui-form form-wrap">
 	<div class="layui-form-item">
 		<label class="layui-form-label">腾讯地图KEY：</label>
@@ -16,6 +11,7 @@
 		</div>
 		<div class="word-aux">
 			<p>平台腾讯定位地图应用KEY</p>
+			<p>使用场景:手机端收货地址选择、查询距离最近的门店，管理端店铺联系地址，管理端-门店地图选择</p>
 		</div>
 	</div>
 	<div class="layui-form-item">
@@ -25,6 +21,16 @@
 		</div>
 		<div class="word-aux">开启后，进入首页将获取定位信息</div>
 	</div>
+	<div class="layui-form-item">
+		<label class="layui-form-label">定位有效期：</label>
+		<div class="layui-input-block">
+			<div class="layui-input-inline">
+				<input type="number" class="layui-input len-short" name="wap_valid_time" value="{$info.wap_valid_time}" />
+			</div>
+			<span class="layui-form-mid">分钟</span>
+		</div>
+		<div class="word-aux">过期后将重新获取定位信息，0为不过期</div>
+	</div>

 	<div class="form-row">
 		<button class="layui-btn" lay-submit lay-filter="save">保存</button>
@@ -32,8 +38,6 @@
 	
 </div>

-
-
 <script>
 	layui.use('form', function() {
 		var form = layui.form,
--- a/src/app/shop/view/config/pay.html
+++ b/src/app/shop/view/config/pay.html
@@ -1,7 +1,3 @@
-
-
-
-
 <!-- 列表 -->
 <table id="pay_list" lay-filter="pay_list"></table>

@@ -24,8 +20,6 @@
 	</div>
 </script>

-
-
 <script>
 	var table = new Table({
 		elem: '#pay_list',
@@ -48,8 +42,16 @@
 			}, {
 				field: 'desc',
 				title: '支付方式描述',
-				width: '60%',
+				width: '45%',
 				unresize: 'false'
+			},{
+				field: 'status',
+				title: '支付状态',
+				width: '15%',
+				unresize: 'false',
+				templet: function (data){
+					return data.pay_status == 1 ? '已开启✅' : '未开启';
+				}
 			}, {
 				title: '操作',
 				toolbar: '#operation',
--- a/src/app/shop/view/config/servicer.html
+++ b/src/app/shop/view/config/servicer.html
@@ -54,6 +54,7 @@
 					{case value="wxwork"}企业微信客服{/case}
 					{case value="third"}第三方客服{/case}
 					{/switch}
+					{if addon_is_exit('aikefu') && $config.h5.type == 'aikefu'}智能客服{/if}
 				</div>
 			</div>
 			<div class="layui-form-item">
@@ -62,8 +63,9 @@
 					{switch name="$config.weapp.type"}
 					{case value="none"}未启用{/case}
 					{case value="wxwork"}企业微信客服{/case}
-					{case value="weapp"}小程序客服{/case}
+					{case value="weapp"}小程序系统客服{/case}
 					{/switch}
+					{if addon_is_exit('aikefu') && $config.weapp.type == 'aikefu'}智能客服{/if}
 				</div>
 			</div>
 			{if addon_is_exit('pc', request()->siteid()) == 1}
@@ -74,6 +76,7 @@
 					{case value="none"}未启用{/case}
 					{case value="third"}第三方客服{/case}
 					{/switch}
+					{if addon_is_exit('aikefu') && $config.pc.type == 'aikefu'}智能客服{/if}
 				</div>
 			</div>
 			{/if}
@@ -86,6 +89,7 @@
 					{case value="soke"}Soke客服{/case}
 					{case value="aliapp"}蚂蚁智能客服{/case}
 					{/switch}
+					{if addon_is_exit('aikefu') && $config.aliapp.type == 'aikefu'}智能客服{/if}
 				</div>
 			</div>
 			{/if}
@@ -99,23 +103,27 @@
 		<div class="layui-form-item top">
 			<label class="layui-form-label"><span class="border-left border-color"></span>H5/微信公众号端</label>
 		</div>
-		<div class="layui-form-item">
-			<label class="layui-form-label">客服类型：</label>
-			<div class="layui-input-block">
-				<input type="radio" name="h5[type]" lay-filter="serviceType" lay-type="h5" value="none" title="不启用" {if condition="$config.h5.type == 'none'"} checked {/if}>
-				{if addon_is_exit('servicer')}<input type="radio" name="h5[type]" lay-filter="serviceType" lay-type="h5" value="soke" title="Soke客服" {if condition="$config.h5.type == 'soke'"} checked  {/if}>{/if}
-				<input type="radio" name="h5[type]" lay-filter="serviceType" lay-type="h5" value="wxwork" title="企业微信客服" {if condition="$config.h5.type == 'wxwork'"} checked {/if}>
-				<input type="radio" name="h5[type]" lay-filter="serviceType" lay-type="h5" value="third" title="第三方客服" {if condition="$config.h5.type == 'third'"} checked {/if}>
-			</div>
+	<div class="layui-form-item">
+		<label class="layui-form-label">客服类型：</label>
+		<div class="layui-input-block">
+			<input type="radio" name="h5[type]" lay-filter="serviceType" lay-type="h5" value="none" title="不启用" {if condition="$config.h5.type == 'none'"} checked {/if}>
+			{if addon_is_exit('servicer')}<input type="radio" name="h5[type]" lay-filter="serviceType" lay-type="h5" value="soke" title="Soke客服" {if condition="$config.h5.type == 'soke'"} checked  {/if}>{/if}
+			{if addon_is_exit('aikefu')}<input type="radio" name="h5[type]" lay-filter="serviceType" lay-type="h5" value="aikefu" title="智能客服" {if condition="$config.h5.type == 'aikefu'"} checked {/if}>{/if}
+			<input type="radio" name="h5[type]" lay-filter="serviceType" lay-type="h5" value="wxwork" title="企业微信客服" {if condition="$config.h5.type == 'wxwork'"} checked {/if}>
+			<input type="radio" name="h5[type]" lay-filter="serviceType" lay-type="h5" value="third" title="第三方客服" {if condition="$config.h5.type == 'third'"} checked {/if}>
 		</div>
-		<div class="h5-wrap wxwork" {if $config.h5.type != 'wxwork'} style="display: none" {/if}>
-		<div class="layui-form-item">
-			<label class="layui-form-label"><span class="required">*</span>企微客服链接：</label>
-			<div class="layui-input-block">
-				<input type="text" class="layui-input len-mid" name="h5[wxwork_url]" value="{$config.h5.wxwork_url ?? ''}" lay-verify="h5WxworkUrl">
-			</div>
+	</div>
+	<div class="h5-wrap wxwork" {if $config.h5.type != 'wxwork'} style="display: none" {/if}>
+	<div class="layui-form-item">
+		<label class="layui-form-label"><span class="required">*</span>企微客服链接：</label>
+		<div class="layui-input-block">
+			<input type="text" class="layui-input len-mid" name="h5[wxwork_url]" value="{$config.h5.wxwork_url ?? ''}" lay-verify="h5WxworkUrl">
 		</div>
-		<div class="word-aux">H5中如何接入企业微信客服请查看<a href="https://work.weixin.qq.com/nl/act/p/3f8820e724cb44c5" target="_blank" class="text-color">在微信内网页中接入</a></div>
+	</div>
+	<div class="word-aux">H5中如何接入企业微信客服请查看<a href="https://work.weixin.qq.com/nl/act/p/3f8820e724cb44c5" target="_blank" class="text-color">在微信内网页中接入</a></div>
+	</div>
+	<div class="h5-wrap aikefu" {if $config.h5.type != 'aikefu'} style="display: none" {/if}>
+	<div class="word-aux">智能客服功能已启用，系统将自动处理客户咨询。</div>
 	</div>
 	<div class="h5-wrap third" {if $config.h5.type != 'third'} style="display: none" {/if}>
 	<div class="layui-form-item">
@@ -134,7 +142,8 @@
 		<div class="layui-input-block">
 			<input type="radio" name="weapp[type]" lay-filter="serviceType" lay-type="weapp" value="none" title="不启用" {if condition="$config.weapp.type == 'none'"} checked {/if}>
 			{if addon_is_exit('servicer')}<input type="radio" name="weapp[type]" lay-filter="serviceType" lay-type="weapp" value="soke" title="Soke客服" {if condition="$config.weapp.type == 'soke'"} checked  {/if}>{/if}
-			<input type="radio" name="weapp[type]" lay-filter="serviceType" lay-type="weapp" value="weapp" title="小程序客服" {if condition="$config.weapp.type == 'weapp'"} checked {/if}>
+			<input type="radio" name="weapp[type]" lay-filter="serviceType" lay-type="weapp" value="weapp" title="小程序系统客服" {if condition="$config.weapp.type == 'weapp'"} checked {/if}>
+			{if addon_is_exit('aikefu')}<input type="radio" name="weapp[type]" lay-filter="serviceType" lay-type="weapp" value="aikefu" title="智能客服" {if condition="$config.weapp.type == 'aikefu'"} checked {/if}>{/if}
 			<input type="radio" name="weapp[type]" lay-filter="serviceType" lay-type="weapp" value="wxwork" title="企业微信客服" {if condition="$config.weapp.type == 'wxwork'"} checked {/if}>
 		</div>
 	</div>
@@ -153,6 +162,9 @@
 	</div>
 	<div class="word-aux">小程序中如何接入企业微信客服请查看<a href="https://work.weixin.qq.com/nl/act/p/a733314375294bdd" target="_blank" class="text-color">在小程序中接入</a></div>
 	</div>
+	<div class="weapp-wrap aikefu" {if $config.weapp.type != 'aikefu'} style="display: none" {/if}>
+	<div class="word-aux">智能客服功能已启用，系统将自动处理客户咨询。</div>
+	</div>
 	{if addon_is_exit('pc', request()->siteid()) == 1}
 	<div class="layui-form-item top">
 		<label class="layui-form-label"><span class="border-left border-color"></span>PC端</label>
@@ -161,9 +173,13 @@
 		<label class="layui-form-label">客服类型：</label>
 		<div class="layui-input-block">
 			<input type="radio" name="pc[type]" lay-filter="serviceType" lay-type="pc" value="none" title="不启用" {if condition="$config.pc.type == 'none'"} checked {/if}>
+			{if addon_is_exit('aikefu')}<input type="radio" name="pc[type]" lay-filter="serviceType" lay-type="pc" value="aikefu" title="智能客服" {if condition="$config.pc.type == 'aikefu'"} checked {/if}>{/if}
 			<input type="radio" name="pc[type]" lay-filter="serviceType" lay-type="pc" value="third" title="第三方客服" {if condition="$config.pc.type == 'third'"} checked {/if}>
 		</div>
 	</div>
+	<div class="pc-wrap aikefu" {if $config.pc.type != 'aikefu'} style="display: none" {/if}>
+	<div class="word-aux">智能客服功能已启用，系统将自动处理客户咨询。</div>
+	</div>
 	<div class="pc-wrap third" {if $config.pc.type != 'third'} style="display: none" {/if}>
 	<div class="layui-form-item">
 		<label class="layui-form-label"><span class="required">*</span>第三方客服链接：</label>
@@ -184,23 +200,27 @@
 		<div class="layui-input-block">
 			<input type="radio" name="aliapp[type]" lay-filter="serviceType" lay-type="aliapp" value="none" title="不启用" {if condition="$config.aliapp.type == 'none'"} checked {/if}>
 			{if addon_is_exit('servicer')}<input type="radio" name="aliapp[type]" lay-filter="serviceType" lay-type="aliapp" value="soke" title="Soke客服" {if condition="$config.aliapp.type == 'soke'"} checked  {/if}>{/if}
+			{if addon_is_exit('aikefu')}<input type="radio" name="aliapp[type]" lay-filter="serviceType" lay-type="aliapp" value="aikefu" title="智能客服" {if condition="$config.aliapp.type == 'aikefu'"} checked {/if}>{/if}
 			<input type="radio" name="aliapp[type]" lay-filter="serviceType" lay-type="aliapp" value="aliapp" title="蚂蚁智能客服" {if condition="$config.aliapp.type == 'aliapp'"} checked {/if}>
 		</div>
 	</div>
+	<div class="aliapp-wrap aikefu" {if $config.aliapp.type != 'aikefu'} style="display: none" {/if}>
+	<div class="word-aux">智能客服功能已启用，系统将自动处理客户咨询。</div>
+	</div>
 	<div class="aliapp-wrap aliapp" {if $config.aliapp.type != 'aliapp'} style="display: none" {/if}>
-		<div class="layui-form-item">
-			<label class="layui-form-label"><span class="required">*</span>租户ID：</label>
-			<div class="layui-input-block">
-				<input type="text" class="layui-input len-mid" name="aliapp[instid]" value="{$config.aliapp.instid ?? ''}" lay-verify="aliappInstid">
-			</div>
+	<div class="layui-form-item">
+		<label class="layui-form-label"><span class="required">*</span>租户ID：</label>
+		<div class="layui-input-block">
+			<input type="text" class="layui-input len-mid" name="aliapp[instid]" value="{$config.aliapp.instid ?? ''}" lay-verify="aliappInstid">
 		</div>
-		<div class="layui-form-item">
-			<label class="layui-form-label"><span class="required">*</span>聊天窗ID：</label>
-			<div class="layui-input-block">
-				<input type="text" class="layui-input len-mid" name="aliapp[scene]" value="{$config.aliapp.scene ?? ''}" lay-verify="aliappScene">
-			</div>
+	</div>
+	<div class="layui-form-item">
+		<label class="layui-form-label"><span class="required">*</span>聊天窗ID：</label>
+		<div class="layui-input-block">
+			<input type="text" class="layui-input len-mid" name="aliapp[scene]" value="{$config.aliapp.scene ?? ''}" lay-verify="aliappScene">
 		</div>
-		<div class="word-aux">小程序中如何接入蚂蚁智能客服请查看<a href="https://opendocs.alipay.com/b/03al9b" target="_blank" class="text-color">在小程序中接入</a></div>
+	</div>
+	<div class="word-aux">小程序中如何接入蚂蚁智能客服请查看<a href="https://opendocs.alipay.com/b/03al9b" target="_blank" class="text-color">在小程序中接入</a></div>
 	</div>
 	{/if}

@@ -228,6 +248,7 @@
 					return '请输入客服链接';
 				}
 			},
+
 			weappCorpid: function(value){
 				if ($('[name="weapp[type]"]:checked').val() == 'wxwork' && !/[\S]+/.test(value)) {
 					return '请输入企业ID';
@@ -238,21 +259,24 @@
 					return '请输入客服链接';
 				}
 			},
+
 			pcThirdUrl: function(value){
 				if ($('[name="pc[type]"]:checked').val() == 'third' && !/[\S]+/.test(value)) {
 					return '请输入客服链接';
 				}
 			},
+
 			aliappInstid: function(value){
 				if ($('[name="aliapp[type]"]:checked').val() == 'aliapp' && !/[\S]+/.test(value)) {
-					return '租户ID';
+					return '请输入租户ID';
 				}
 			},
 			aliappScene: function(value){
 				if ($('[name="aliapp[type]"]:checked').val() == 'aliapp' && !/[\S]+/.test(value)) {
-					return '聊天窗ID';
+					return '请输入聊天窗ID';
 				}
-			}
+			},
+
 		})

 		form.on('radio(serviceType)',function(data){
--- a/src/app/shop/view/diy/heat_map.html
+++ b/src/app/shop/view/diy/heat_map.html
@@ -773,4 +773,3 @@
    }

 </script>
-
--- a/src/app/shop/view/message/lists.html
+++ b/src/app/shop/view/message/lists.html
@@ -1,5 +1,3 @@
-
-
 <style type="text/css">
 	.layui-field-box {display:flex;flex-wrap:wrap;}
 	/* 一行4个卡片时的排布 */
@@ -24,15 +22,22 @@
 	.block-list .block-title {display:flex;align-items:center;}
 	.prompt-block {position:static;margin-left:10px;}
 	.layui-layout-admin .layui-body .body-content {padding: 0;background: #f8f8f8}
-	.sms-tips,.three-tips {padding:15px;margin:0;border:none;background:#FFEDD9;border-bottom:1px solid #f5f5f5;}
+	.sms-tips,.three-tips {padding:15px;margin:0;border:none;border-bottom:1px solid #f5f5f5;}
 	.sms-tips *,.three-tips * {margin-right:10px;}
 	.three-tips {background:#fff;}
 	.message-tips .tips:last-child {margin-bottom:20px;}
-	.message-tips {margin-bottom:15px}
+    .message-tips {margin-bottom:15px}
 </style>

-
 <div class="message-tips">
+	{if isset($sms_num) && $sms_num < 500}
+	<div class="tips sms-tips">
+		<i class="iconfont icongantanhao text-color"></i>
+		当前短信条数就剩{$sms_num}条了，赶快去充值吧！
+		<a href="{:href_url('niusms://shop/sms/index', ['buy' => 1])}" class="text-color" target="_blank">立即充值</a>
+	</div>
+	{/if}
+
 	{empty name="wechat_config"}
 	<div class="tips three-tips">
 		<i class="iconfont icongantanhao text-color"></i>
@@ -61,7 +66,7 @@
 </div>

 <!-- 买家消息 -->
-<div class="layui-card card-common card-brief">
+<div class="layui-card card-common card-brief top content">
 	<div class="layui-card-header">
 		<span class="card-title">买家消息</span>
 	</div>
@@ -113,7 +118,7 @@
 </div>

 <!-- 卖家通知 -->
-<div class="layui-card card-common card-brief">
+<div class="layui-card card-common card-brief top content">
 	<div class="layui-card-header">
 		<span class="card-title">卖家通知  <a style="margin-left:20px;" class="text-color" href="{:href_url('shop/shopacceptmessage/lists')}">消息接收设置>>></a></span>
 	</div>
@@ -162,7 +167,6 @@
 	</div>
 </div>

-
 <script type="text/html" id="settingLayer">
 	<div class="layui-form-item">
 		<label class="layui-form-label">过期前提醒：</label>
@@ -228,4 +232,3 @@
 		});
 	}
 </script>
-
--- a/src/app/shop/view/public/js/route.js
+++ b/src/app/shop/view/public/js/route.js
@@ -65,7 +65,7 @@ function loadMenu(url) {
 	if (window.currentMenu) {

 		// 菜单树结构，面包屑
-		getMenuTree(window.currentMenu.name)
+		getMenuTree(window.currentMenu.name);
 		window.crumbs.sort((a, b) => {
 			return a.level - b.level;
 		});
@@ -96,7 +96,7 @@ function renderMenu() {
 			window.secondMenu = item.child_list;
 			window.firstMenu = item;
 		}
-	})
+	});

 	// 加载一级菜单
 	$('.menu-first-wrap').html(html);
@@ -160,10 +160,10 @@ function renderMenu() {
 			forthMenuHtml += `<div class="fourstage-nav layui-tab layui-tab-brief forth-menu-wrap">`;
 			forthMenuHtml += `<ul class="layui-tab-title">`;
 			window.forthMenu.forEach(function (item, index) {
-				let query = getRoute().query;
-				let arr = [];
-				let href = item.url;
-				for (let key in query) {
+				var query = getRoute().query;
+				var arr = [];
+				var href = item.url;
+				for (var key in query) {
 					arr.push(`${key}=${query[key]}`)
 				}
 				if (arr.length) {
@@ -256,7 +256,7 @@ $('body').on('click', 'a', (function () {
 		hash = arr[1];
 		// 找到当前页面地址
 		var query = hash.split('&');
-		for (let i = 0; i < query.length; i++) {
+		for (var i = 0; i < query.length; i++) {
 			if (query[i].indexOf('url=') != -1) {
 				url = query[i].replace('url=', '');
 				break;
@@ -300,10 +300,14 @@ function getHashArr() {
 // 监听hash值变化，加载页面
 function listenerHash(isLoadMenu = true) {
 	var params = getRoute();
+	//有的客户会出现同一个链接，直接页面访问 和 ajax访问 无法区分的情况，特此做区分
+	params.query._type = 'html';
 	var url = params.url;

 	// 加载页面前，显示加载动画进行过渡
-	let html = '<div class="loader-inner ball-clip-rotate"><p></p></div>';
+	var html = '<div class="common-loading-wrap">';
+	html += '<i class="common-loading-layer layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>';
+	html += '</div>';
 	$('.layui-layout-admin .layui-body .body-content').html(html);

 	// 切换页面，删除弹框、依赖
@@ -427,10 +431,10 @@ function getMenuTree(name) {
 }

 function initForthMenu() {
+	if (window.crumbs.length == 0) return;
 	//应用中心直接跳过不显示四级
 	if(window.crumbs[0].name == 'PROMOTION_ROOT') return;
-	
-	if (window.crumbs.length == 0) return;
+
 	var child = window.crumbs[window.crumbs.length - 1];

 	if (child.is_show == 0) return;
@@ -450,10 +454,10 @@ function initForthMenu() {
 // 处理营销活动菜单
 function handlePromotionMenu(index, key) {

-	let emptyAddon = []; // 保留营销活动主菜单
-	let promotionAddon = []; // 快捷方式中的有效插件菜单
-	let currentAddon = []; // 当前选中插件菜单，不在快捷方式中，要展示出来
-	let addon = window.crumbs[window.crumbs.length - 1].addon;
+	var emptyAddon = []; // 保留营销活动主菜单
+	var promotionAddon = []; // 快捷方式中的有效插件菜单
+	var currentAddon = []; // 当前选中插件菜单，不在快捷方式中，要展示出来
+	var addon = window.crumbs[window.crumbs.length - 1].addon;

 	window.secondMenu[index].child_list.forEach(function (menuItem, menuIndex) {
 		if (menuItem.addon == '') {