YanaDH 7 年 前
コミット
90ac22d063

+ 4 - 4
miaomiao/www/js/config/config.js

xqd
@@ -1,11 +1,11 @@
 (function (app) {
     //全局配置 
     app.constant("config", {
-         // server: 'http://q8.9026.com/',
-          // imgServer: 'http://q8.9026.com/attachment/'
+          server: 'http://q8.9026.com/',
+           imgServer: 'http://q8.9026.com/attachment/'
         //server: 'http://localhost:8092/',
         //imgServer: 'http://localhost:8092/attachment/',
-        server: 'http://miao.beiyuesi.com/',
-        imgServer: 'http://miao.beiyuesi.com/attachment/'
+        //server: 'http://miao.beiyuesi.com/',
+        //imgServer: 'http://miao.beiyuesi.com/attachment/'
     });
 })(angular.module('app'));

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

xqd
@@ -915,7 +915,7 @@
                             '<p>'+info+'</p>' +
                             '</div>';
                     }
-                    msg.confirm('私信',letterTemplate,'梦想页').then(function(result){
+                    msg.confirm('私信',letterTemplate,'','梦想页').then(function(result){
                         if(result==true){
                             if($location.path()=="/app/home/message/reply"){
                                 $state.go('app.home_dreamdetail',{id:dream_id,type:2});

+ 6 - 0
miaomiao/www/js/filters/filter.js

xqd
@@ -60,6 +60,12 @@
             return input;
         };
     });
+    module.filter('videoPoster', function () {
+        return function (input) {
+            var input = input.replace('attachment','upload/vpic');
+            return input;
+        };
+    });
     module.filter('lastDate', function () {
         return function (end_time) {
             var end_time = new Date(end_time.replace(/-/g, "/"));

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

xqd
@@ -174,7 +174,7 @@
                                 <img class="slt" ng-click="openCommentPic(interaction.pic9,$event)" ng-src="{{interaction.pic9}}" ng-if="interaction.pic9" />
                             </div>
                             <div class="box banner" ng-if="interaction.video">
-                                <video ng-src="{{ imghost+interaction.video | trustUrl}}" poster="{{ host+'upload/vpic/'+interaction.video+'.jpg' | trustUrl}}" width="100%" style="max-height: 400px;" class="centerme" controls="controls"></video>
+                                <video ng-src="{{ interaction.video | trustUrl}}" poster="{{ interaction.video+'.jpg' | videoPoster | trustUrl}}" width="100%" style="max-height: 400px;" class="centerme" controls="controls"></video>
                             </div>
                         </div>
                         <div class="list">

+ 1 - 1
miaomiao/www/templates/my/my-message-sys.html

xqd
@@ -7,7 +7,7 @@
         <div class="list" ng-repeat="sysInfo in sysInfos">
             <a ng-click="goMes(sysInfo.is_reply,sysInfo.is_url,sysInfo.dream_id,sysInfo.is_end,sysInfo.message,sysInfo.user_id,sysInfo.info,sysInfo.attr_id)" class="item item-icon-left">
                 <i class="icon ion-volume-medium"></i>
-                <p style="white-space: normal">{{sysInfo.message}}</p>
+                <p style="white-space: normal" ng-bind-html="sysInfo.message|trustHtml"></p>
             </a>
         </div>
     </ion-content>