north 8 жил өмнө
parent
commit
22f939e662

+ 2 - 1
www/protected/modules/o2o/controllers/WebController.php

@@ -7,7 +7,6 @@ class WebController extends O2oBaseController {
 		$home_page = Yii::app()->getRequest()->getParam("home_page",'');
 		$code = Yii::app()->getRequest()->getParam("code");
 		$state = Yii::app()->getRequest()->getParam("state");
-
 		$userId = '';
 		$appToken = '';
 		if($code && $state){
@@ -76,6 +75,7 @@ class WebController extends O2oBaseController {
 				'signPackage' => $signPackage,
 				'userId' => $userId,
 				'appToken' => $appToken,
+                'host' =>  $_SERVER['HTTP_HOST']
 			));
 		}else{
 			/* var_dump(array(
@@ -91,6 +91,7 @@ class WebController extends O2oBaseController {
 				'signPackage' => $signPackage,
 				'userId' => $userId,
 				'appToken' => $appToken,
+                'host' =>  $_SERVER['HTTP_HOST']
 			));
 		}
 	}

+ 4 - 4
www/protected/modules/o2o/views/web/index.php

@@ -15,7 +15,7 @@
 
 
   <!--vue-->
-  <link rel="stylesheet" id="app_css" href="http://commontest.yiguanjia.me/vue/dist/static/css/app.css">
+  <link rel="stylesheet" id="app_css" href="http://<?php echo $host?>/vue/dist/static/css/app.css">
   <!--vue_end-->
   <script type="text/javascript" src="https://code.jquery.com/jquery-2.2.0.min.js"></script>
   <script type="text/javascript" src="https://dn-bughd-web.qbox.me/bughd.min.js" crossOrigin="anonymous"></script>
@@ -28,9 +28,9 @@
 <body>
   <!--vue-->
   <div id=app></div>
-  <script type=text/javascript id="manifest" src="http://commontest.yiguanjia.me/vue/dist/static/js/manifest.js"></script>
-  <script type=text/javascript id="vendor" src="http://commontest.yiguanjia.me/vue/dist/static/js/vendor.js"></script>
-  <script type=text/javascript id="appJs" src="http://commontest.yiguanjia.me/vue/dist/static/js/app.js"></script>
+  <script type=text/javascript id="manifest" src="http://<?php echo $host?>/vue/dist/static/js/manifest.js"></script>
+  <script type=text/javascript id="vendor" src="http://<?php echo $host?>/vue/dist/static/js/vendor.js"></script>
+  <script type=text/javascript id="appJs" src="http://<?php echo $host?>/vue/dist/static/js/app.js"></script>
 
   <!--vue-end-->
   <script type="text/javascript" id="wxMain" data-sign="<?php echo @htmlentities(json_encode($signPackage)); ?>"></script>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/vue/dist/static/js/app.js


+ 10 - 3
www/vue/src/config/api.js

@@ -3,22 +3,29 @@ import axios from 'axios'
 let apiPath = ''
 let uri = location.href
 let test = true
+var userId = ''
+var formData = new FormData()
+
 if (uri.indexOf('common.yiguanjia.me') > -1) {
   test = false
 }
 // 正式开发判断test还是pro
 if (test) {
   apiPath = 'http://commontest.yiguanjia.me/index.php?r='
+  userId = localStorage.getItem('wxUserID')
 } else {
   apiPath = 'http://common.yiguanjia.me/index.php?r='
+  userId = localStorage.getItem('wxUserID')
 }
 // 判断是否为dev开发
 if (uri.indexOf('http://localhost:8080/') > -1) {
   apiPath = ''
+  userId = '57e238929f5160d6048b456d'
+} else if (uri.indexOf('common.yiguanjiadev.me') > -1) {
+  apiPath = 'http://common.yiguanjiadev.me/index.php?r='
+  userId = '57e238929f5160d6048b456d'
 }
-console.log(localStorage.getItem('wxUserID'))
-var formData = new FormData()
-formData.append('user_id', '57e238929f5160d6048b456d')
+formData.append('user_id', userId) // 获取
 export default({
   // 获取用户信息
 

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно