Mike 7 年之前
父节点
当前提交
68a5019f3c

+ 82 - 82
miaomiao/config.xml

xqd xqd
@@ -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="*" />
-  <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="*"/>
+  <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="167" src="resources/ios/icon/icon-83.5@2x.png" width="167" />
-    <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="167" src="resources/ios/icon/icon-83.5@2x.png" width="167"/>
+    <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>
   <chcp>
-    <config-file url="http://i.9026.com/miaomiao/www/chcp.json" />
+    <config-file url="http://i.9026.com/miaomiao/www/chcp.json"/>
   </chcp>
-  <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="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-splashscreen" spec="4.0.3" />
-  <plugin name="cordova-plugin-statusbar" spec="~2.1.0" />
-  <plugin name="cordova-plugin-whitelist" spec="~1.2.1" />
-  <plugin name="ionic-plugin-keyboard" spec="~1.0.9" />
+  <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="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-splashscreen" spec="4.0.3"/>
+  <plugin name="cordova-plugin-statusbar" spec="~2.1.0"/>
+  <plugin name="cordova-plugin-whitelist" spec="~1.2.1"/>
+  <plugin name="ionic-plugin-keyboard" spec="~1.0.9"/>
   <plugin name="jpush-phonegap-plugin" src="https://github.com/jpush/jpush-phonegap-plugin.git" version="2.2.7">
-    <variable name="API_KEY" value="041b70b4c7eee686870a32cd" />
+    <variable name="API_KEY" value="041b70b4c7eee686870a32cd"/>
   </plugin>
-  <plugin name="cordova-plugin-jcore" version="1.1.5" />
+  <plugin name="cordova-plugin-jcore" version="1.1.5"/>
   <plugin name="phonegap-plugin-barcodescanner" src="https://github.com/phonegap/phonegap-plugin-barcodescanner.git" version="6.0.8">
-    <variable name="CAMERA_USAGE_DESCRIPTION" value="请摄像头对准条码" />
+    <variable name="CAMERA_USAGE_DESCRIPTION" value="请摄像头对准条码"/>
   </plugin>
   <plugin name="cordova-plugin-wechat" spec="^1.4.0">
-    <variable name="WECHATAPPID" value="wxc5181c0d406023e6" />
+    <variable name="WECHATAPPID" value="wxc5181c0d406023e6"/>
   </plugin>
 </widget>

+ 1 - 1
miaomiao/www/chcp.json

xqd
@@ -1,5 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao/www",
-  "release": "2017.08.07-16.01.27"
+  "release": "2017.08.08-12.56.04"
 }

+ 20 - 20
miaomiao/www/chcp.manifest

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -29,7 +29,7 @@
   },
   {
     "file": "css/style.css",
-    "hash": "c1e6269a03876391a0ec6b85581929bb"
+    "hash": "5904b644d66333b0d52e1dee4a726a0e"
   },
   {
     "file": "img/alipay.png",
@@ -341,7 +341,7 @@
   },
   {
     "file": "js/config/router.js",
-    "hash": "affcf54c029246b60a60a033eefd6288"
+    "hash": "ae90d80a5676b76694184e281826f47c"
   },
   {
     "file": "js/controllers/account.js",
@@ -349,15 +349,15 @@
   },
   {
     "file": "js/controllers/add.js",
-    "hash": "497ebc96c4908460118b47f35783029d"
+    "hash": "a222aeb050de599cf172e1079b9d6299"
   },
   {
     "file": "js/controllers/home.js",
-    "hash": "19e5ecda0da5540255f1c50a69fc9872"
+    "hash": "7c27ef65ea80395c54ff9669cd59b3ed"
   },
   {
     "file": "js/controllers/my.js",
-    "hash": "d1a0a3d7693df262f663f9eda56e3fef"
+    "hash": "eb9868c8ff3b37b105610f63bb057c97"
   },
   {
     "file": "js/controllers/tabs.js",
@@ -369,7 +369,7 @@
   },
   {
     "file": "js/filters/filter.js",
-    "hash": "0950f09cd363e928e798c08c090473f3"
+    "hash": "ce08a985fe8c0f1b019864f96e564f68"
   },
   {
     "file": "js/platformOverrides.js",
@@ -377,7 +377,7 @@
   },
   {
     "file": "js/services/commonservice.js",
-    "hash": "e3dd094abc22703a540d7acc99b4defc"
+    "hash": "e5125d5675acb3a0437c5c06c9e02ac9"
   },
   {
     "file": "js/services/dreamservice.js",
@@ -685,7 +685,7 @@
   },
   {
     "file": "templates/account/login.html",
-    "hash": "a5d7cd3e8c8ff19b464a3dc030f850d0"
+    "hash": "86a087afa175fb0ed0617e3a84fc71c4"
   },
   {
     "file": "templates/add/index.html",
@@ -693,15 +693,15 @@
   },
   {
     "file": "templates/home/dream-detail.html",
-    "hash": "dcf42e75d54436e25394001c41acecb0"
+    "hash": "d056c42007d6d06397a799f7889fb587"
   },
   {
     "file": "templates/home/index.html",
-    "hash": "c87c7b311eaf7584a7f12358993e36c5"
+    "hash": "d52bad338f1874e1ee2537bcb3c7b5f0"
   },
   {
     "file": "templates/home/oldDream.html",
-    "hash": "bb78d948f6ed6c051bfcd42047808024"
+    "hash": "b7258e80c20cf902e86f8992a92afb7c"
   },
   {
     "file": "templates/home/search.html",
@@ -713,19 +713,19 @@
   },
   {
     "file": "templates/home/supportDream.html",
-    "hash": "105b7d132bd9a9a2f294a9e7db685aa1"
+    "hash": "ce85d0926acf8d77a937cf1bfe953349"
   },
   {
     "file": "templates/home/userDetail.html",
-    "hash": "f9236f744a7168355e2b462a58a13b11"
+    "hash": "b92f56ecc8e03df3fb3e4d85524673bf"
   },
   {
     "file": "templates/my/aboutMiao.html",
-    "hash": "d6599d609dc87a17f0e6d03f4d4dd29c"
+    "hash": "4df63fa176e2e71bef05884bde8b3ee7"
   },
   {
     "file": "templates/my/attention.html",
-    "hash": "f5739684c4bd12db1773719497e345f4"
+    "hash": "83ffda4e5df1f6f0f44c559963b0dc4e"
   },
   {
     "file": "templates/my/contact.html",
@@ -737,11 +737,11 @@
   },
   {
     "file": "templates/my/my-collect.html",
-    "hash": "aeaf429f6e483d42fb75b58600a43b2a"
+    "hash": "901849b004af3f820b6e056ad4e149ad"
   },
   {
     "file": "templates/my/my-dream.html",
-    "hash": "b4aae1385b2606da764953b1b922b785"
+    "hash": "f922717e5e180c303fa54e54b497dfcf"
   },
   {
     "file": "templates/my/my-message-reply.html",
@@ -765,7 +765,7 @@
   },
   {
     "file": "templates/my/my-setting.html",
-    "hash": "1546150685896fe9f341b49dd6d9c320"
+    "hash": "309cffa51fdcff43d8ae736f591ac7d2"
   },
   {
     "file": "templates/my/payExplain.html",
@@ -773,11 +773,11 @@
   },
   {
     "file": "templates/my/personalLetter.html",
-    "hash": "4bbcf70be1732d2add6e9ddc3bf92567"
+    "hash": "1f3a8ae109c2cd6e0400c0798fd4ed09"
   },
   {
     "file": "templates/my/withdraw.html",
-    "hash": "93b2ceff88efba107334959996bd6af2"
+    "hash": "e969dd97846110311d8602c98d8d6f4a"
   },
   {
     "file": "templates/tabs.html",

+ 9 - 4
miaomiao/www/css/style.css

xqd xqd xqd xqd
@@ -110,6 +110,9 @@ a.tab-item-add .icon {
 .img-file-up img { max-height: 100%; max-width: 100%; }
 .img-file-up em { position: absolute; top: -10px; right: -10px; display: inline-block; width: 20px; height: 20px; z-index: 2; font-size: 1.5em; color: #dd4814 }
 .btn-file-up:hover { background-color: #dd4814; color: #FFF; border: 1px solid #dd4814 }
+.dream-images{
+    background-repeat: no-repeat;background-position:center;background-size: cover;-webkit-background-size: cover;position: relative;height: 13rem;
+}
 .addfoot {
     background-color:#fafafa;
     border:1px solid #EEE;
@@ -217,7 +220,7 @@ overflow:auto;
     }
     .avatarCol img {
         width: 30%;
-        height: 73%;
+        /*height: 73%;*/
         border-radius: 100%;
     }
     .mainitem .myblock {
@@ -461,7 +464,6 @@ a:visited,a:link{
     width:100%;
     bottom:0;
     z-index:888;
-    background-color:#fff;
     font-size:1.2rem;
 }
 .detail-like .box {
@@ -469,19 +471,22 @@ a:visited,a:link{
     background: #fff;
     padding: 5px 2%;
     margin:2%;
-    height: 220px;
+    /*height: 220px;*/
     border-radius: 20px;
     text-align:center;
 }
 .detail-like .selected{
     border:2px solid  #00C3DA;
 }
+.detail-like .coin {
+    background-color:#fff;
+}
 .detail-like .send {
     font-size:1.2rem;
     height: 3rem;
     line-height: 3rem;
     padding: 0 1rem;
-    margin-bottom: 10px;
+    background-color:#fff;
 }
 
 .detail-like .send div{

+ 3 - 2
miaomiao/www/js/controllers/add.js

xqd xqd xqd
@@ -1,6 +1,7 @@
 (function (app) {
     app.controller('addCtrl', ["$scope", "$state",  "dreamService", "msg", "$ionicTabsDelegate", "$ionicNavBarDelegate","$ionicHistory", "common", "config"
         , function ($scope, $state,  dreamService, msg, $ionicTabsDelegate, $ionicNavBarDelegate,$ionicHistory, common, config) {
+                        
             $scope.addpict = function () {
                 common.chooseImage().then(function (img) { 
                     common.uploadFiles(img,1).then(function (result) {
@@ -14,8 +15,6 @@
                     console.log('图片选择失败');
                 });
             };
-            $scope.imgs=[];
-            $scope.video = {};
             $scope.addvideo = function () {
                 common.chooseVideo().then(function (file) {
                     $scope.video.path = file;
@@ -57,6 +56,8 @@
                 });
             };
             $scope.$on('$ionicView.beforeEnter', function () {
+                $scope.imgs=[];
+                $scope.video = {};
                 $scope.vm={
                     name:'',
                     about:'',

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

xqd
@@ -147,7 +147,7 @@
                 msg.hide();
                 console.log(result);
                 $scope.dream = result.data.data;
-                debugger
+                // debugger
                 var end_time = new Date($scope.dream.end_time.replace(/-/g, "/"));
                 var date = new Date();
                 var inter = (end_time.getTime() - date.getTime()) / 1000;

+ 3 - 4
miaomiao/www/js/controllers/my.js

xqd xqd xqd
@@ -3,8 +3,7 @@
         , function ($scope,$ionicTabsDelegate, $state, $http, storage, myService, common, config, msg, $timeout) {
         $scope.$on('$ionicView.beforeEnter', function (viewResult) {
             $ionicTabsDelegate.showBar(true);
-            myService.myInfo().then(function(result){
-              console.log(result.data.data);
+            myService.myInfo().then(function(result){ 
               $scope.user = result.data.data
             });
         });
@@ -12,7 +11,7 @@
             common.setAvator().then(function (result) {
                 var response = JSON.parse(result.response);
                 $timeout(function () {
-                    $scope.vm.avatar = config.imgServer + response.data.file;
+                    $scope.user.avatar = config.imgServer + response.data.md5;
                 });
             });
         };
@@ -27,7 +26,7 @@
                 common.setAvator().then(function (result) {
                     var response = JSON.parse(result.response);
                     $timeout(function () {
-                      $scope.vm.avatar = config.imgServer + response.data.file;
+                      $scope.vm.avatar = config.imgServer + response.data.md5;
                     });
                 });
             };

+ 1 - 1
miaomiao/www/js/filters/filter.js

xqd
@@ -47,7 +47,7 @@
     module.filter('avator', function () {
         return function (input) {
           if (!input || input.length === 0) {
-              return "img/demo/head7.jpg";
+              return "img/demo/photo_default_user.png";
             }
             return input;
         };

+ 6 - 4
miaomiao/www/js/services/commonservice.js

xqd
@@ -13,14 +13,16 @@
             chooseImage: function (cameraOptions) {
                 var deferred = $q.defer();
                 var defaultCameraOptions = {
-                    quality: 50,
-                    sourceType: 1,
-                    allowEdit: true,
+                    quality: 80,
+                    sourceType: Camera.PictureSourceType.CAMERA,
+                    // allowEdit: true,
                     encodingType: 0,//0为jpg,1为png
-                    targetHeight: 400,
+                    // targetHeight: 400,
                     targetWidth: 750,
+                    correctOrientation: true,
                 };
                 var options = angular.extend(defaultCameraOptions, cameraOptions);
+                // console.log(JSON.stringify(options))
                 var sheetOptions = {
                     title: '选择图片方式',
                     buttonLabels: ['拍摄照片', '从相册选择'],

+ 8 - 5
miaomiao/www/templates/home/dream-detail.html

xqd xqd xqd
@@ -31,7 +31,10 @@
                             </div>
                         </ion-slide-page>
                         <ion-slide-page ng-repeat="img in dream.imgs" >
-                            <div class="box banner" style="height: 220px; width: 100%"><img ng-src="{{img.pic}}" style="width: 100%;" /></div>
+                            <div class="box banner" style="height: 220px; width: 100%">
+
+                        <div class="dream-images" style="background-image:url({{img.pic}});" style="width: 100%;"></div>
+                            </div>
                         </ion-slide-page>
                     </ion-slides>
                 </div>
@@ -301,7 +304,7 @@
             <div style="text-align: center; border-bottom: 3px solid #1E1D1C">
                 <img src="img/img_miao.png" style="width: 25%; height: 55px;margin-bottom: -13px">
             </div>
-            <div>
+            <div class="coin">
                 <div class="row">
                     <div class="col box {{index==2?'selected':''}}" ng-click="changeIndex(2)" ng-model="coin">
                         <div style="float:left; width: 40%; margin-right: 8%">
@@ -376,14 +379,14 @@
             <div class="send">
                 <div style="float:left;">余额:
                 </div>
-                <div style="float: left;">
-                    <div style="float:left; padding-top: 4px;">
+                <div style="float: left;width: 100px;">
+                    <div style="float:left; padding-top: 4px;height: 45px;">
                         <img src="img/icon_gold.svg"/>
                     </div>
                     <em>{{dream.user_coin}}&nbsp;</em>
                 </div>
                 <div class="calm" ng-click="toRecharge()" style="float: left;">
-                    <div style="float:left; padding-top: 4px;">
+                    <div style="float:left; padding-top: 4px;height: 45px;">
                         <img src="img/icon_ recharge.png">
                     </div>
                     <em>&nbsp;充值</em>

+ 2 - 1
miaomiao/www/templates/home/index.html

xqd
@@ -71,7 +71,8 @@
                         </div>
                     </div>
                     <div ng-click="toDetail(item.id)">
-                        <img style="height: 220px" ng-src="{{item.img.pic}}" />
+                        <div class="dream-images" style="background-image:url({{item.img.pic}});"></div>
+                        <!-- <img style="height: 220px" ng-src="{{item.img.pic}}" /> -->
                         <div class="homeDream">
                             <p style="font-size: 16px">{{ item.name }}</p>
                             <p>{{ item.about }}</p>