Merge branch 'weixin_guange' into develop

This commit is contained in:
guange 2016-04-09 22:48:40 +08:00
commit 18f5f08bb7
3 changed files with 3 additions and 4 deletions

View File

@ -1 +0,0 @@
{"access_token":"7MBMEBoE6sSC15bIHZYAZSxj47yCKlbWEVjrkUgEJxPP3K083tbhc1RIWmxGu3WoB5dAXxK_yd4l1jrcvt6YrsTcOfFGRirOHVfzrpvhsQgxOoxcdc7YljfO_dnwUtWgFTAcAIALZG","expires_in":7200,"got_token_at":1460189856}

View File

@ -2,7 +2,7 @@ button:
- -
type: "view" type: "view"
name: "最新动态" name: "最新动态"
url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=http://wechat.trustie.net/assets/wechat/app.html#/activities?response_type=code&scope=snsapi_base&state=123#wechat_redirect" url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=http://www.trustie.net/assets/wechat/app.html#/activities?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
- -
type: "click" type: "click"
name: "意见返馈" name: "意见返馈"

View File

@ -1,5 +1,5 @@
var app = angular.module('wechat', ['ngRoute','ngCookies']); var app = angular.module('wechat', ['ngRoute','ngCookies']);
var apiUrl = 'http://wechat.trustie.net/api/v1/'; var apiUrl = '/api/v1/';
var debug = false; //调试标志,如果在本地请置为true var debug = false; //调试标志,如果在本地请置为true
if(debug===true){ if(debug===true){
@ -10,7 +10,7 @@ app.factory('auth', function($http,$routeParams, $cookies, $q){
var _openid = ''; var _openid = '';
if(debug===true){ if(debug===true){
_openid = "3"; _openid = "oCnvgvz8R7QheXE-R9Kkr39j8Ndg";
} }
var getOpenId = function() { var getOpenId = function() {