Merge remote-tracking branch 'origin/master'

xinkeaboard-admin/src/pages/decorate/pc/home/nav.js

@@ -141,7 +141,14 @@ export default class Nav extends Component {
             return <Switch checked={text == 1 ? true : false}
                            onChange={(val) => this.handleSetEnable(val, record.navId)}/>;
           },
-        }, {
+        }, 
+        {
+          title: `${sldComLanguage('创建时间')}`,
+          dataIndex: 'createTime',
+          align: 'center',
+          width: 160,
+        },
+        {
           title: `${sldComLanguage('操作')}`,
           align: 'center',
           width: 100,
@@ -540,7 +547,7 @@ export default class Nav extends Component {
           type={2}
           title={sldComLanguage('首页导航设置')}//首页导航设置
           tip_title={sldComLanguage('操作提示')}
-          tip_data={[`${sldComLanguage('序号越小，显示越靠前')}`, `${sldComLanguage('PC商城首页展示一行，超出部分不展示，需要根据页面效果调整展示的数据')}`]}
+          tip_data={[`${sldComLanguage('排序越小，显示越靠前；排序相同，最新创建的在前。')}`, `${sldComLanguage('PC商城首页展示一行，超出部分不展示，需要根据页面效果调整展示的数据')}`]}
         />
         <div className={global.operate_bg}>
           {sldIconBtn(() => this.addNav(), `${sldComLanguage('添加导航')}`, 7, 7)}{/*添加导航*/}

xinkeaboard-web/components/SldDiy.vue

@@ -235,7 +235,7 @@
                         <a
                           href="javascript:void(0)"
                           :title="item_left_cat.categoryName"
-                          @click="goGoodsListByCatId(item_left_cat.categoryId,item_left_cat.categoryName)"
+                          @click="goGoodsListByCatId(item_left_cat)"
                           >{{ item_left_cat.categoryName }}</a
                         >
                       </li>
@@ -1272,9 +1272,11 @@ const gotoFun = (val) => {
 }
 
 
-const goGoodsListByCatIdFun = (categoryId,name) => {
-  let routeUrl = router.resolve({
-      path: "/goods/list/_"+ calcProductName(name) +"_v-"+categoryId,
+const goGoodsListByCatIdFun = (item) => {
+  const path = '/goods/list/'+ calcProductName(item.categoryName) +'_v-'+item.categoryId+'_gid-'+item.grade+'_pid-'+item.pid;
+
+  const routeUrl = router.resolve({
+      path
   });
   window.open(routeUrl.href, '_blank');
 }
@@ -1312,8 +1314,8 @@ const goGoodsDetail = (val) => {
 const goStoreDetail = (val) => {
   goStoreDetailFun(val.storeId,val.storeName);
 };
-const goGoodsListByCatId = (val,name) => {
-  goGoodsListByCatIdFun(val,name);
+const goGoodsListByCatId = (item) => {
+  goGoodsListByCatIdFun(item);
 
 };
 //adv_19楼层tab切换事件

xinkeaboard-web/pages/goods/list/[...slug].vue

@@ -529,7 +529,7 @@ const setSEO = () => {
 
 
 const cateForm = (c, g) => {
-  if (g == 0) {
+  if (g === 0) {
     return false;
   }
   if (g == 3) {