Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
yiguanjia
/
php
2
0
Atdalīts 0
Faili Problēmas 0 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

Merge branch 'test' of git.oschina.net:yiguanjia/php into test

洪海涛 8 gadi atpakaļ
vecāks
144dd6b5be a4392eef34
revīzija
b12363cce5
6 mainītis faili ar 15 papildinājumiem un 4 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 1 1
      www/protected/modules/api/controllers/ApiBaseController.php
  2. 9 0
      www/protected/modules/api/controllers/ShopController.php
  3. 2 1
      www/protected/modules/o2o/views/web/index.php
  4. 1 0
      www/vue/index.html
  5. 1 1
      www/vue/src/components/navigation.vue
  6. 1 1
      www/vue/src/router/index.js

+ 1 - 1
www/protected/modules/api/controllers/ApiBaseController.php
Parādīt failu 

@@ -50,7 +50,7 @@ class ApiBaseController extends CController{
 
     //签名验证方法
 
     //每次GET/POST请求的参数，凡是在这个列表以内的参数名字：["id","app_client_id","time","topic_id","group_id","user_id","post_id"]加上private_key按key字母升序排列拼接,然后md5运算之后生成
 
     protected function api_check_sign(){
 
-//        return true;
 
+        return true;
 
         $need_args=array('device_id','os_version','api_version','time','channel','app_client_id','app_version','sign');
 
         $sign_args=array("id","app_client_id","time","topic_id","group_id","user_id","post_id","app_version");

+ 9 - 0
www/protected/modules/api/controllers/ShopController.php
Parādīt failu 

@@ -11,6 +11,15 @@ class ShopController extends ApiBaseController{
 
         return $this->verify();
 
     }
 
 
+    /**
 
+     * 根据搜索值获取地址 json返回
 
+     */
 
+    public function actionGetDetailAddressByQuery(){
 
+        $query = Yii::app()->getRequest()->getParam('query');
 
+        $res = CommonFn::simple_http("http://api.map.baidu.com/place/v2/suggestion?ak=B349f0b32ef6e78b2e678f45cb9fddaf&output=json&query=$query&region=%E4%B8%8A%E6%B5%B7%E5%B8%82&version=2015121601&_=1498629116496");
 
+        echo $res;exit;
 
+    }
 
+
 
 
     /**
 
      * 新增收货地址

+ 2 - 1
www/protected/modules/o2o/views/web/index.php
Parādīt failu 

@@ -25,11 +25,12 @@
 
       text-decoration: initial;
 
     }
 
   </style>
 
-  <script type="text/javascript" src = 'http://webapi.amap.com/maps?v=1.3&key=ea4228b685c663ac62af7da3a0702c97'></script>
 
+
 
   <!--vue-->
 
   <link rel="stylesheet" id="app_css" href="http://<?php echo $host ?>/vue/dist/static/css/app.css?v=<?php echo time()?>">
 
   <!--vue_end-->
 
   <script type="text/javascript" src="https://code.jquery.com/jquery-2.2.0.min.js"></script>
 
+	<script type="text/javascript" src = 'http://webapi.amap.com/maps?v=1.3&key=ea4228b685c663ac62af7da3a0702c97'></script>
 
   <script type="text/javascript" src="https://dn-bughd-web.qbox.me/bughd.min.js" crossOrigin="anonymous"></script>
 
   <script type="text/javascript">
 
     window.bughd = window.bughd || function () {

+ 1 - 0
www/vue/index.html
Parādīt failu 

@@ -3,6 +3,7 @@
 
 <head>
 
   <meta charset="utf-8">
 
   <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
 
+  <script type="text/javascript" src="https://code.jquery.com/jquery-2.2.0.min.js"></script>
 
   <script type="text/javascript" src = 'http://webapi.amap.com/maps?v=1.3&key=ea4228b685c663ac62af7da3a0702c97'></script>
 
   <title>vue</title>
 
   <style>

+ 1 - 1
www/vue/src/components/navigation.vue
Parādīt failu 

@@ -6,7 +6,7 @@
 
         <img slot="icon-active" :src='iconHomeActive'>
 
         <span slot="label">首页</span>
 
       </tabbar-item>
 
-      <tabbar-item link="/addressAdd">
 
+      <tabbar-item link="/addressList">
 
         <img slot="icon" :src='iconOrder'>
 
         <img slot="icon-active" :src='iconOrderActive'>
 
         <span slot="label">订单</span>

+ 1 - 1
www/vue/src/router/index.js
Parādīt failu 

@@ -8,7 +8,7 @@ export default[
 
   {path: '/myCoupon', component: require('../components/myCoupon')},
 
   {path: '/recharge', component: require('../components/recharge')},
 
   {path: '/brand', component: require('../components/CompanyProfile/brand')},
 
-  {path: '/addresList', component: require('../components/address/addresList.vue')},
 
+  {path: '/addressList', component: require('../components/address/addresList.vue')},
 
   {path: '/addressAdd', component: require('../components/address/addressAdd.vue')},
 
   {path: '/addressDetail', component: require('../components/address/addressDetail.vue')},
 
   {path: '/addressPoisiton', component: require('../components/address/addressPoisiton.vue')}