add

miaomiao/www/chcp.json

@@ -1,5 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao",
-  "release": "2017.08.30-20.00.38"
+  "release": "2017.08.31-09.14.33"
 }

miaomiao/www/chcp.manifest

@@ -401,15 +401,15 @@
   },
   {
     "file": "js/controllers/account.js",
-    "hash": "e4fbc7d47a6e7b8bebbf978b8400f5a2"
+    "hash": "d398cdf936584f691e523a88d75dd1a4"
   },
   {
     "file": "js/controllers/add.js",
-    "hash": "f65c172ea5e948ea63405b09f4100edc"
+    "hash": "380e6d6e3b09ec45d8244b054a4f9319"
   },
   {
     "file": "js/controllers/home.js",
-    "hash": "164888ce155251c164a7e210eee34e2a"
+    "hash": "b9e491905e469c1c30efc780adce3a9b"
   },
   {
     "file": "js/controllers/my.js",
@@ -761,7 +761,7 @@
   },
   {
     "file": "templates/home/dream-detail.html",
-    "hash": "10d46645abfdd9051d65b2e3400c76bb"
+    "hash": "cb5d116eb2afb116f8403a3f39a27608"
   },
   {
     "file": "templates/home/index.html",

miaomiao/www/js/controllers/account.js

@@ -4,9 +4,9 @@
              //$ionicNavBarDelegate.showBackButton(false);
             $scope.wechat_login = function(){
                 var scope = "snsapi_userinfo", state = "_" + (+new Date());
-                Wechat.auth(scope, state, function (response) {
+                // Wechat.auth(scope, state, function (response) {
                     // alert("response:"+JSON.stringify(response));
-                    // var response={code:1231};
+                    var response={code:1231};
                     if(response.code){
                         msg.loading('登录中...');
                         userService.wechat_login(response.code).then(function(result){
@@ -26,9 +26,9 @@
                             $state.go("loginAccount",{wechat:$scope.wecaht});
                         });
                     }
-                }, function (error) {
-                    console.log("Failed: " + JSON.stringify(error));
-                });
+                // }, function (error) {
+                //     console.log("Failed: " + JSON.stringify(error));
+                // });
                 //$state.go("loginAccount");
             };
     }]);

miaomiao/www/js/controllers/add.js

@@ -42,7 +42,7 @@
             $scope.add = function () {
                 var data = {
                     pics: $scope.imgs,
-                    video:$scope.video.server,
+                    video: $scope.video.server,
                     name: $scope.vm.name,
                     about: $scope.vm.about,
                     days: 21, //默认21

miaomiao/www/js/controllers/home.js

@@ -227,8 +227,7 @@
                 };
                 $scope.dream = result.data.data;
                 if($scope.timer=='已结束'|| 100*$scope.dream.get_coin/$scope.dream.coin>=100){
-                    $scope.codeBtn = true;
-                    debugger;
+                    $scope.codeBtn = true; 
                 }
                 if($scope.dream.video){
                     $scope.dream.vpic = config.server+'upload/vpic/'+$scope.dream.video+'.jpg';
@@ -573,6 +572,7 @@
             $scope.modal.show();
             $scope.vm.title = '';
             $scope.imgs = [];
+            $scope.video = {};
           };
           $scope.closeModal = function() {
             $scope.modal.hide();

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

@@ -282,13 +282,13 @@
                 <a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">
                     <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
                 </a>
-                <a class="btn-file-up" ng-click="addpict()">
+                <a class="btn-file-up" ng-click="addpict()" ng-show="!video.isOK">
                     <img ng-src="img/icon_photo.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                     <em style="font-size: 16px">添加图片</em>
                 </a>
                 <video ng-src="{{video.file | trustUrl}}" ng-show="video.isOK" poster="{{video.vpic}}" height="72px" width="72px" controls="controls">
                 </video>
-                <a class="btn-file-up" ng-click="addvideo()" ng-show="!video.isOK">
+                <a class="btn-file-up" ng-click="addvideo()" ng-show="!video.isOK&&imgs.length==0">
                     <img src="img/icon_video.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                     <em style="font-size: 16px">添加视频</em>
                 </a>