Mike 7 年 前
コミット
ce2e38c5c6

+ 6 - 7
miaomiao/www/js/controllers/home.js

xqd xqd xqd
@@ -224,8 +224,8 @@
         });
     }]);
 
-    app.controller('dreamDetailCtrl', ["$scope","$location","$ionicHistory","$timeout","$ionicLoading", "$state", "WechatService","$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams","$ionicBackdrop", "$ionicScrollDelegate", "$interval"
-        , function ($scope,$location, $ionicHistory,$timeout,$ionicLoading,$state,WechatService,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams,$ionicBackdrop, $ionicScrollDelegate, $interval) {
+    app.controller('dreamDetailCtrl', ["$scope","$location","$ionicHistory","$timeout","$ionicLoading", "$state", 'userService',"WechatService","$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams","$ionicBackdrop", "$ionicScrollDelegate", "$interval"
+        , function ($scope,$location, $ionicHistory,$timeout,$ionicLoading,$state,userService,WechatService,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams,$ionicBackdrop, $ionicScrollDelegate, $interval) {
             var dream_user_id = $stateParams.dream_user_id;
             var id = $stateParams.id;
             var interaction_id = $stateParams.interaction_id;
@@ -255,11 +255,10 @@
 
                 $scope.isTest = true;
                 userService.isTest().then(function(res){
-                    if(res.data.data){
-                        $scope.isTest = true;
-                    }
-                    else{
+                    if(res.data.data==1){
                         $scope.isTest = false;
+                    }else{
+                        $scope.isTest = true;
                     }
                 })
 
@@ -901,7 +900,7 @@
             $scope.rechagemodal.show();
             $scope.vm.money = '';
             if($scope.ios.isIOS){
-                var productIds = ['apple1001','apple1002','apple1003','apple1004']; // <- Add your product Ids here
+                var productIds = ['apple10001','apple102','apple103','apple104']; // <- Add your product Ids here
                 msg.loading();
                 inAppPurchase.getProducts(productIds).then(function (products) {
                     msg.hide();

+ 1 - 1
miaomiao/www/js/controllers/my.js

xqd
@@ -440,7 +440,7 @@
                 }
             })
             if($scope.ios.isIOS){
-                var productIds = ['apple1001','apple1002','apple1003','apple1004']; // <- Add your product Ids here
+                var productIds = ['apple10001','apple102','apple103','apple104']; // <- Add your product Ids here
                 msg.loading();
                 inAppPurchase
                   .getProducts(productIds)

+ 5 - 5
server/app/Models/OrderInfoModel.php

xqd
@@ -49,11 +49,11 @@ class OrderInfoModel extends Model
     ];
 
     //苹果支付类型
-    const Apple_Product1    = 'apple1000';
-    const Apple_Product2    = 'apple1001';
-    const Apple_Product3    = 'apple1002';
-    const Apple_Product4    = 'apple1003';
-    const Apple_Product5    = 'apple1004';
+    const Apple_Product1    = 'apple10000';
+    const Apple_Product2    = 'apple10001';
+    const Apple_Product3    = 'apple10002';
+    const Apple_Product4    = 'apple10003';
+    const Apple_Product5    = 'apple10004';
 
     //订单状态定义
     const STATUS_PENDING    = 0;