Merge remote-tracking branch 'origin/develop' into develop

@@ -23,7 +23,7 @@ const fav = {
         }
         }
     },
     },
     favpaging: (req, res, next) => {
     favpaging: (req, res, next) => {
-        const uid = req.user.uid || 14459668;
+        const uid = req.user.uid;
         const tab = req.query.tab;
         const tab = req.query.tab;
         const page = req.query.page;
         const page = req.query.page;
 
 
@@ -40,7 +40,7 @@ const fav = {
         }
         }
     },
     },
     deletefav: (req, res, next) => {
     deletefav: (req, res, next) => {
-        const uid = req.user.uid || 14459668;
+        const uid = req.user.uid;
         const favId = req.body.favId;
         const favId = req.body.favId;
         const type = req.body.type;
         const type = req.body.type;
 
 

@@ -13,7 +13,7 @@ const helpers = global.yoho.helpers;
  */
  */
 const component = {
 const component = {
     index: (req, res, next) => {
     index: (req, res, next) => {
-        const uid = req.user.uid || 14459668;
+        const uid = req.user.uid;
 
 
         if (!uid && req.xhr) {
         if (!uid && req.xhr) {
             return res.json({
             return res.json({
@@ -38,7 +38,7 @@ const component = {
         }).catch(next);
         }).catch(next);
     },
     },
     mydetails: (req, res, next) => {
     mydetails: (req, res, next) => {
-        const uid = req.user.uid || 14459668;
+        const uid = req.user.uid;
 
 
         homeModel.getUserProfileData(uid).then(data => {
         homeModel.getUserProfileData(uid).then(data => {
             data = data || {};
             data = data || {};
@@ -62,7 +62,7 @@ const component = {
     },
     },
     saveMydetails: (req, res, next) => {
     saveMydetails: (req, res, next) => {
         var params = {
         var params = {
-            uid: req.user.uid || 14459668
+            uid: req.user.uid
         };
         };
 
 
         if (req.body.nickname !== undefined) {
         if (req.body.nickname !== undefined) {
@@ -121,7 +121,6 @@ const component = {
     },
     },
     saveFeedback: (req, res, next) => {
     saveFeedback: (req, res, next) => {
         let saveFeedbackPara = {
         let saveFeedbackPara = {
-            uid: '14459668',
             content: req.body.content,
             content: req.body.content,
             suggest_type: 2
             suggest_type: 2
         };
         };

 <div class="select">
 <div class="select">
     <ul>
     <ul>
         {{#each items}}
         {{#each items}}
-        <li class="item-li" key="{{key}}">{{val}}</li>
+        <li class="item-li {{#if disabled}} disabled {{/if}}" key="{{key}}" status="{{disabled}}">{{val}}</li>
         {{/each}}
         {{/each}}
         <li class="item-del">
         <li class="item-del">
             <span>取消</span>
             <span>取消</span>

@@ -28,40 +28,49 @@ function Select(items) {
     // 覆盖层
     // 覆盖层
     const overlay = new Overlay({
     const overlay = new Overlay({
         onClose: function() {
         onClose: function() {
+            elem.removeClass('slide-in');
             elem.hide();
             elem.hide();
         }
         }
     });
     });
 
 
-    $(del).click(function() {
+    const hide = function() {
+        elem.removeClass('slide-in');
         overlay.hide();
         overlay.hide();
         elem.hide();
         elem.hide();
-    });
+    }
 
 
-    return {
-        show: function(cb) {
-            if (elem.parent().length === 0) {
-                const lis = elem.find('.item-li');
+    const show = function(cb) {
+        if (elem.parent().length === 0) {
+            const lis = elem.find('.item-li');
 
 
-                lis.each(function() {
+            lis.each(function() {
+                if (!$(this).attr('status')) {
                     $(this).click(function(e) {
                     $(this).click(function(e) {
-                        overlay.hide();
-                        elem.hide();
+                        hide();
                         cb({
                         cb({
                             key: $(e.target).attr('key'),
                             key: $(e.target).attr('key'),
                             val: e.target.innerHTML
                             val: e.target.innerHTML
                         });
                         });
                     });
                     });
-                });
-                elem.appendTo('body').addClass('animation-target');
-            }
-
-            overlay.show();
-            elem.show();
-        },
-        hide: function() {
-            overlay.hide();
-            elem.hide();
+                }
+            });
+            elem.appendTo('body');
         }
         }
+
+        overlay.show();
+        elem.show();
+        setTimeout(() => {
+            elem.addClass('slide-in');
+        }, 200);
+    }
+
+    $(del).click(function() {
+        hide();
+    });
+
+    return {
+        show: show,
+        hide: hide
     };
     };
 }
 }
 
 

@@ -4,6 +4,8 @@
     width: 100%;
     width: 100%;
     background: #fff;
     background: #fff;
     z-index: 1001;
     z-index: 1001;
+    transform: translate3d(0, 100%, 0);
+    transition: all 0.1s ease-in-out;
 
 
     ul {
     ul {
         font-size: 34px;
         font-size: 34px;
@@ -15,10 +17,18 @@
             border-bottom: 1px solid #e0e0e0;
             border-bottom: 1px solid #e0e0e0;
         }
         }
 
 
+        .disabled {
+            color: #b0b0b0;
+        }
+
         .item-del {
         .item-del {
             margin-top: 10px;
             margin-top: 10px;
             border-top: 1px solid #e0e0e0;
             border-top: 1px solid #e0e0e0;
             color: #5c99e4;
             color: #5c99e4;
         }
         }
     }
     }
+
+    &.slide-in {
+        transform: translate3d(0, 0, 0);
+    }
 }
 }

 <template>
 <template>
-    <tab v-bind:page="page"></tab>
+    <div class="cate-tab-fixed">
+        <tab v-bind:page="page"></tab>
+    </div>
     <div class="cate-page" id='cate-page'>
     <div class="cate-page" id='cate-page'>
         <div class="cate-nav clearfix">
         <div class="cate-nav clearfix">
             <ul>
             <ul>
@@ -27,6 +29,12 @@
     </div>
     </div>
 </template>
 </template>
 <style>
 <style>
+.cate-tab-fixed {
+    position: fixed;
+    top: 0;
+    left: 0;
+}
+
 .cate-page {
 .cate-page {
     font-size: 36px;
     font-size: 36px;
     font-family: helvetica, Arial, "黑体";
     font-family: helvetica, Arial, "黑体";

@@ -62,7 +62,6 @@
                 let _this = this;
                 let _this = this;
 
 
                 genderSel.show(function(item) {
                 genderSel.show(function(item) {
-                    console.log(item)
                     _this.gender = item.val.toLowerCase();
                     _this.gender = item.val.toLowerCase();
                     _this.saveDetails({
                     _this.saveDetails({
                         nickname: _this.nickname,
                         nickname: _this.nickname,

@@ -53,7 +53,7 @@
     }
     }
 </style>
 </style>
 <script>
 <script>
-    const shareBottom = require('product/shop/share-bottom.vue');
+    const shareBottom = require('component/tool/share-bottom.vue');
     const qs = require('yoho-qs');
     const qs = require('yoho-qs');
     const tip = require('common/tip');
     const tip = require('common/tip');
 
 

@@ -16,7 +16,7 @@
         height: 80px;
         height: 80px;
         padding: 10px 20px;
         padding: 10px 20px;
         position: fixed;
         position: fixed;
-        top: 60px;
+        top: 40px;
         left: 0;
         left: 0;
         z-index: 99;
         z-index: 99;
         color: #fff;
         color: #fff;
@@ -43,13 +43,13 @@
     }
     }
 
 
     .top-box-left {
     .top-box-left {
-        left: -655px;
+        left: -665px;
     }
     }
 
 
     .top-change {
     .top-change {
         background-color: #fff;
         background-color: #fff;
         color: #000;
         color: #000;
-        height: 140px;
+        height: 120px;
         top: 0;
         top: 0;
         padding: 70px 20px 10px;
         padding: 70px 20px 10px;
     }
     }