Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

miaomiao/www/chcp.json

@@ -1,5 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao",
-  "release": "2017.09.24-10.49.02"
+  "release": "2017.09.26-14.18.34"
 }

miaomiao/www/chcp.manifest

@@ -765,7 +765,7 @@
   },
   {
     "file": "templates/home/dream-detail.html",
-    "hash": "6ae0706ac9d345ab099c54b892dd5395"
+    "hash": "c4caae8bc500f1fdc952ba431a61e5da"
   },
   {
     "file": "templates/home/index.html",
@@ -789,7 +789,7 @@
   },
   {
     "file": "templates/home/userDetail.html",
-    "hash": "da14043cd0cbd05516eb046a687858e3"
+    "hash": "7744a43a82f79a3cf661387b7a98bd3d"
   },
   {
     "file": "templates/my/aboutMiao.html",

miaomiao/www/js/config/config.js

@@ -1,12 +1,12 @@
 (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'));

miaomiao/www/js/controllers/home.js

@@ -101,7 +101,7 @@
                         obj[i].checked=false;
                     }
                 };
-                debugger;
+                // debugger;
                 homeService.doFilter($scope.filter.sex,$scope.filter.age,$scope.filter.city).then(function(result){
                     $scope.index.dreams = result.data.data.dreams.data;
                 },function(error){

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

@@ -187,8 +187,11 @@
                                     <div class="col-80" style="border-bottom: 1px solid #E6E6E6">
                                         <span style="margin-top: 10px; display: inline-block">{{c.user_nickname}}</span>
                                         <span class="utitle kz">{{c.updated_at}}</span>
-                                        <p style="white-space:normal; color: #666666">
-                                            回复<span style="color:#333333">{{c.to_user_nickname}}</span>：{{c.content}}
+                                        <p style="white-space:normal; color: #666666;font-size: 12px">
+                                            <span ng-if="c.to_user_nickname&&c.to_user_nickname!=' '&&c.to_user_nickname!=dream.user.nickname" style="font-size: 12px">
+                                                回复<span style="color:#333333;font-size: 12px">{{c.to_user_nickname}}</span>：
+                                            </span>
+                                            {{c.content}}
                                         </p>
                                     </div>
                                 </div>

miaomiao/www/templates/home/index.html

@@ -112,7 +112,7 @@
   <label class="item item-select item-select-width">
     <span class="input-label">地区</span>
     <select name="city" ng-model="filter.city">
-        <!-- <option value="" selected>所有</option> -->
+        <option value="" selected>所有</option>
         <option value="北京">北京</option>
         <option value="上海">上海</option>
         <option value="广州">广州</option>

server/routes/web.php

@@ -12,7 +12,7 @@
 */
 
 Route::get('/', function () {
-    return view('welcome');
+    return redirect('/admin/login');
 });
 
 Route::get('attachment/{md5}', [