Home Explore Help
Register Sign In
yiguanjia
/
php
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

add axios

north 8 years ago
parent
8960027817
commit
a987ac5406
8 changed files with 21 additions and 20 deletions
Unified View Show Diff Stats
  1. 0 1
      www/protected/modules/o2o/controllers/UserController.php
  2. 1 1
      www/vue/config/index.js
  3. 3 3
      www/vue/index.html
  4. 2 0
      www/vue/package.json
  5. 0 1
      www/vue/src/components/swiper.vue
  6. 10 9
      www/vue/src/config/api.js
  7. 4 0
      www/vue/src/main.js
  8. 1 5
      www/vue/src/store/test.js

+ 0 - 1
www/protected/modules/o2o/controllers/UserController.php
View File 

@@ -9,7 +9,6 @@ class  UserController extends O2oBaseController{
 
     
     
     public function actionInfo(){
 
     public function actionInfo(){
 
         $user_id = Yii::app()->getRequest()->getParam("user_id");
 
         $user_id = Yii::app()->getRequest()->getParam("user_id");
 
-
 
         if(CommonFn::isMongoId($user_id)){
 
         if(CommonFn::isMongoId($user_id)){
 
             $user = Service::factory('UserService')->getUser(new MongoId($user_id),false);
 
             $user = Service::factory('UserService')->getUser(new MongoId($user_id),false);
 
             if($user){
 
             if($user){

+ 1 - 1
www/vue/config/index.js
View File 

@@ -1,6 +1,6 @@
 
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 var path = require('path')
 
 var path = require('path')
 
-apiPath = 'http://apitest.yiguanjia.me'
 
+apiPath = 'http://admin.yiguanjiadev.me'
 
 //apiPath = 'http://api.yiguanjia.me'
 
 //apiPath = 'http://api.yiguanjia.me'
 
 module.exports = {
 
 module.exports = {
 
   build: {
 
   build: {

+ 3 - 3
www/vue/index.html
View File 

@@ -3,10 +3,10 @@
 
   <head>
 
   <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">
 
     <meta name="flexible" content="initial-dpr=2,maximum-dpr=3" />
 
     <meta name="flexible" content="initial-dpr=2,maximum-dpr=3" />
 
-    <style media="screen">
 
+   <!-- <style media="screen">
 
       html {font-size: 60px!important;}
 
       html {font-size: 60px!important;}
 
-    </style>
 
-    <script src="http://g.tbcdn.cn/mtb/lib-flexible/{{version}}/makegrid.js"></script>
 
+    </style>-->
 
+    <!--<script src="http://g.tbcdn.cn/mtb/lib-flexible/{{version}}/makegrid.js"></script>-->
 
     <title>vue</title>
 
     <title>vue</title>
 
   </head>
 
   </head>
 
   <body>
 
   <body>

+ 2 - 0
www/vue/package.json
View File 

@@ -16,12 +16,14 @@
 
   "dependencies": {
 
   "dependencies": {
 
     "sass-convert": "^0.5.2",
 
     "sass-convert": "^0.5.2",
 
     "vue": "^2.3.3",
 
     "vue": "^2.3.3",
 
+    "vue-axios": "^2.0.2",
 
     "vue-router": "^2.3.1",
 
     "vue-router": "^2.3.1",
 
     "vuex": "^2.3.1",
 
     "vuex": "^2.3.1",
 
     "vux": "^2.3.4"
 
     "vux": "^2.3.4"
 
   },
 
   },
 
   "devDependencies": {
 
   "devDependencies": {
 
     "autoprefixer": "^6.7.2",
 
     "autoprefixer": "^6.7.2",
 
+    "axios": "^0.16.2",
 
     "babel-core": "^6.22.1",
 
     "babel-core": "^6.22.1",
 
     "babel-eslint": "^7.1.1",
 
     "babel-eslint": "^7.1.1",
 
     "babel-loader": "^6.2.10",
 
     "babel-loader": "^6.2.10",

+ 0 - 1
www/vue/src/components/swiper.vue
View File 

@@ -1,7 +1,6 @@
 
 <template>
 
 <template>
 
 	<div class="nav">
 
 	<div class="nav">
 
 		<h1>swiper</h1>
 
 		<h1>swiper</h1>
 
-		{{userInfo.id}}
 
 	</div>
 
 	</div>
 
 </template>
 
 </template>
 
 <script type="text/javascript">
 
 <script type="text/javascript">

+ 10 - 9
www/vue/src/config/api.js
View File 

@@ -1,13 +1,14 @@
 
-import Vue from 'vue'
 
-import VueResource from 'vue-resource'
 
-Vue.use(VueResource)
 
-// 设置 Laravel 的 csrfToken
 
-Vue.http.interceptors.push((request, next) => {
 
-  next()
 
-})
 
+import axios from 'axios'
 
+
 
+var formData = new FormData()
 
+formData.append('user_id', '57e238929f5160d6048b456d')
 
 export default({
 
 export default({
 
-  // 首页推荐信息
 
+  // 获取用户信息
 
+
 
   getO2oUserInfo: function () {
 
   getO2oUserInfo: function () {
 
-    return Vue.resource('/o2o/user/info&user_id=57e238929f5160d6048b456d').get()
 
+    axios.post('o2o/user/info', formData).then((response) => {
 
+      console.log(response.data)
 
+      return response.data
 
+    })
 
   }
 
   }
 
 })
 
 })

+ 4 - 0
www/vue/src/main.js
View File 

@@ -3,11 +3,15 @@
 
 import Vue from 'vue'
 
 import Vue from 'vue'
 
 import App from './App'
 
 import App from './App'
 
 import routes from './router'
 
 import routes from './router'
 
+import axios from 'axios'
 
+import VueAxios from 'vue-axios'
 
 import VueRouter from 'vue-router'
 
 import VueRouter from 'vue-router'
 
 import store from './store/'
 
 import store from './store/'
 
 
 
+Vue.use(VueAxios, axios)
 
 Vue.config.productionTip = false
 
 Vue.config.productionTip = false
 
 Vue.use(VueRouter)
 
 Vue.use(VueRouter)
 
+// axios.defaults.baseURL = '/o2o'
 
 /* eslint-disable no-new */
 
 /* eslint-disable no-new */
 
 const router = new VueRouter({
 
 const router = new VueRouter({
 
   routes
 
   routes

+ 1 - 5
www/vue/src/store/test.js
View File 

@@ -16,11 +16,7 @@ export default {
 
   actions: {
 
   actions: {
 
     USERINFO ({commit}) {
 
     USERINFO ({commit}) {
 
       // 获取详情，并调用 mutations 设置 detail
 
       // 获取详情，并调用 mutations 设置 detail
 
-      api.getO2oUserInfo().then(function (res) {
 
-        console.log(res.data.data)
 
-        console.log(1)
 
-        commit('USERINFO', res.data.data)
 
-      })
 
+      commit('USERINFO', api.getO2oUserInfo())
 
     }
 
     }
 
   }
 
   }
 
 }
 
 }