Mike 7 rokov pred
rodič
commit
1e26a9f8b5

+ 2 - 2
miaomiao/config.xml

xqd
@@ -2,9 +2,9 @@
 <widget id="com.miaomiao.app" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>瞄喵</name>
   <description>
-        An Ionic Framework and Cordova project.
+        瞄喵是个群众支持梦想者的梦想的平台.
     </description>
-  <author email="you@example.com" href="http://example.com.com/">
+  <author email="yingchun@miao-miao.com.cn" href="http://www.miao-miao.com.cn/">
       Mike
   </author>
   <content src="index.html"/>

+ 4 - 4
miaomiao/plugins/android.json

xqd
@@ -49,16 +49,16 @@
         "phonegap-plugin-barcodescanner": {
             "PACKAGE_NAME": "com.miaomiao.app"
         },
-        "cordova-plugin-wechat": {
-            "WECHATAPPID": "wxa963062d72a92503",
-            "PACKAGE_NAME": "com.miaomiao.app"
-        },
         "cordova-plugin-jcore": {
             "PACKAGE_NAME": "com.miaomiao.app"
         },
         "jpush-phonegap-plugin": {
             "APP_KEY": "69838317211448192366f9d8",
             "PACKAGE_NAME": "com.miaomiao.app"
+        },
+        "cordova-plugin-wechat": {
+            "WECHATAPPID": "wxc5181c0d406023e6",
+            "PACKAGE_NAME": "com.miaomiao.app"
         }
     },
     "dependent_plugins": {

+ 10 - 10
miaomiao/plugins/fetch.json

xqd xqd
@@ -142,16 +142,6 @@
         "is_top_level": true,
         "variables": {}
     },
-    "cordova-plugin-wechat": {
-        "source": {
-            "type": "registry",
-            "id": "cordova-plugin-wechat@2.0.0"
-        },
-        "is_top_level": true,
-        "variables": {
-            "WECHATAPPID": "wxa963062d72a92503"
-        }
-    },
     "cordova-plugin-jcore": {
         "source": {
             "type": "registry",
@@ -169,5 +159,15 @@
         "variables": {
             "APP_KEY": "69838317211448192366f9d8"
         }
+    },
+    "cordova-plugin-wechat": {
+        "source": {
+            "type": "registry",
+            "id": "cordova-plugin-wechat@2.0.0"
+        },
+        "is_top_level": true,
+        "variables": {
+            "WECHATAPPID": "wxc5181c0d406023e6"
+        }
     }
 }

+ 4 - 4
miaomiao/plugins/ios.json

xqd
@@ -55,16 +55,16 @@
             "CAMERA_USAGE_DESCRIPTION": " ",
             "PACKAGE_NAME": "com.miaomiao.app"
         },
-        "cordova-plugin-wechat": {
-            "WECHATAPPID": "wxa963062d72a92503",
-            "PACKAGE_NAME": "com.miaomiao.app"
-        },
         "cordova-plugin-jcore": {
             "PACKAGE_NAME": "com.miaomiao.app"
         },
         "jpush-phonegap-plugin": {
             "APP_KEY": "69838317211448192366f9d8",
             "PACKAGE_NAME": "com.miaomiao.app"
+        },
+        "cordova-plugin-wechat": {
+            "WECHATAPPID": "wxc5181c0d406023e6",
+            "PACKAGE_NAME": "com.miaomiao.app"
         }
     },
     "dependent_plugins": {

BIN
my-release-key.keystore


+ 1 - 1
server/app/Http/Controllers/Api/V1/AuthController.php

xqd
@@ -23,7 +23,7 @@ class AuthController extends Controller
 
     public function test(){
         //test
-//        $this->jPush("title",'141fe1da9e8a58e72fe',77,2,452);
+        $this->jPush("title",'141fe1da9e8a58e72fe',77,2,452);
         if(env("APP_DEBUG")){
             return $this->error(0);
         }else{

+ 4 - 2
server/app/Http/Controllers/Api/V1/IndexController.php

xqd
@@ -124,8 +124,10 @@ class IndexController extends Controller
         if (!empty($user_ids)) {
             foreach ($user_ids as $dream_id => $user_id) {
                 $user = UserInfoModel::find($user_id);
-                $user->dream_id = $dream_id;
-                $users[] = $user;
+                if($user){
+                    $user->dream_id = $dream_id;
+                    $users[] = $user;
+                }
             }
         }
         $type = $request->type;