Mike 7 anni fa
parent
commit
ac34b3f21a

+ 6 - 0
miaomiao/www/js/app.js

xqd
@@ -46,6 +46,12 @@
               window.appIsOpen = false;
               console.log('pause window.appIsOpen:'+window.appIsOpen);
            });
+           $ionicPlatform.on('Resume',function () {
+              console.log('Resume');
+               window.plugins.jPushPlugin.setBadge(0); 
+               window.plugins.jPushPlugin.resetBadge();  
+               window.plugins.jPushPlugin.setApplicationIconBadgeNumber(0); 
+           });
            $ionicPlatform.ready(function () {
                if (window.cordova && cordova.platformId === 'ios' && window.cordova.plugins && window.cordova.plugins.Keyboard) {
                    cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true);

+ 2 - 1
miaomiao/www/js/controllers/home.js

xqd xqd
@@ -813,6 +813,7 @@
             .catch(function (err) {
                 msg.hide();
                 console.log('购买失败:'+JSON.stringify(err));
+                msg.text('购买失败:'+err.errorMessage);
                 $timeout(function () {
                     $scope.closeRechargeModal();
                 }, 1000);
@@ -1001,7 +1002,7 @@
 
           $scope.openRechargeModal = function() {
             $scope.rechagemodal.show();
-            $scope.vm.money = '';
+            $scope.vm.number = 'apple10001';
             if($scope.ios.isIOS){
                 var productIds = ['apple10001','apple102','apple103','apple104']; // <- Add your product Ids here
                 msg.loading();

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

xqd xqd
@@ -474,6 +474,7 @@
                           .getProducts(productIds)
                           .then(function (products) {
                             msg.hide();
+                            $scope.vm.number = 'apple10001';
                             $scope.showWithdraw = false;
                             $scope.products = products;
                             console.log('products:'+JSON.stringify(products));
@@ -559,7 +560,7 @@
             .catch(function (err) {
                 msg.hide();
                 console.log('购买失败:'+JSON.stringify(err));
-                // alert('购买失败:'+JSON.stringify(err));
+                msg.text('购买失败:'+err.errorMessage);
             });
           }else{
             if (!number) {

+ 15 - 2
miaomiao/www/templates/home/dream-detail.html

xqd
@@ -399,8 +399,21 @@
                                      请选择充值金额
                              </div>
                             <ion-list>
-                                <ion-radio ng-repeat="product in products" ng-model="vm.number"  ng-value="product.productId">
-                                  <span>{{product.title}}</span>
+                                <ion-radio style="color: #000000;" ng-model="vm.number" ng-value="'apple10001'">
+                                    <span>10梦想币</span>
+                                    <span class="fr">1元</span>
+                                </ion-radio>
+                                <ion-radio style="color: #000000;" ng-model="vm.number" ng-value="'apple102'">
+                                    <span>180梦想币+赠送5梦想币</span>
+                                    <span class="fr">18元</span>
+                                </ion-radio>
+                                <ion-radio style="color: #000000;" ng-model="vm.number" ng-value="'apple103'">
+                                    <span>680梦想币+赠送50梦想币</span>
+                                    <span class="fr">68元</span>
+                                </ion-radio>
+                                <ion-radio style="color: #000000;" ng-model="vm.number" ng-value="'apple104'">
+                                    <span>1280梦想币+赠送100梦想币</span>
+                                    <span class="fr">128元</span>
                                 </ion-radio>
                             </ion-list> 
                           </div>

+ 5 - 5
miaomiao/www/templates/my/my-recharge.html

xqd
@@ -47,19 +47,19 @@
                     <!-- <ion-radio ng-repeat="product in products" ng-model="vm.number"  ng-value="product.productId">
                     <span>{{product.title}}</span>
                     </ion-radio> -->
-                    <ion-radio style="color: #000000;" ng-model="ios.productid" ng-value="'apple100001'">
-                        <span>10梦想币</span>
+                    <ion-radio style="color: #000000;" ng-model="vm.number" ng-value="'apple10001'">
+                        <span>6梦想币</span>
                         <span class="fr">1元</span>
                     </ion-radio>
-                    <ion-radio style="color: #000000;" ng-model="ios.productid" ng-value="'apple100002'">
+                    <ion-radio style="color: #000000;" ng-model="vm.number" ng-value="'apple102'">
                         <span>180梦想币+赠送5梦想币</span>
                         <span class="fr">18元</span>
                     </ion-radio>
-                    <ion-radio style="color: #000000;" ng-model="ios.productid" ng-value="'apple100003'">
+                    <ion-radio style="color: #000000;" ng-model="vm.number" ng-value="'apple103'">
                         <span>680梦想币+赠送50梦想币</span>
                         <span class="fr">68元</span>
                     </ion-radio>
-                    <ion-radio style="color: #000000;" ng-model="ios.productid" ng-value="apple100004">
+                    <ion-radio style="color: #000000;" ng-model="vm.number" ng-value="'apple104'">
                         <span>1280梦想币+赠送100梦想币</span>
                         <span class="fr">128元</span>
                     </ion-radio>