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

@@ -47,9 +47,9 @@ const component = {
 
             data = data || {};
             if (data.gender === '1') {
-                gender = 'men';
+                gender = 'MEN';
             } else if (data.gender === '2') {
-                gender = 'women';
+                gender = 'WOMEN';
             }
 
             res.render('mydetails', {

@@ -29,9 +29,9 @@ const search = {
 
                     for (let k in gender) {
                         if (k.indexOf('1') > -1) {
-                            gender[k] = 'men';
+                            gender[k] = 'MEN';
                         } else if (k.indexOf('2') > -1) {
-                            gender[k] = 'women';
+                            gender[k] = 'WOMEN';
                         }
                     }
                 }

@@ -73,9 +73,9 @@ const _getGoodsList = params => {
 
                 for (let k in gender) {
                     if (k.indexOf('1') > -1) {
-                        gender[k] = 'men';
+                        gender[k] = 'MEN';
                     } else if (k.indexOf('2') > -1) {
-                        gender[k] = 'women';
+                        gender[k] = 'WOMEN';
                     }
                 }
             }
@@ -200,4 +200,4 @@ module.exports = {
     getShopData,
     getBrandShopGoodsData,
     collectShopData
-};
\ No newline at end of file
+};

@@ -102,7 +102,7 @@ const matchHeader = (path, qs, titleMap) => {
 
     if (/\/cate-all$/.test(path)) {
         header = titleMap[1];
-        header.title.des = '全部分类';
+        header.title.des = '全部品类';
         return header;
     }
 

@@ -8,7 +8,7 @@
     line-height: 1;
     text-align: center;
     white-space: nowrap;
-    background-color: $blue;
+    background-color: $red;
     color: $white;
 }
 

@@ -3,7 +3,8 @@
         {{title.name}}
 
         <a class="more" href="{{title.moreUrl}}">
-            {{title.moreName}}
+            <span v-if="title.moreName === '···'" class="icon icon-more"></span>
+            <span v-else>{{{title.moreName}}}</span>
         </a>
     </div>
 </template>

@@ -316,7 +316,7 @@
                         font-size: 34px;
                         line-height: 72px;
                         color: #fff;
-                        background: #f03d35;
+                        background: $red;
                         text-align: center;
                         border-radius: 50%;
                         transform: scale(0.5);
@@ -373,7 +373,7 @@
 
     .app.ios {
         .blk-header {
-            padding-top: 80px;
+            padding-top: 60px;
         }
     }
 </style>

@@ -80,7 +80,7 @@
             },
             setAender: function() {
                 genderSel.show(item => {
-                    this.gender = item.val.toLowerCase();
+                    this.gender = item.val;
                     this.saveDetails({
                         nickname: this.nickname,
                         gender: item.key

@@ -381,7 +381,13 @@
     }
 
     .badge-tr {
-        margin-top: -10px;
+        margin-top: -28px;
+        margin-left: 6px;
+        width: 32px;
+        height: 32px;
+        line-height: 32px;
+        font-size: 18px;
+        padding: 0;
     }
 </style>
 <script>
@@ -520,7 +526,9 @@
                     this.isSoldOut = true;
                 }
 
-                this.entity.goodsList.forEach((goods)=> {
+                const goodsList = this.entity.goodsList || [];
+
+                goodsList.forEach((goods)=> {
                     if (!this.firstImage && goods.colorImage) {
                         this.firstImage = goods.colorImage;
                     }
@@ -548,7 +556,9 @@
                     this.intro = intro;
                 });
             })
-            .always(()=>{this.isReady = true});
+            .always(() => {
+                this.isReady = true;
+            });
 
             // 读取购物车数量
             if (this.isApp) {