Merge branch 'master' into develop

application/index/controller/Common.php

@@ -17,6 +17,7 @@ use app\service\BuyService;
 use app\service\MessageService;
 use app\service\SearchService;
 use app\service\ConfigService;
+use app\service\LinkService;
 
 /**
  * 前端公共控制器
@@ -205,6 +206,10 @@ class Common extends Controller
 
         // 商城公告
         $this->assign('common_shop_notice', MyC('common_shop_notice'));
+
+        // 友情链接
+        $link = LinkService::LinkList(['where'=>['is_enable'=>1]]);
+        $this->assign('link_list', $link['data']);
     }
 
     /**

application/index/view/default/lib/region_linkage.html

@@ -6,7 +6,7 @@
     <select name="city" data-next="county" class="am-radius c-p chosen-select" data-placeholder="城市" data-validation-message="请选择城市" data-value="{{if isset($data['city'])}}{{$data.city}}{{else /}}0{{/if}}" required>
         <option value="">城市</option>
     </select>
-    <select name="county" class="am-radius c-p chosen-select" data-placeholder="{{:lang('common_linkage_county_text')}}" data-validation-message="请选择区/县" data-value="{{if isset($data['county'])}}{{$data.county}}{{else /}}0{{/if}}" required>
-        <option value="">{{:lang('common_linkage_county_text')}}</option>
+    <select name="county" class="am-radius c-p chosen-select" data-placeholder="区/县" data-validation-message="请选择区/县" data-value="{{if isset($data['county'])}}{{$data.county}}{{else /}}0{{/if}}" required>
+        <option value="">区/县</option>
     </select>
 </div>
\ No newline at end of file

application/index/view/default/public/footer_nav.html

+<!-- 友情链接 -->
+{{if !empty($link_list)}}
+	<div class="friendship-list">
+		<div class="am-container">
+			<h2>友情链接</h2>
+			<ul>
+				{{foreach $link_list as $v}}
+					<li>
+						<a href="{{$v.url}}" {{if $v['is_new_window_open'] eq 1}} target="_blank"{{/if}} title="{{$v.describe}}">{{$v.name}}</a>
+					</li>
+				{{/foreach}}
+			</ul>
+		</div>
+	</div>
+{{/if}}
+
+<!-- 底部导航 -->
 <footer data-am-widget="footer" class="am-footer am-footer-default" data-am-footer="{}">
 	<div class="footer-nav-list">
 		{{foreach $nav_footer as $k=>$v}}
@@ -10,6 +27,8 @@
 	<div class="am-footer-miscs">
 		<p>由 <a href="http://shopxo.net/" title="ShopXO电商系统" target="_blank" class="">ShopXO</a> 提供技术支持</p>
 		<p>CopyRight©2016-{{:date('Y')}} ShopXO {{$Think.APPLICATION_VERSION}} Inc.</p>
-		<p>{{:MyC('home_site_icp')}}</p>
+		<p>
+			<a href="http://www.miitbeian.gov.cn/" target="_blank">{{:MyC('home_site_icp')}}</a>
+		</p>
 	</div>
 </footer>
\ No newline at end of file

application/service/LinkService.php

@@ -33,7 +33,8 @@ class LinkService
      */
     public static function LinkList($params = [])
     {
-        $data = Db::name('Link')->order('sort asc')->select();
+        $where = empty($params['where']) ? [] : $params['where'];
+        $data = Db::name('Link')->where($where)->order('sort asc')->select();
         return DataReturn('处理成功', 0, $data);
     }
 

application/service/OrderService.php

@@ -92,6 +92,14 @@ class OrderService
         // 回调地址
         $url = __MY_PUBLIC_URL__.'payment_order_'.strtolower($payment[0]['payment']);
 
+        // url模式, pathinfo模式下采用自带url生成url, 避免非index.php多余
+        if(MyC('home_seo_url_model', 0) == 0)
+        {
+            $call_back_url = $url.'_respond.php';
+        } else {
+            $call_back_url = MyUrl('index/order/respond', ['paymentname'=>$payment[0]['payment']]);
+        }
+
         // 开放平台用户penid
         $temp_key = APPLICATION_CLIENT_TYPE.'_openid';
         $user_openid = isset($params['user'][$temp_key]) ? $params['user'][$temp_key] : '';
@@ -104,7 +112,7 @@ class OrderService
             'name'          => '订单支付',
             'total_price'   => $order['total_price'],
             'notify_url'    => $url.'_notify.php',
-            'call_back_url' => $url.'_respond.php',
+            'call_back_url' => $call_back_url,
         );
         $pay_name = 'payment\\'.$payment[0]['payment'];
         $ret = (new $pay_name($payment[0]['config']))->Pay($pay_data);
@@ -258,14 +266,19 @@ class OrderService
         }
 
         // 支付方式
-        $payment = PaymentService::PaymentList(['where'=>['payment'=>PAYMENT_TYPE]]);
+        $payment_name = defined('PAYMENT_TYPE') ? PAYMENT_TYPE : (isset($params['paymentname']) ? $params['paymentname'] : '');
+        if(empty($payment_name))
+        {
+            return DataReturn('支付方式标记异常', -1);
+        }
+        $payment = PaymentService::PaymentList(['where'=>['payment'=>$payment_name]]);
         if(empty($payment[0]))
         {
             return DataReturn('支付方式有误', -1);
         }
 
         // 支付数据校验
-        $pay_name = 'payment\\'.PAYMENT_TYPE;
+        $pay_name = 'payment\\'.$payment_name;
         $ret = (new $pay_name($payment[0]['config']))->Respond(array_merge($_GET, $_POST));
         if(isset($ret['code']) && $ret['code'] == 0)
         {

public/static/index/default/css/common.css

@@ -447,6 +447,40 @@ background:url(../images/ibar_sprites.png) no-repeat;background-position:0px -23
 .am-footer-default .am-footer-divider {
     padding: 0 5px;
 }
+.am-footer-default .am-footer-miscs a {
+    color: #8e8e8e;
+}
+
+/**
+ * 友情链接
+ */
+.friendship-list {
+    margin-top: 20px;
+    margin-bottom: 10px;
+}
+.friendship-list h2 {
+    border-bottom: 1px solid #e3e0e0;
+    line-height: 26px;
+    color: #333;
+    font-weight: 500;
+    font-size: 14px;
+}
+.friendship-list ul {
+    overflow: hidden;
+}
+.friendship-list ul li {
+    float: left;
+    line-height: 26px;
+    text-align: center;
+}
+.friendship-list ul li:not(:last-child) {
+    margin-right: 10px;
+}
+
+.friendship-list ul li:not(:last-child) a {
+    border-right: 1px solid #d4d4d4;
+    padding-right: 10px;
+}
 
 
 /**
@@ -458,6 +492,9 @@ background:url(../images/ibar_sprites.png) no-repeat;background-position:0px -23
         padding-left: 0px;
         padding-right: 0px;
     }
+    .friendship-list {
+        padding: 0 5px;
+    }
 }
 
 /**

thinkphp/tpl/think_exception.tpl

@@ -410,9 +410,9 @@
     <?php } ?>
 
     <div class="copyright">
-        <a title="官方网站" href="http://www.thinkphp.cn">ThinkPHP</a> 
-        <span>V<?php echo \think\facade\App::version(); ?></span> 
-        <span>{ 十年磨一剑-为API开发设计的高性能框架 }</span>
+        <a title="官方网站" href="http://www.shopxo.net">ShopXO</a> 
+        <span><?php echo APPLICATION_VERSION; ?></span> 
+        <span>{ 国内领先企业级B2C免费开源电商系统！ }</span>
     </div>
     <?php if(\think\facade\App::isDebug()) { ?>
     <script>