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

miaomiao/www/chcp.json

@@ -1,5 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao",
-  "release": "2017.08.28-18.17.55"
+  "release": "2017.08.30-19.54.11"
 }

miaomiao/www/chcp.manifest

@@ -13,7 +13,7 @@
   },
   {
     "file": ".idea/workspace.xml",
-    "hash": "f8fbc73e7836d0d9dcd0f64e832b8e1f"
+    "hash": "89b8a76aa9a2c8ae1cd6e709bcf87338"
   },
   {
     "file": ".idea/www.iml",
@@ -29,7 +29,7 @@
   },
   {
     "file": "css/style.css",
-    "hash": "d122efc072fbd75047590e193a9d603a"
+    "hash": "0a57d621113b29c4a8241355812001cf"
   },
   {
     "file": "img/alipay.png",
@@ -389,7 +389,7 @@
   },
   {
     "file": "js/app.js",
-    "hash": "2b42283fd02f2a16b9d3a31298d2232b"
+    "hash": "5411129ea442c6f240ae625312c0359f"
   },
   {
     "file": "js/config/config.js",
@@ -397,11 +397,11 @@
   },
   {
     "file": "js/config/router.js",
-    "hash": "d46342ba91814d876d1f6363ec01d803"
+    "hash": "b7a41bc21bfcdc5df31023e157bd39d1"
   },
   {
     "file": "js/controllers/account.js",
-    "hash": "6146403bc7cd12c82e98c4b215bfece5"
+    "hash": "e4fbc7d47a6e7b8bebbf978b8400f5a2"
   },
   {
     "file": "js/controllers/add.js",
@@ -409,11 +409,11 @@
   },
   {
     "file": "js/controllers/home.js",
-    "hash": "9562ec274dff28576297d96970d3a566"
+    "hash": "780ff60645536e3ac25dae04c37ac175"
   },
   {
     "file": "js/controllers/my.js",
-    "hash": "080ffa833f483b9f3719c7adce29edd4"
+    "hash": "d0ebf31143fae9676f5383ab4865c6cc"
   },
   {
     "file": "js/controllers/tabs.js",
@@ -441,11 +441,11 @@
   },
   {
     "file": "js/services/homeservice.js",
-    "hash": "6dab0d50b06b07f1a61d5c8072dba3ec"
+    "hash": "1303298da28869b2122062b64263e4fe"
   },
   {
     "file": "js/services/httpinterceptor.js",
-    "hash": "0b37d4ea06ccd8c899a88ba816cd1a0b"
+    "hash": "bb52b98c41b6cae7fa998cd5de1c56e5"
   },
   {
     "file": "js/services/jpushservice.js",
@@ -457,7 +457,7 @@
   },
   {
     "file": "js/services/myservice.js",
-    "hash": "71be3b2761b31f8396f775d69db6de04"
+    "hash": "a01d04bf5ef841aaa796ad6f855535ba"
   },
   {
     "file": "js/services/storageservice.js",
@@ -749,7 +749,7 @@
   },
   {
     "file": "templates/account/loginAccount.html",
-    "hash": "917519c0d9d0a9aa86d17660eb91c354"
+    "hash": "32d86b81565de79b527b52a75f8feb7c"
   },
   {
     "file": "templates/add/addExplain.html",
@@ -761,11 +761,11 @@
   },
   {
     "file": "templates/home/dream-detail.html",
-    "hash": "a259875e360d2c792baed20c01917d7c"
+    "hash": "8b5b2b539172342ba2256e3ac25a76ed"
   },
   {
     "file": "templates/home/index.html",
-    "hash": "c9466f12e7d16ebca25acdb4ffa5e8ed"
+    "hash": "c33f7fe7d09a023e30488083fade8d5d"
   },
   {
     "file": "templates/home/oldDream.html",
@@ -777,7 +777,7 @@
   },
   {
     "file": "templates/home/shareDream.html",
-    "hash": "4f9ad1f12c92964e0180444f1bfabf3d"
+    "hash": "9c9e2a65a78735986f334753eb861e44"
   },
   {
     "file": "templates/home/supportDream.html",
@@ -837,7 +837,7 @@
   },
   {
     "file": "templates/my/my-recharge.html",
-    "hash": "10484fc6c9fe31890552481d7f0c73e6"
+    "hash": "146fefb366afd60a07bd1f8701857669"
   },
   {
     "file": "templates/my/my-setting.html",

miaomiao/www/css/style.css

@@ -34,9 +34,9 @@
 .radiodiv .item-radio{
     line-height:10px;
 }
-    .radiodiv .item-radio input:checked + .radio-content .item-content {
-        background:url("/img/icon_ok.svg") no-repeat 60%;
-    }
+.radiodiv .item-radio input:checked + .radio-content .item-content {
+    background:url("../img/icon_ok.svg") no-repeat 95%;
+}
 .lgsocial{
     text-align:center;
     padding:1rem 0;

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/templates/account/loginAccount.html

@@ -6,7 +6,7 @@
         <div class="login">
             <div class="box">
                 <span>手机号码</span>
-                <span class="fl">
+                <span class="fl" style="width: 50%;">
                     <input id="tel" type="tel" ng-model="vm.mobile" placeholder="请输入手机号码">
                 </span>
                 <span class="clear" ng-click="clear()">

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

@@ -141,9 +141,9 @@
                             <img ng-src="img/pic_leaves.png">
                         </div>
                     </div>
-                    <div class="row">
+                    <!-- <div class="row">
                         <div class="col" style="text-align: center">孤独的我还被支持呢。。。亲，帮个忙？</div>
-                    </div>
+                    </div> -->
                 </div>
             </div>
 

server/app/Http/Controllers/Api/V1/IndexController.php

@@ -112,9 +112,9 @@ class IndexController extends Controller
     {
         $login_user = $this->getUser();
         $id = $login_user->id;
-        $arr1 =DreamInfoModel::orderBy('score','desc')->limit(20)->select('id')->get()->toArray();
+        $arr1 =DreamInfoModel::orderBy('score','desc')->limit(30)->select('id')->get()->toArray();
         $id_arr1 = array_column($arr1,'id');
-        $arr2 =DreamInfoModel::orderBy('score','desc')->limit(120)->select('id')->get()->toArray();
+        $arr2 =DreamInfoModel::orderBy('score','desc')->offset(15)->limit(120)->select('id')->get()->toArray();
         $id_arr2 = array_column($arr2,'id');
         $dtusers =UserCareUser::where('user_id',$id)->with('other_user')->
         where('dream_number','>',0)->orderBy('created_at')->get()->toArray();
@@ -140,7 +140,7 @@ class IndexController extends Controller
             return $this->api(compact('users','dreams'));
         } else{
             $banners = $this->getBanner();
-            $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->limit(20)->paginate(20);
+            $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->limit(15)->paginate(15);
             $this->dreams($dreams);
             return $this->api(compact('banners','users','dreams'));
         }

server/resources/views/admin/share.blade.php

@@ -3,6 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>分享梦想页</title>
+    <script src="/base/js/jquery-2.1.1.min.js"></script>
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
     <style>
         body{
@@ -22,13 +23,13 @@
 ">
 <p style="font-size: 17px; padding: 0 10px">{{$dream->name}}</p>
 <div style="border-bottom: 1px solid #DEDEDE">
-    <p style="font-size: 13px; padding: 0 10px; color: #919191">
-        {{mb_substr($dream->about,0,8)}} ...
+    <p id="about" style="font-size: 13px; padding: 0 10px; color: #919191;white-space: nowrap;overflow:hidden;text-overflow:ellipsis">
+        {{$dream->about}}
+    </p>
+    <p style="text-align: center">
+        <img src="/base/img/down.svg" alt="" id="down">
+        <img src="/base/img/up.svg" alt="" id="up">
     </p>
-  {{--  <p style="text-align: center">
-        <img src="/base/img/down.svg" alt="">
-        <img src="/base/img/up.svg" alt="">
-    </p>--}}
 </div>
 <div style="border-bottom: 1px solid #DEDEDE; height: 50px; padding: 5px 10px;">
     <div style="float:left;">
@@ -57,4 +58,22 @@
     </div>
 </div>
 </body>
-</html>
+</html>
+<script>
+    $(function () {
+        $('#up').hide();
+        var str = $('#about').html();
+        new_str = str.replace(/\n/g,"<br/>");
+        $('#about').html(new_str);
+        $('#up').click(function () {
+            $(this).hide();
+            $('#down').show();
+            $('#about').css('white-space','nowrap');
+        });
+        $('#down').click(function () {
+            $(this).hide();
+            $('#up').show();
+            $('#about').css('white-space','normal');
+        });
+    });
+</script>