Merge branch 'master' of http://git.9026.com/roobe/miao

miaomiao/config.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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,99 +7,99 @@
   <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>
-  <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-media-capture" spec="1.4.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-media-capture" spec="1.4.3"/>
   <plugin name="cordova-plugin-offbye-alipay" spec="git+https://github.com/offbye/cordova-plugin-alipay.git">
-    <variable name="PARTNER_ID" value="2088721135315822" />
+    <variable name="PARTNER_ID" value="2088721135315822"/>
   </plugin>
-  <plugin name="cordova-plugin-splashscreen" spec="4.0.3" />
-  <plugin name="cordova-plugin-statusbar" spec="~2.1.0" />
+  <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="cordova-plugin-whitelist" spec="^1.3.2" />
-  <plugin name="ionic-plugin-keyboard" spec="~1.0.9" />
+  <plugin name="cordova-plugin-whitelist" spec="^1.3.2"/>
+  <plugin name="ionic-plugin-keyboard" spec="~1.0.9"/>
   <plugin name="phonegap-plugin-barcodescanner" spec="git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git">
-    <variable name="CAMERA_USAGE_DESCRIPTION" value="请摄像头对准条码" />
+    <variable name="CAMERA_USAGE_DESCRIPTION" value="请摄像头对准条码"/>
   </plugin>
-  <plugin name="cordova-hot-code-push-plugin" spec="^1.5.3" />
-  <plugin name="jpush-phonegap-plugin" version="3.2.3" src="https://github.com/jpush/jpush-phonegap-plugin.git">
-    <variable name="APP_KEY" value="69838317211448192366f9d8" />
+  <plugin name="cordova-hot-code-push-plugin" spec="^1.5.3"/>
+  <plugin name="jpush-phonegap-plugin" version="2.2.7" src="https://github.com/jpush/jpush-phonegap-plugin.git">
+    <variable name="APP_KEY" value="69838317211448192366f9d8"/>
   </plugin>
 </widget>

miaomiao/www/chcp.json

@@ -1,5 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao",
-  "release": "2017.09.04-14.13.11"
+  "release": "2017.09.04-17.40.40"
 }

miaomiao/www/chcp.manifest

@@ -29,7 +29,7 @@
   },
   {
     "file": "css/style.css",
-    "hash": "aeec18dc15d998ce9c7994f70811e063"
+    "hash": "bd07829df14f7db763e988e32c722b60"
   },
   {
     "file": "img/alipay.png",
@@ -405,15 +405,15 @@
   },
   {
     "file": "js/controllers/add.js",
-    "hash": "380e6d6e3b09ec45d8244b054a4f9319"
+    "hash": "c71ffcad7e66ca4529b9001f54cb24a8"
   },
   {
     "file": "js/controllers/home.js",
-    "hash": "91574d3bffab7dfef97a55d26db02524"
+    "hash": "90f41e48d3ec9312dfc00a05afe9017a"
   },
   {
     "file": "js/controllers/my.js",
-    "hash": "56b6a6a750bb9831136150eb4bfb5857"
+    "hash": "6b56a0483f7ad0b333cfceb23b214db9"
   },
   {
     "file": "js/controllers/tabs.js",
@@ -465,7 +465,7 @@
   },
   {
     "file": "js/services/userservice.js",
-    "hash": "cf115db8268e1ccfb9be60d54e95f76c"
+    "hash": "3c5964bdc5a1adbe0df2e6952d4d81ab"
   },
   {
     "file": "js/services/utilservice.js",
@@ -761,11 +761,11 @@
   },
   {
     "file": "templates/home/dream-detail.html",
-    "hash": "a3ba8feeca389e5ec9deba8b7ff967f9"
+    "hash": "e4f9d639926508aa46c2a9844f8c15e5"
   },
   {
     "file": "templates/home/index.html",
-    "hash": "efe4226606db937c103ea19e5959c9f1"
+    "hash": "03297404a7bbd65803a158db3a53d879"
   },
   {
     "file": "templates/home/oldDream.html",

miaomiao/www/js/controllers/add.js

@@ -59,7 +59,7 @@
                 });
             };
             $scope.$on('$ionicView.beforeEnter', function () {
-                $scope.imgs=[];
+                $scope.imgs=['http://q8.9026.com/attachment/e4459544b0fe0818ad79e35e0b0acaf8'];
                 $scope.video = {};
                 $scope.vm={
                     name:'',

miaomiao/www/js/services/userservice.js

@@ -3,7 +3,7 @@
         return {
             wechat_login:function(wechat){
                 return $http({
-                    url: config.server + 'api/auth/wechat_login?wechat=' + wechat,
+                    url: config.server + 'api/auth/wechat_login?wechat=' + wechat+'&jpush=' + localStorage['jpush'],
                     method: "get",
                 })
             },

server/app/Helper/JpushHelper.php

@@ -2,7 +2,7 @@
 namespace App\Helper;
 
 use JPush\Client as JPush;
-//use App\Models\Push;
+use App\Models\UserInfoModel;
 use App\User;
 
 trait JpushHelper
@@ -18,7 +18,7 @@ trait JpushHelper
 //        $push->user_id = $userid;
 //        $res=$push->save();
         if($userid){
-            $user = User::find($userid);
+            $user = UserInfoModel::find($userid);
         }
         if($user&&$user->jpush){
             $regId = array($user->jpush);