add

miaomiao/config.xml

@@ -1,108 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <widget id="com.miaomiao.app" version="0.1.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>瞄喵</name>
-    <description>
+  <name>瞄喵</name>
+  <description>
         An Ionic Framework and Cordova project.
     </description>
-    <author email="you@example.com" href="http://example.com.com/">
+  <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="18" />
-    <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="KeyboardDisplayRequiresUserAction" value="false" />
-    <preference name="SplashScreenDelay" value="3000" />
-    <feature name="StatusBar">
-        <param name="ios-package" onload="true" value="CDVStatusBar" />
-    </feature>
-    <platform name="ios">
-        <icon height="1024" width="1024" src="resources/icon.png" width="1024"/>
-        <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" />
-    </platform>
-    <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="file:node_modules\cordova-plugin-camera" />
-    <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" />
-    </plugin>
-    <plugin name="cordova-plugin-splashscreen" spec="4.0.3" />
-    <plugin name="cordova-plugin-statusbar" spec="~2.1.0" />
-    <plugin name="cordova-plugin-video-editor" spec="^1.1.3" />
-    <plugin name="cordova-plugin-wechat" spec="^2.0.0">
-        <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="jpush-phonegap-plugin" spec="^3.2.3">
-        <variable name="APP_KEY" value="69838317211448192366f9d8" />
-    </plugin>
-    <plugin name="phonegap-plugin-barcodescanner" spec="git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git">
-        <variable name="CAMERA_USAGE_DESCRIPTION" value="请摄像头对准条码" />
-    </plugin>
-</widget>
+  <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="18"/>
+  <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="KeyboardDisplayRequiresUserAction" value="false"/>
+  <preference name="SplashScreenDelay" value="3000"/>
+  <feature name="StatusBar">
+    <param name="ios-package" onload="true" value="CDVStatusBar"/>
+  </feature>
+  <platform name="ios">
+    <icon height="1024" width="1024" src="resources/icon.png"/>
+    <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"/>
+  </platform>
+  <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="file:node_modules\cordova-plugin-camera"/>
+  <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"/>
+  </plugin>
+  <plugin name="cordova-plugin-splashscreen" spec="4.0.3"/>
+  <plugin name="cordova-plugin-statusbar" spec="~2.1.0"/>
+  <plugin name="cordova-plugin-video-editor" spec="^1.1.3"/>
+  <plugin name="cordova-plugin-wechat" spec="^2.0.0">
+    <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="jpush-phonegap-plugin" spec="^3.2.3">
+    <variable name="APP_KEY" value="69838317211448192366f9d8"/>
+  </plugin>
+  <plugin name="phonegap-plugin-barcodescanner" spec="git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git">
+    <variable name="CAMERA_USAGE_DESCRIPTION" value="请摄像头对准条码"/>
+  </plugin>
+</widget>

miaomiao/www/js/controllers/home.js

@@ -639,108 +639,108 @@
         $scope.ios={
             isIOS:ionic.Platform.isIOS(),
             productid:''
-          }
-            //充值
-            $scope.charge = function(number){
-                if($scope.ios.isIOS){
-                if (number<2){
-                    msg.text('请选择充值金额');
-                    return;
-                } 
-                console.log('购买productid:'+number);
-                msg.loading();
-                inAppPurchase
-                .buy(number)
-                .then(function (data) {
-                    msg.hide();
-                    console.log('购买then:'+JSON.stringify(data));
-                  return inAppPurchase.consume(data.productType, data.receipt, data.signature);
-                })
-                .then(function (data) {
-                    msg.hide();
-                    myService.orderIos(number).then(function (result) {
-                        console.log('服务器端购买成功:'+number);
-                    }, function (erro) {
-                    });
-                    console.log('购买成功:'+number);
-                    msg.success('购买成功');
-                    $timeout(function () {
-                        $scope.closeRechargeModal();
-                    }, 1000);
-                     
-                })
-                .catch(function (err) {
-                    msg.hide();
-                    console.log('购买失败:'+JSON.stringify(err));
-                    $timeout(function () {
-                        $scope.closeRechargeModal();
-                    }, 1000);
-                    // alert('购买失败:'+JSON.stringify(err));
+        }
+        //充值
+        $scope.charge = function(number){
+            if($scope.ios.isIOS){
+            if (number<2){
+                msg.text('请选择充值金额');
+                return;
+            } 
+            console.log('购买productid:'+number);
+            msg.loading();
+            inAppPurchase
+            .buy(number)
+            .then(function (data) {
+                msg.hide();
+                console.log('购买then:'+JSON.stringify(data));
+              return inAppPurchase.consume(data.productType, data.receipt, data.signature);
+            })
+            .then(function (data) {
+                msg.hide();
+                myService.orderIos(number).then(function (result) {
+                    console.log('服务器端购买成功:'+number);
+                }, function (erro) {
                 });
-              }else{
-                    if (!number) {
-                        msg.text('请输入充值金额');
-                        return;
-                    }
-                    homeService.charge(number,2).then(function (result) {
-                        //todo:result需要返回支付宝或者微信的签名信息
-                        console.log("result: " + JSON.stringify(result));
-                        var payInfo = result.data.data;
-                        if ($scope.vm.payType == 1) { //支付宝
-                            cordova.plugins.AliPay.pay(payInfo, function success(e) {
-                                $scope.clicksub = false;
-                                if (e.resultStatus == '9000') {
-                                    alert(orderID);
-                                    $timeout(function () {
-                                        $scope.closeRechargeModal();
-                                    }, 1000);
-                                    homeService.myInfo().then(function (result) {
-                                        $scope.user = result.data.data;
-                                    });
-                                } else {
-                                    msg.error("支付失败");
-                                    // msg.error("支付失败:" + JSON.stringify(e));
-                                }
-                            }, function error(e) {
-                                $scope.clicksub = false;
-                                // msg.error("支付失败:" + JSON.stringify(e));
-                                msg.error("支付失败");
-                            });
-                        }
-                        if ($scope.vm.payType == 2) { //微信
-                            // var obj = JSON.parse(payInfo);
-                            var obj = payInfo.orderString;
-                            // console.log("obj: " + JSON.stringify(obj));
-                            var params = {
-                                partnerid: obj.partnerid, // merchant id
-                                prepayid: obj.prepayid, // prepay id
-                                noncestr: obj.noncestr, // nonce
-                                timestamp: obj.timestamp, // timestamp
-                                sign: obj.sign, // signed string
-                            };
-                            // console.log("result: " + JSON.stringify(params));
-                            Wechat.sendPaymentRequest(params, function (r) {
-                                // $scope.clicksub = false;
+                console.log('购买成功:'+number);
+                msg.success('购买成功');
+                $timeout(function () {
+                    $scope.closeRechargeModal();
+                }, 1000);
+                 
+            })
+            .catch(function (err) {
+                msg.hide();
+                console.log('购买失败:'+JSON.stringify(err));
+                $timeout(function () {
+                    $scope.closeRechargeModal();
+                }, 1000);
+                // alert('购买失败:'+JSON.stringify(err));
+            });
+          }else{
+                if (!number) {
+                    msg.text('请输入充值金额');
+                    return;
+                }
+                homeService.charge(number,2).then(function (result) {
+                    //todo:result需要返回支付宝或者微信的签名信息
+                    console.log("result: " + JSON.stringify(result));
+                    var payInfo = result.data.data;
+                    if ($scope.vm.payType == 1) { //支付宝
+                        cordova.plugins.AliPay.pay(payInfo, function success(e) {
+                            $scope.clicksub = false;
+                            if (e.resultStatus == '9000') {
+                                alert(orderID);
                                 $timeout(function () {
                                     $scope.closeRechargeModal();
                                 }, 1000);
-                                $scope.load(id,dream_user_id,interaction_id);
-                                // courseService.orderStatus(orderID, $scope.paytype).then(function (result) {
-                                    
-                                //     homeService.myInfo().then(function (result) {
-                                //         $scope.user = result.data.data;
-                                //     });
-                                // }, function (erro) {
-                                //     // msg.alert("支付反馈失败:" + JSON.stringify(erro));
-                                // });
-                            }, function (reason) {
-                                $scope.clicksub = false;
-                                // msg.alert("支付失败:" + JSON.stringify(reason));
-                            });
-                        }
-                    });
-                }
-            };
+                                homeService.myInfo().then(function (result) {
+                                    $scope.user = result.data.data;
+                                });
+                            } else {
+                                msg.error("支付失败");
+                                // msg.error("支付失败:" + JSON.stringify(e));
+                            }
+                        }, function error(e) {
+                            $scope.clicksub = false;
+                            // msg.error("支付失败:" + JSON.stringify(e));
+                            msg.error("支付失败");
+                        });
+                    }
+                    if ($scope.vm.payType == 2) { //微信
+                        // var obj = JSON.parse(payInfo);
+                        var obj = payInfo.orderString;
+                        // console.log("obj: " + JSON.stringify(obj));
+                        var params = {
+                            partnerid: obj.partnerid, // merchant id
+                            prepayid: obj.prepayid, // prepay id
+                            noncestr: obj.noncestr, // nonce
+                            timestamp: obj.timestamp, // timestamp
+                            sign: obj.sign, // signed string
+                        };
+                        // console.log("result: " + JSON.stringify(params));
+                        Wechat.sendPaymentRequest(params, function (r) {
+                            // $scope.clicksub = false;
+                            $timeout(function () {
+                                $scope.closeRechargeModal();
+                            }, 1000);
+                            $scope.load(id,dream_user_id,interaction_id);
+                            // courseService.orderStatus(orderID, $scope.paytype).then(function (result) {
+                                
+                            //     homeService.myInfo().then(function (result) {
+                            //         $scope.user = result.data.data;
+                            //     });
+                            // }, function (erro) {
+                            //     // msg.alert("支付反馈失败:" + JSON.stringify(erro));
+                            // });
+                        }, function (reason) {
+                            $scope.clicksub = false;
+                            // msg.alert("支付失败:" + JSON.stringify(reason));
+                        });
+                    }
+                });
+            }
+        };
         $scope.submitComment = function (index,to_userid) {
             var interaction = $scope.dream.interactions[index];
             var iid = interaction.id;
@@ -765,91 +765,92 @@
                 });
             }
         };
+        $scope.bigImage = false;
+        $scope.showBigImage = function ($event, imageName) {
+            $event.stopPropagation();
+            $scope.url = imageName;
+            $scope.bigImage = true;
+        };
+        $scope.hideBigImage = function(){
             $scope.bigImage = false;
-            $scope.showBigImage = function ($event, imageName) {
-                $event.stopPropagation();
-                $scope.url = imageName;
-                $scope.bigImage = true;
-            };
-            $scope.hideBigImage = function(){
-                $scope.bigImage = false;
-            };
-            $ionicModal.fromTemplateUrl('qrCode.html', {
-                scope: $scope,
-                animation: 'slide-in-up'
-            }).then(function(modal) {
-                $scope.qrCodemodal = modal;
-            });
+        };
+        $ionicModal.fromTemplateUrl('qrCode.html', {
+            scope: $scope,
+            animation: 'slide-in-up'
+        }).then(function(modal) {
+            $scope.qrCodemodal = modal;
+        });
 
-            $scope.openCode = function($event) {
-                $event.stopPropagation();
-                $scope.qrCodemodal.show();
-                $scope.vm.money = '';
-            };
-            $scope.closeCode = function() {
-                $scope.qrCodemodal.hide();
-            };
-            $ionicModal.fromTemplateUrl('commentPic.html', {
-                scope: $scope,
-                animation: 'slide-in-up'
-            }).then(function(modal) {
-                $scope.CommentPicmodal = modal;
-            });
-            $scope.openCommentPic = function(pic,$event) {
-                $event.stopPropagation();
-                $scope.CommentPicmodal.show();
-                $scope.commentPicUrl = pic;
-            };
-            $scope.closeCommentPic = function() {
-                $scope.CommentPicmodal.hide();
-            };
-            $scope.addpict = function () {
-                common.chooseImage().then(function (img) {
-                    common.uploadFiles(img,1).then(function (result) {
-                        var response = JSON.parse(result.response);
-                        var file = config.imgServer + response.data.file;
-                        $scope.imgs.push(file);
-                    }, function (error) {
-                        msg.error('图片上传失败');
-                    });
+        $scope.openCode = function($event) {
+            $event.stopPropagation();
+            $scope.qrCodemodal.show();
+            $scope.vm.money = '';
+        };
+        $scope.closeCode = function() {
+            $scope.qrCodemodal.hide();
+        };
+        $ionicModal.fromTemplateUrl('commentPic.html', {
+            scope: $scope,
+            animation: 'slide-in-up'
+        }).then(function(modal) {
+            $scope.CommentPicmodal = modal;
+        });
+        $scope.openCommentPic = function(pic,$event) {
+            $event.stopPropagation();
+            $scope.CommentPicmodal.show();
+            $scope.commentPicUrl = pic;
+        };
+        $scope.closeCommentPic = function() {
+            $scope.CommentPicmodal.hide();
+        };
+        $scope.addpict = function () {
+            common.chooseImage().then(function (img) {
+                common.uploadFiles(img,1).then(function (result) {
+                    var response = JSON.parse(result.response);
+                    var file = config.imgServer + response.data.file;
+                    $scope.imgs.push(file);
                 }, function (error) {
-                    console.log('图片选择失败');
+                    msg.error('图片上传失败');
                 });
-            };
-            $scope.deletefile = function (file) {
-                var index = $scope.imgs.indexOf(file);
-                $scope.imgs.splice(index, 1);
-                common.deletefile(file).then(function () {
-                })
-            };
+            }, function (error) {
+                console.log('图片选择失败');
+            });
+        };
+        $scope.deletefile = function (file) {
+            var index = $scope.imgs.indexOf(file);
+            $scope.imgs.splice(index, 1);
+            common.deletefile(file).then(function () {
+            })
+        };
 
-            $scope.addvideo = function () {
-                common.chooseVideo().then(function (file) {
-                    msg.loading();
-                    common.uploadFiles(file, 2).then(function (result) {
-                        msg.hide();
-                        var response = JSON.parse(result.response);
-                        $scope.video.server = response.data.file;
-                        var file = config.imgServer+response.data.file;
-                        $scope.video.isOK = true;
-                        $scope.video.file = file;
-                        $scope.video.vpic = config.server+'upload/vpic/'+response.data.file+'.jpg';
-                    }, function (error) {
-                        //msg.error('视频上传失败');
-                        msg.hide();
-                        msg.error(JSON.stringify(error));
-                    });
-                }, function (erro) {
-                    console.log('选择视频失败');
+        $scope.addvideo = function () {
+            common.chooseVideo().then(function (file) {
+                msg.loading();
+                common.uploadFiles(file, 2).then(function (result) {
+                    msg.hide();
+                    var response = JSON.parse(result.response);
+                    $scope.video.server = response.data.file;
+                    var file = config.imgServer+response.data.file;
+                    $scope.video.isOK = true;
+                    $scope.video.file = file;
+                    $scope.video.vpic = config.server+'upload/vpic/'+response.data.file+'.jpg';
+                }, function (error) {
+                    //msg.error('视频上传失败');
+                    msg.hide();
+                    msg.error(JSON.stringify(error));
                 });
-            };
-            $scope.deletevideo = function (file) {
-                $scope.video = {};
-                common.deletefile(file).then(function (res) {
-                },function(erro){
-                    alert(JSON.stringify(erro));
-                })
-            };
+            }, function (erro) {
+                console.log('选择视频失败');
+            });
+        };
+        $scope.deletevideo = function (file) {
+            $scope.video = {};
+            common.deletefile(file).then(function (res) {
+            },function(erro){
+                alert(JSON.stringify(erro));
+            })
+        };
+
           $ionicModal.fromTemplateUrl('recharge-modal.html', {
             scope: $scope,
             animation: 'slide-in-up'
@@ -858,24 +859,21 @@
           });
 
           $scope.openRechargeModal = function() {
-          
             $scope.rechagemodal.show();
             $scope.vm.money = '';
             if($scope.ios.isIOS){
                 var productIds = ['apple10000','apple10002','apple10003','apple10004']; // <- Add your product Ids here
                 msg.loading();
-                inAppPurchase
-                  .getProducts(productIds)
-                  .then(function (products) {
+                inAppPurchase.getProducts(productIds).then(function (products) {
                     msg.hide();
                     $scope.products = products;
                     console.log('products:'+JSON.stringify(products));
-                  })
-                  .catch(function (err) {
+                  }).catch(function (err) {
                     msg.hide();
                     console.log(err);
                   });
             }
+            
           };
           $scope.closeRechargeModal = function() {
             $scope.rechagemodal.hide();
@@ -899,6 +897,7 @@
           //当我们用到模型时，清除它！
           $scope.$on('$destroy', function() {
             $scope.modal.remove();
+            $scope.rechagemodal.remove();
           });
             $scope.toMessage = function(){
                 if($location.path()=="/app/home/dreamdetail"){
@@ -909,8 +908,8 @@
                 }
             }
         }]);
-    app.controller('userDetailCtrl', ["$scope","$location", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
-        , function ($scope,$location, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
+    app.controller('userDetailCtrl', ["$scope","$location", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams",  "$timeout", "$ionicScrollDelegate", "$interval"
+        , function ($scope,$location, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $timeout, $ionicScrollDelegate, $interval) {
             var id = $stateParams.id;
             $scope.items = $stateParams.items;
                 $scope.$on('$ionicView.beforeEnter', function () {

miaomiao/www/templates/home/dream-detail.html

@@ -304,6 +304,9 @@
             <div ng-if="bigImage && type==2" ng-click="hideBigImage()" class="popover-backdrop">
                 <img ng-src="{{url}}">
             </div>
+        </div>
+    </ion-content>
+    
             <script id="interaction-modal.html" type="text/ng-template">
                 <div class="modal">
                     <ion-header-bar class="bar-calm bar bar-header has-tabs-top">
@@ -392,7 +395,19 @@
                                 <ion-radio ng-repeat="product in products" ng-model="vm.number"  ng-value="product.productId">
                                   <span>{{product.title}}</span>
                                 </ion-radio>
-                            
+<!-- 
+                                 <ion-radio ng-model="vm.number"  ng-value="'apple10000'">
+                                    <span>6个梦想币</span>
+                                </ion-radio>
+                                <ion-radio ng-model="vm.number" ng-value="'apple10002'">
+                                    <span>50个梦想币</span>
+                                </ion-radio>
+                                <ion-radio ng-model="vm.number" ng-value="'apple10003'">
+                                  <span>188个梦想币</span>
+                                </ion-radio>
+                                <ion-radio ng-model="vm.number" ng-value="apple10004">
+                                    <span>898个梦想币</span>
+                                </ion-radio> -->
                             </ion-list> 
                           </div>
                         </div>
@@ -404,8 +419,6 @@
                     </ion-content>
                 </div>
             </script>
-        </div>
-    </ion-content>
     <div class="detail-like" ng-if="tosupport">
         <div style="text-align: center; border-bottom: 3px solid #8D8D8E; position: relative">
             <img ng-src="img/img_miao.png" style="width: 25%; height: 55px;margin-bottom: -13px">