Merge branch 'master' of http://git.9026.com/roobe/miao

miaomiao/www/js/controllers/my.js

@@ -867,8 +867,10 @@
                     common.uploadFiles(file, 2).then(function (result) {
                         msg.hide();
                         var response = JSON.parse(result.response);
-                       //var file = config.imgServer+response.data.file;
-                        //$scope.video.file = response.data.file;
+                        // var file = config.imgServer+response.data.file;
+                        // $scope.video.file = response.data.file;
+                        $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';

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

@@ -402,19 +402,6 @@
                                 <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>

miaomiao/www/templates/home/index.html

@@ -61,13 +61,13 @@
                                 </ion-slide>
                             </ion-slide-box>
                             <!-- end 轮播图-->
-                            <div class="row" ng-if="index.users.length>0" style="background: #FAFAFA;height:80px;padding: 0 5px;">
+                            <div class="row" ng-if="index.users.length>0" style="background: #FAFAFA;height:80px;">
                                 <div class="col col-10" style="margin-top: 7%" ng-click="next(1)">
                                     <i class="icon ion-ios-arrow-left" style="font-size: 1.5rem; color: #00C3DA; line-height: 100%"></i>
                                 </div>
                                 <div class="col" style="overflow: hidden; padding:0 5px;" on-drag-right="next(2)" on-drag-left="next(1)">
-                                    <div style="position: relative; display: inline-block; width: 35%; text-align: center; height: 100%;" class="subcontent" ng-repeat="user in index.users">
-                                        <span style="border-radius: 100%; position: absolute; right: 5%; padding: 2px 5px; font-size: 13px; background-color: #EF4941;">新</span>
+                                    <div style="position: relative; display: inline-block; width: 33%; text-align: center; height: 100%;" class="subcontent" ng-repeat="user in index.users">
+                                        <span style="border-radius: 100%; position: absolute; right: 5%; width: 22px; height: 22px; line-height: 22px; border-radius: 100%; font-size: 13px; background-color: #EF4941;">新</span>
                                         <img ng-click="clickAvatar(user.id,user.dream_id)" ng-if="$index<4" ng-src="{{user.avatar |avator}}" class="chosenClass" style="width: 70%;" />
                                     </div>
                                 </div>