add

miaomiao/config.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <widget id="com.miaomiao.app" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>瞄喵</name>
   <description>
@@ -7,100 +7,100 @@
   <author email="you@example.com" href="http://example.com.com/">
       Mike
   </author>
-  <content src="index.html" />
-  <access origin="*" />
-  <allow-intent href="*" />
-  <allow-navigation href="*" />
-  <preference name="webviewbounce" value="false" />
-  <preference name="UIWebViewBounce" value="false" />
-  <preference name="DisallowOverscroll" value="true" />
-  <preference name="android-minSdkVersion" value="16" />
-  <preference name="BackupWebStorage" value="none" />
-  <preference name="KeepRunning" value="True" />
-  <preference name="ShowTitle" value="True" />
-  <preference name="InAppBrowserStorageEnabled" value="True" />
-  <preference name="SuppressesIncrementalRendering" value="True" />
-  <preference name="windows-target-version" value="10.0" />
-  <preference name="SplashScreen" value="screen" />
-  <preference name="SplashScreenDelay" value="3000" />
+  <content src="index.html"/>
+  <access origin="*"/>
+  <allow-intent href="*"/>
+  <allow-navigation href="*"/>
+  <preference name="webviewbounce" value="false"/>
+  <preference name="UIWebViewBounce" value="false"/>
+  <preference name="DisallowOverscroll" value="true"/>
+  <preference name="android-minSdkVersion" value="16"/>
+  <preference name="BackupWebStorage" value="none"/>
+  <preference name="KeepRunning" value="True"/>
+  <preference name="ShowTitle" value="True"/>
+  <preference name="InAppBrowserStorageEnabled" value="True"/>
+  <preference name="SuppressesIncrementalRendering" value="True"/>
+  <preference name="windows-target-version" value="10.0"/>
+  <preference name="SplashScreen" value="screen"/>
+  <preference name="SplashScreenDelay" value="3000"/>
   <feature name="StatusBar">
-    <param name="ios-package" onload="true" value="CDVStatusBar" />
+    <param name="ios-package" onload="true" value="CDVStatusBar"/>
   </feature>
   <platform name="ios">
-    <icon height="57" src="resources/ios/icon/icon.png" width="57" />
-    <icon height="114" src="resources/ios/icon/icon@2x.png" width="114" />
-    <icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
-    <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80" />
-    <icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120" />
-    <icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
-    <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100" />
-    <icon height="60" src="resources/ios/icon/icon-60.png" width="60" />
-    <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120" />
-    <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180" />
-    <icon height="72" src="resources/ios/icon/icon-72.png" width="72" />
-    <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144" />
-    <icon height="76" src="resources/ios/icon/icon-76.png" width="76" />
-    <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152" />
-    <icon height="29" src="resources/ios/icon/icon-small.png" width="29" />
-    <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58" />
-    <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87" />
-    <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
-    <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
-    <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
-    <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" />
-    <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
-    <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732" />
-    <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
-    <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
-    <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" />
-    <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
-    <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
-    <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
+    <icon height="57" src="resources/ios/icon/icon.png" width="57"/>
+    <icon height="114" src="resources/ios/icon/icon@2x.png" width="114"/>
+    <icon height="40" src="resources/ios/icon/icon-40.png" width="40"/>
+    <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80"/>
+    <icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120"/>
+    <icon height="50" src="resources/ios/icon/icon-50.png" width="50"/>
+    <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100"/>
+    <icon height="60" src="resources/ios/icon/icon-60.png" width="60"/>
+    <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120"/>
+    <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180"/>
+    <icon height="72" src="resources/ios/icon/icon-72.png" width="72"/>
+    <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144"/>
+    <icon height="76" src="resources/ios/icon/icon-76.png" width="76"/>
+    <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152"/>
+    <icon height="29" src="resources/ios/icon/icon-small.png" width="29"/>
+    <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58"/>
+    <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87"/>
+    <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640"/>
+    <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750"/>
+    <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242"/>
+    <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208"/>
+    <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048"/>
+    <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732"/>
+    <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024"/>
+    <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536"/>
+    <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048"/>
+    <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768"/>
+    <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640"/>
+    <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320"/>
   </platform>
   <platform name="android">
-    <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
-    <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
-    <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
-    <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
-    <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
-    <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
-    <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
-    <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
-    <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
-    <splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
-    <splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
-    <splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
-    <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
-    <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
-    <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
-    <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
-    <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
-    <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
+    <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png"/>
+    <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png"/>
+    <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png"/>
+    <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png"/>
+    <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png"/>
+    <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png"/>
+    <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png"/>
+    <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png"/>
+    <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png"/>
+    <splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png"/>
+    <splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png"/>
+    <splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png"/>
+    <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png"/>
+    <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png"/>
+    <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png"/>
+    <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png"/>
+    <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png"/>
+    <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png"/>
   </platform>
   <chcp>
-    <config-file url="http://i.9026.com/miaomiao/chcp.json" />
+    <config-file url="http://i.9026.com/miaomiao/chcp.json"/>
   </chcp>
-  <plugin name="cordova-hot-code-push-plugin" spec="~1.5.3" />
-  <plugin name="cordova-plugin-actionsheet" spec="2.3.3" />
-  <plugin name="cordova-plugin-camera" spec="2.4.0" />
-  <plugin name="cordova-plugin-compat" spec="1.1.0" />
-  <plugin name="cordova-plugin-console" spec="~1.0.2" />
-  <plugin name="cordova-plugin-device" spec="~1.1.1" />
-  <plugin name="cordova-plugin-file" spec="4.3.2" />
-  <plugin name="cordova-plugin-file-transfer" spec="1.6.2" />
-  <plugin name="cordova-plugin-jcore" spec="1.1.5" />
-  <plugin name="cordova-plugin-media-capture" spec="1.4.3" />
-  <plugin name="cordova-plugin-splashscreen" spec="4.0.3" />
-  <plugin name="cordova-plugin-statusbar" spec="~2.1.0" />
+  <plugin name="cordova-hot-code-push-plugin" spec="~1.5.3"/>
+  <plugin name="cordova-plugin-actionsheet" spec="2.3.3"/>
+  <plugin name="cordova-plugin-camera" spec="2.4.0"/>
+  <plugin name="cordova-plugin-compat" spec="1.1.0"/>
+  <plugin name="cordova-plugin-console" spec="~1.0.2"/>
+  <plugin name="cordova-plugin-device" spec="~1.1.1"/>
+  <plugin name="cordova-plugin-file" spec="4.3.2"/>
+  <plugin name="cordova-plugin-file-transfer" spec="1.6.2"/>
+  <plugin name="cordova-plugin-jcore" spec="1.1.5"/>
+  <plugin name="cordova-plugin-media-capture" spec="1.4.3"/>
+  <plugin name="cordova-plugin-splashscreen" spec="4.0.3"/>
+  <plugin name="cordova-plugin-statusbar" spec="~2.1.0"/>
   <plugin name="cordova-plugin-wechat" spec="^1.4.0">
-    <variable name="WECHATAPPID" value="wxc5181c0d406023e6" />
+    <variable name="WECHATAPPID" value="wxc5181c0d406023e6"/>
   </plugin>
-  <plugin name="ionic-plugin-keyboard" spec="~1.0.9" />
+  <plugin name="ionic-plugin-keyboard" spec="~1.0.9"/>
   <plugin name="phonegap-plugin-barcodescanner" spec="https://github.com/phonegap/phonegap-plugin-barcodescanner.git">
-    <variable name="CAMERA_USAGE_DESCRIPTION" value="请摄像头对准条码" />
+    <variable name="CAMERA_USAGE_DESCRIPTION" value="请摄像头对准条码"/>
   </plugin>
-  <plugin name="cordova-plugin-whitelist" spec="^1.2.2" />
-  <plugin name="cordova-plugin-offbye-alipay" version="1.0.1" />
-  <plugin name="cordova-plugin-weibosdk" version="0.6.0" />
-  <plugin name="jpush-phonegap-plugin" version="3.2.3" />
+  <plugin name="cordova-plugin-whitelist" spec="^1.2.2"/>
+  <plugin name="cordova-plugin-offbye-alipay" version="1.0.1"/>
+  <plugin name="cordova-plugin-weibosdk" version="0.6.0"/>
+  <plugin name="jpush-phonegap-plugin" version="3.2.3"/>
 </widget>

miaomiao/www/chcp.json

@@ -1,5 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao",
-  "release": "2017.08.31-09.38.55"
+  "release": "2017.08.31-19.53.48"
 }

miaomiao/www/chcp.manifest

@@ -13,7 +13,7 @@
   },
   {
     "file": ".idea/workspace.xml",
-    "hash": "45a62e1df43fc8f2b00c7e564bea0591"
+    "hash": "387c63e8e4ae567482123d1b2e2a8e36"
   },
   {
     "file": ".idea/www.iml",
@@ -29,7 +29,7 @@
   },
   {
     "file": "css/style.css",
-    "hash": "0a57d621113b29c4a8241355812001cf"
+    "hash": "84387fb54605a3dd12cb578b0e8883b2"
   },
   {
     "file": "img/alipay.png",
@@ -401,7 +401,7 @@
   },
   {
     "file": "js/controllers/account.js",
-    "hash": "d398cdf936584f691e523a88d75dd1a4"
+    "hash": "1e513282efff1fb0d189c4c3203d3940"
   },
   {
     "file": "js/controllers/add.js",
@@ -409,7 +409,7 @@
   },
   {
     "file": "js/controllers/home.js",
-    "hash": "5bf0936988dc88bfdf2bcd2b13d6f1b8"
+    "hash": "d854adb31b98d9ed93c07c3e513c83b9"
   },
   {
     "file": "js/controllers/my.js",
@@ -445,7 +445,7 @@
   },
   {
     "file": "js/services/httpinterceptor.js",
-    "hash": "84c002e33b567ed02996b5c2102000c2"
+    "hash": "a63d4ce4ffdebd38cb343c66475ecfc3"
   },
   {
     "file": "js/services/jpushservice.js",
@@ -761,7 +761,7 @@
   },
   {
     "file": "templates/home/dream-detail.html",
-    "hash": "54707290192201493de313ca3ada8c34"
+    "hash": "bad262a4aae00a5a7759eaf2030f2f4f"
   },
   {
     "file": "templates/home/index.html",

miaomiao/www/js/controllers/account.js

@@ -3,10 +3,15 @@
         function ($scope,userService,$ionicNavBarDelegate, storage, $state, msg, $http, util) {
              //$ionicNavBarDelegate.showBackButton(false);
             $scope.wechat_login = function(){
+<<<<<<< HEAD
                 /*var scope = "snsapi_userinfo", state = "_" + (+new Date());
+=======
+
+                var scope = "snsapi_userinfo", state = "_" + (+new Date());
+>>>>>>> b6d51c8637915a7bb142ebcef81db7e18bb9b876
                 Wechat.auth(scope, state, function (response) {
                     // alert("response:"+JSON.stringify(response));
-                    var response={code:1231};
+                    // var response={code:1231};
                     if(response.code){
                         msg.loading('登录中...');
                         userService.wechat_login(response.code).then(function(result){
@@ -26,10 +31,18 @@
                             $state.go("loginAccount",{wechat:$scope.wecaht});
                         });
                     }
+<<<<<<< HEAD
                 }, function (error) {
                     console.log("Failed: " + JSON.stringify(error));
                 });*/
                 $state.go("loginAccount");
+=======
+
+                }, function (error) {
+                    console.log("Failed: " + JSON.stringify(error));
+                });
+                //$state.go("loginAccount");
+>>>>>>> b6d51c8637915a7bb142ebcef81db7e18bb9b876
             };
     }]);
     app.controller('loginCtrl', ["$scope", "userService","$stateParams","$ionicNavBarDelegate", "storage", "$state", "msg", "$http", "util","$timeout",

miaomiao/www/js/services/httpinterceptor.js

@@ -37,7 +37,7 @@
                     getHttp().defaults.headers.common["Authorization"] = undefined;
                     getState().go('login');
                     // alert("not login");
-                    return $q.reject(rejection);
+                    return ;
                 }
                 if (rejection.status == 400) {
                     getMsg().error(rejection.data.message);