Merge branch 'feature/channel' into develop

@@ -16,7 +16,7 @@ module.exports = {
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',
     domains: {
     domains: {
         api: 'http://devapi.yoho.cn:58078/',
         api: 'http://devapi.yoho.cn:58078/',
-        service: 'http://172.16.6.247:8085/gateway/'
+        service: 'http://192.168.102.202:8080/gateway/'
     },
     },
     subDomains: {
     subDomains: {
         host: '.m.yohobuy.com',
         host: '.m.yohobuy.com',

@@ -4,7 +4,7 @@ const qs = require('yoho-qs');
 const contentCode = require('content-code');
 const contentCode = require('content-code');
 
 
 const tab = require('channel/tab.vue');
 const tab = require('channel/tab.vue');
-const resources = require('channel/resources.vue');
+const resources = require('component/resources/index.vue');
 
 
 require('common/vue-filter');
 require('common/vue-filter');
 
 

-@use postcss-clearfix ;
+@use postcss-clearfix;
 
 
 .clearfix {
 .clearfix {
     clear: fix;
     clear: fix;
@@ -15,7 +15,7 @@ html,
 body {
 body {
     width: 100%;
     width: 100%;
     font-size: 24px;
     font-size: 24px;
-    font-family: helvetica, Arial, "黑体";
+    font-family: Helvetica, Roboto, "Heiti SC", "黑体", Arial;
     line-height: 1.4;
     line-height: 1.4;
 }
 }
 
 
@@ -29,14 +29,6 @@ a {
     outline: none;
     outline: none;
 }
 }
 
 
-.hide {
-    display: none;
-}
-
-.overflow-hidden {
-    overflow: hidden;
-}
-
 .main-wrap {
 .main-wrap {
     position: relative;
     position: relative;
     margin-right: auto;
     margin-right: auto;
@@ -44,6 +36,15 @@ a {
     max-width: 750px;
     max-width: 750px;
     width: 100%;
     width: 100%;
 }
 }
+
+.text-center {
+    text-align: center;
+}
+
+.overflow-hidden {
+    overflow: hidden;
+}
+
 .right {
 .right {
     float: right;
     float: right;
 }
 }
@@ -51,6 +52,7 @@ a {
 .left {
 .left {
     float: right;
     float: right;
 }
 }
-.text-center {
-    text-align: center;
+
+.hide {
+    display: none;
 }
 }

@@ -29,12 +29,12 @@
     const bus = require('common/vue-bus');
     const bus = require('common/vue-bus');
     const contentCode = require('content-code');
     const contentCode = require('content-code');
 
 
-    const focus = require('component/resources/focus.vue');
-    const focusLeftRight = require('component/resources/focus-left-right.vue');
-    const titleImage = require('component/resources/title-image.vue');
-    const titleFloor = require('component/resources/title-floor.vue');
-    const recommendContentFive = require('component/resources/recommend-content-five.vue');
-    const goods = require('component/resources/goods.vue');
+    const focus = require('./focus.vue');
+    const focusLeftRight = require('./focus-left-right.vue');
+    const titleImage = require('./title-image.vue');
+    const titleFloor = require('./title-floor.vue');
+    const recommendContentFive = require('./recommend-content-five.vue');
+    const goods = require('./goods.vue');
 
 
     const dataCache = {};
     const dataCache = {};