From 621441e3f30bc9be769620a804f962b070dcbbb2 Mon Sep 17 00:00:00 2001
From: Lee-1203 <342694918@qq.com>
Date: Fri, 15 Jul 2022 18:39:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E4=BF=AE=E6=94=B9-0715?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commons/style.css                                      | 10 +++++-----
 pages/tabbar/news/collection.vue                       |  3 +--
 pages/tabbar/news/news.vue                             |  2 +-
 .../dist/dev/.sourcemap/mp-weixin/common/main.js.map   |  2 +-
 .../mp-weixin/pages/tabbar/news/collection.js.map      |  2 +-
 unpackage/dist/dev/mp-weixin/common/main.wxss          | 10 +++++-----
 .../dist/dev/mp-weixin/pages/tabbar/news/collection.js |  3 +--
 .../dist/dev/mp-weixin/pages/tabbar/news/news.wxml     |  2 +-
 8 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/commons/style.css b/commons/style.css
index 9fd223e..0fcf391 100644
--- a/commons/style.css
+++ b/commons/style.css
@@ -230,22 +230,22 @@ page {background-color: #eaeaea;}
 	z-index: 99;
 	overflow-x: auto;
 }
-.nav-list-bg::-webkit-scrollbar{
+.news-nav-bg::-webkit-scrollbar{
 	width: 0;
 	height: 0;
 	opacity: 0;
 }
-.nav-list-bg .pull-nav-btns{
+.news-nav-bg .pull-nav-btns{
 	justify-content: start !important;
 }
-.nav-list-bg .pull-nav-btns .btn{
+.news-nav-bg .pull-nav-btns .btn{
 	width: 180rpx !important;
 	margin: 0 20rpx !important;
 }
-.nav-list-bg .pull-nav-btns .btn:first-child{
+.news-nav-bg .pull-nav-btns .btn:first-child{
 	margin-left: 0 !important;
 }
-.nav-list-bg .pull-nav-btns .btn:last-child{
+.news-nav-bg .pull-nav-btns .btn:last-child{
 	margin-right: 0 !important;
 }
 .news-list-bg{
diff --git a/pages/tabbar/news/collection.vue b/pages/tabbar/news/collection.vue
index 467c9bb..7152d7d 100644
--- a/pages/tabbar/news/collection.vue
+++ b/pages/tabbar/news/collection.vue
@@ -155,12 +155,11 @@
 									id:item.id,
 									src:item.cover,
 									title:item.title,
-									time:this.dateFormat(item.published_at.replace(/-/g,'/')),
+									time:this.dateFormat(item.created_at.replace(/-/g,'/')),
 								}
 								newArr.push(obj)
 							})
 							this.collectionList = this.collectionList.concat(newArr);
-							console.log(this.collectionList,1212121)
 							if(this.collectionList.length == this.total){
 								this.totalAll = this.total;
 							}
diff --git a/pages/tabbar/news/news.vue b/pages/tabbar/news/news.vue
index 0ae46b3..ae97e25 100644
--- a/pages/tabbar/news/news.vue
+++ b/pages/tabbar/news/news.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="pad-b150">
 		<status-nav :ifReturn="false" navBarTitle="资讯" :marginBottom="0"></status-nav>
-		<view class="nav-list-bg" :style="{top:newTop+'px'}">
+		<view class="nav-list-bg news-nav-bg" :style="{top:newTop+'px'}">
 			<nav-tab :list="navTabList" :maxNum="5" @chooseEv="chooseEv" :newWidth="newWidth"></nav-tab>
 		</view>
 		<view class="news-list-bg" v-if="isLoading">
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
index bd4a244..2fcb4bd 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
@@ -1 +1 @@
-{"version":3,"sources":["uni-app:///main.js",null,"webpack:///D:/鲁班家具小程序/luban-mall/App.vue?81f4","uni-app:///App.vue","webpack:///D:/鲁班家具小程序/luban-mall/App.vue?4a76","webpack:///D:/鲁班家具小程序/luban-mall/App.vue?c9a7"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","Vue","prototype","$store","store","component","statusContainer","nothingPage","$toolAll","tools","$requst","requst","$hostHttp","App","mpType","app","$mount"],"mappings":";;;;;;;;;iDAAA;;AAE2D;AAC3D;AACA;;;;;;;;;;AAUA;;;;AAIA,wF,ynCAjBA;AACAA,EAAE,CAACC,iCAAH,GAAuCC,mBAAvC,CAGAC,aAAIC,SAAJ,CAAcC,MAAd,GAAuBC,cAAvB,C,sWAE2E;AAC3EH,aAAII,SAAJ,CAAc,kBAAd,EAAiCC,eAAjC,E,CAAkD;yUAEc;AAChEL,aAAII,SAAJ,CAAc,cAAd,EAA6BE,WAA7B,E,CAA0C;AAE1C;AAEAN,aAAIC,SAAJ,CAAcM,QAAd,GAAyBC,cAAzB,C,CAEA;AAEAR,aAAIC,SAAJ,CAAcQ,OAAd,GAAwBC,eAAxB,C,CAEA;AACAV,aAAIC,SAAJ,CAAcU,SAAd,GAA0B,yBAA1B,CAEAC,aAAIC,MAAJ,GAAa,KAAb,CAEA,IAAMC,GAAG,GAAG,IAAId,YAAJ;AACXG,OAAK,EAALA,cADW;AAELS,YAFK,EAAZ;;;AAKA,UAAAE,GAAG,EAACC,MAAJ,G;;;;;;;;;;;;;;;;;AC/BA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AACuD;AACL;AACa;;;AAG/D;AAC8K;AAC9K,gBAAgB,2LAAU;AAC1B,EAAE,yEAAM;AACR;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACe,gF;;;;;;;;;;;ACvBf;AAAA;AAAA;AAAA;AAAupB,CAAgB,mrBAAG,EAAC,C;;;;;;;;;;;;ACC3qB,sE;AACA;AACA;AACA,mBADA,EACA;AACA,WAFA,EAEA;AACA,WAHA,EAGA;AACA,sCAJA,CAIA;AAJA,GADA;AAOA;AACA;AACA;AACA;AACA;AACA,2DADA;AAEA,kCAFA;AAGA;AACA;AACA;AACA,kEAFA,CAEA;AACA,oEAHA,CAGA;AACA,oEAJA,CAIA;AACA,gFALA,CAKA;AACA,0EANA,CAMA;AACA,kFAPA,CAOA;AACA;AACA,WAbA;;AAeA,OAjBA;;AAmBA,GA5BA;AA6BA;;AAEA,GA/BA;AAgCA;;AAEA,GAlCA;AAmCA,aAnCA,E;;;;;;;;;;;;;;;;;;ACFA;AAAA;AAAA;AAAA;AAAg8B,CAAgB,o8BAAG,EAAC,C;;;;;;;;;;ACAp9B;AACA,OAAO,KAAU,EAAE,kBAKd","file":"common/main.js","sourcesContent":["import 'uni-pages';\r\n// @ts-ignore\r\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;import Vue from 'vue';\r\nimport App from './App';\r\nimport store from './store'\r\nVue.prototype.$store = store\r\n\r\nimport statusContainer from './components/containers/status-container.vue';//引入头部状态栏、导航栏、内容容器组件\r\nVue.component('status-container',statusContainer);//全局注册头部状态栏、导航栏、内容容器组件\r\n\r\nimport nothingPage from './components/nothing/nothing-page.vue';//引入无内容组件\r\nVue.component('nothing-page',nothingPage);//全局注册无内容组件\r\n\r\n// 常用便捷式公共方法\r\nimport tools from '@/jsFile/tools.js';\r\nVue.prototype.$toolAll = tools;\r\n\r\n// 响应数据\r\nimport requst from '@/jsFile/requst.js';\r\nVue.prototype.$requst = requst;\r\n\r\n//公共域名\r\nVue.prototype.$hostHttp = 'https://luban.scdxtc.cn';\r\n\r\nApp.mpType = 'app';\r\n\r\nconst app = new Vue({\r\n\tstore,\r\n    ...App\r\n})\r\n\r\napp.$mount()","var render, staticRenderFns, recyclableRender, components\nvar renderjs\nimport script from \"./App.vue?vue&type=script&lang=js&\"\nexport * from \"./App.vue?vue&type=script&lang=js&\"\nimport style0 from \"./App.vue?vue&type=style&index=0&lang=css&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  null,\n  null,\n  false,\n  components,\n  renderjs\n)\n\ncomponent.options.__file = \"App.vue\"\nexport default component.exports","import mod from \"-!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--12-1!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--12-1!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js&\"","<script>\r\n\timport {userInfoEv} from '@/jsFile/public-api.js';\r\n\texport default {\r\n\t\tglobalData:{\r\n\t\t\tprojectname:'', // 项目名称\r\n\t\t\tlat:'', // 公司地址维度\r\n\t\t\tlng:''  ,// 公司地址经度\r\n\t\t\thostapi:'https://luban.scdxtc.cn' // 域名配置\r\n\t\t},\r\n\t\t// 优先于show方法\r\n\t\tonLaunch: function() {\r\n\t\t\tuni.login({\r\n\t\t\t\tsuccess: (res) => {\r\n\t\t\t\t\tuni.request({\r\n\t\t\t\t\t\turl: this.globalData.hostapi +'/api/user/login',\r\n\t\t\t\t\t\tdata:{code:res.code},\r\n\t\t\t\t\t\tsuccess: (result) => {\r\n\t\t\t\t\t\t\tif(result.data.code == 0) {\r\n\t\t\t\t\t\t\t\tuni.setStorageSync('userId',result.data.account_id);\r\n\t\t\t\t\t\t\t\tuni.setStorageSync('token',result.data.data.token);//缓存token\r\n\t\t\t\t\t\t\t\tuni.setStorageSync('openid',result.data.data.openid);//缓存openid\r\n\t\t\t\t\t\t\t\tuni.setStorageSync('expire',result.data.data.expire);//缓存失效时间（时间戳格式）\r\n\t\t\t\t\t\t\t\tuni.setStorageSync('phone_active',result.data.data.phone_active);//是否授权手机号\r\n\t\t\t\t\t\t\t\tuni.setStorageSync('is_active',result.data.data.is_active);//是否授权头像和昵称\r\n\t\t\t\t\t\t\t\tuni.setStorageSync('business_code',result.data.data.business_code);//缓存邀请码\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t})\r\n\t\t},\r\n\t\tonShow: function() {\r\n\t\t\t\r\n\t\t},\r\n\t\tonHide: function() {\r\n\t\t\t\r\n\t\t},\r\n\t\tmethods:{\r\n\t\t\t\r\n\t\t}\r\n\t};\r\n</script>\r\n\r\n<style>\r\n\t/*每个页面公共css */\r\n    \r\n\t/* 阿里巴巴矢量图标库 start */\r\n\t@import url(\"./commons/icon-font.css\");\r\n\t/* 阿里巴巴矢量图标库 end */\r\n\t/* 项目基础样式 start */\r\n\t@import url(\"./commons/base.css\");\r\n\t/* 项目基础样式 end */\r\n\t/* 项目页面样式 start */\r\n\t@import url(\"./commons/style.css\");\r\n\t/* 项目页面样式 end */\r\n\r\n\t/* 动画样式 start */\r\n\t@import url(\"./commons/animate.min.css\");\r\n\t/* 动画样式 end */\r\n\t@import url(\"./commons/loading.css\");\r\n</style>\r\n\r\n","import mod from \"-!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--6-oneOf-1-2!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--6-oneOf-1-3!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=css&\"; export default mod; export * from \"-!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--6-oneOf-1-2!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--6-oneOf-1-3!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=css&\"","// extracted by mini-css-extract-plugin\n    if(module.hot) {\n      // 1657879288813\n      var cssReload = require(\"D:/HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/hmr/hotModuleReplacement.js\")(module.id, {\"hmr\":true,\"publicPath\":\"../../\",\"locals\":false});\n      module.hot.dispose(cssReload);\n      module.hot.accept(undefined, cssReload);\n    }\n  "],"sourceRoot":""}
\ No newline at end of file
+{"version":3,"sources":["uni-app:///main.js",null,"webpack:///D:/鲁班家具小程序/luban-mall/App.vue?81f4","uni-app:///App.vue","webpack:///D:/鲁班家具小程序/luban-mall/App.vue?4a76","webpack:///D:/鲁班家具小程序/luban-mall/App.vue?c9a7"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","Vue","prototype","$store","store","component","statusContainer","nothingPage","$toolAll","tools","$requst","requst","$hostHttp","App","mpType","app","$mount"],"mappings":";;;;;;;;;iDAAA;;AAE2D;AAC3D;AACA;;;;;;;;;;AAUA;;;;AAIA,wF,ynCAjBA;AACAA,EAAE,CAACC,iCAAH,GAAuCC,mBAAvC,CAGAC,aAAIC,SAAJ,CAAcC,MAAd,GAAuBC,cAAvB,C,sWAE2E;AAC3EH,aAAII,SAAJ,CAAc,kBAAd,EAAiCC,eAAjC,E,CAAkD;yUAEc;AAChEL,aAAII,SAAJ,CAAc,cAAd,EAA6BE,WAA7B,E,CAA0C;AAE1C;AAEAN,aAAIC,SAAJ,CAAcM,QAAd,GAAyBC,cAAzB,C,CAEA;AAEAR,aAAIC,SAAJ,CAAcQ,OAAd,GAAwBC,eAAxB,C,CAEA;AACAV,aAAIC,SAAJ,CAAcU,SAAd,GAA0B,yBAA1B,CAEAC,aAAIC,MAAJ,GAAa,KAAb,CAEA,IAAMC,GAAG,GAAG,IAAId,YAAJ;AACXG,OAAK,EAALA,cADW;AAELS,YAFK,EAAZ;;;AAKA,UAAAE,GAAG,EAACC,MAAJ,G;;;;;;;;;;;;;;;;;AC/BA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AACuD;AACL;AACa;;;AAG/D;AAC8K;AAC9K,gBAAgB,2LAAU;AAC1B,EAAE,yEAAM;AACR;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACe,gF;;;;;;;;;;;ACvBf;AAAA;AAAA;AAAA;AAAupB,CAAgB,mrBAAG,EAAC,C;;;;;;;;;;;;ACC3qB,sE;AACA;AACA;AACA,mBADA,EACA;AACA,WAFA,EAEA;AACA,WAHA,EAGA;AACA,sCAJA,CAIA;AAJA,GADA;AAOA;AACA;AACA;AACA;AACA;AACA,2DADA;AAEA,kCAFA;AAGA;AACA;AACA;AACA,kEAFA,CAEA;AACA,oEAHA,CAGA;AACA,oEAJA,CAIA;AACA,gFALA,CAKA;AACA,0EANA,CAMA;AACA,kFAPA,CAOA;AACA;AACA,WAbA;;AAeA,OAjBA;;AAmBA,GA5BA;AA6BA;;AAEA,GA/BA;AAgCA;;AAEA,GAlCA;AAmCA,aAnCA,E;;;;;;;;;;;;;;;;;;ACFA;AAAA;AAAA;AAAA;AAAg8B,CAAgB,o8BAAG,EAAC,C;;;;;;;;;;ACAp9B;AACA,OAAO,KAAU,EAAE,kBAKd","file":"common/main.js","sourcesContent":["import 'uni-pages';\r\n// @ts-ignore\r\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;import Vue from 'vue';\r\nimport App from './App';\r\nimport store from './store'\r\nVue.prototype.$store = store\r\n\r\nimport statusContainer from './components/containers/status-container.vue';//引入头部状态栏、导航栏、内容容器组件\r\nVue.component('status-container',statusContainer);//全局注册头部状态栏、导航栏、内容容器组件\r\n\r\nimport nothingPage from './components/nothing/nothing-page.vue';//引入无内容组件\r\nVue.component('nothing-page',nothingPage);//全局注册无内容组件\r\n\r\n// 常用便捷式公共方法\r\nimport tools from '@/jsFile/tools.js';\r\nVue.prototype.$toolAll = tools;\r\n\r\n// 响应数据\r\nimport requst from '@/jsFile/requst.js';\r\nVue.prototype.$requst = requst;\r\n\r\n//公共域名\r\nVue.prototype.$hostHttp = 'https://luban.scdxtc.cn';\r\n\r\nApp.mpType = 'app';\r\n\r\nconst app = new Vue({\r\n\tstore,\r\n    ...App\r\n})\r\n\r\napp.$mount()","var render, staticRenderFns, recyclableRender, components\nvar renderjs\nimport script from \"./App.vue?vue&type=script&lang=js&\"\nexport * from \"./App.vue?vue&type=script&lang=js&\"\nimport style0 from \"./App.vue?vue&type=style&index=0&lang=css&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  null,\n  null,\n  false,\n  components,\n  renderjs\n)\n\ncomponent.options.__file = \"App.vue\"\nexport default component.exports","import mod from \"-!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--12-1!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--12-1!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js&\"","<script>\r\n\timport {userInfoEv} from '@/jsFile/public-api.js';\r\n\texport default {\r\n\t\tglobalData:{\r\n\t\t\tprojectname:'', // 项目名称\r\n\t\t\tlat:'', // 公司地址维度\r\n\t\t\tlng:''  ,// 公司地址经度\r\n\t\t\thostapi:'https://luban.scdxtc.cn' // 域名配置\r\n\t\t},\r\n\t\t// 优先于show方法\r\n\t\tonLaunch: function() {\r\n\t\t\tuni.login({\r\n\t\t\t\tsuccess: (res) => {\r\n\t\t\t\t\tuni.request({\r\n\t\t\t\t\t\turl: this.globalData.hostapi +'/api/user/login',\r\n\t\t\t\t\t\tdata:{code:res.code},\r\n\t\t\t\t\t\tsuccess: (result) => {\r\n\t\t\t\t\t\t\tif(result.data.code == 0) {\r\n\t\t\t\t\t\t\t\tuni.setStorageSync('userId',result.data.account_id);\r\n\t\t\t\t\t\t\t\tuni.setStorageSync('token',result.data.data.token);//缓存token\r\n\t\t\t\t\t\t\t\tuni.setStorageSync('openid',result.data.data.openid);//缓存openid\r\n\t\t\t\t\t\t\t\tuni.setStorageSync('expire',result.data.data.expire);//缓存失效时间（时间戳格式）\r\n\t\t\t\t\t\t\t\tuni.setStorageSync('phone_active',result.data.data.phone_active);//是否授权手机号\r\n\t\t\t\t\t\t\t\tuni.setStorageSync('is_active',result.data.data.is_active);//是否授权头像和昵称\r\n\t\t\t\t\t\t\t\tuni.setStorageSync('business_code',result.data.data.business_code);//缓存邀请码\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t})\r\n\t\t},\r\n\t\tonShow: function() {\r\n\t\t\t\r\n\t\t},\r\n\t\tonHide: function() {\r\n\t\t\t\r\n\t\t},\r\n\t\tmethods:{\r\n\t\t\t\r\n\t\t}\r\n\t};\r\n</script>\r\n\r\n<style>\r\n\t/*每个页面公共css */\r\n    \r\n\t/* 阿里巴巴矢量图标库 start */\r\n\t@import url(\"./commons/icon-font.css\");\r\n\t/* 阿里巴巴矢量图标库 end */\r\n\t/* 项目基础样式 start */\r\n\t@import url(\"./commons/base.css\");\r\n\t/* 项目基础样式 end */\r\n\t/* 项目页面样式 start */\r\n\t@import url(\"./commons/style.css\");\r\n\t/* 项目页面样式 end */\r\n\r\n\t/* 动画样式 start */\r\n\t@import url(\"./commons/animate.min.css\");\r\n\t/* 动画样式 end */\r\n\t@import url(\"./commons/loading.css\");\r\n</style>\r\n\r\n","import mod from \"-!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--6-oneOf-1-2!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--6-oneOf-1-3!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=css&\"; export default mod; export * from \"-!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--6-oneOf-1-2!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--6-oneOf-1-3!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=css&\"","// extracted by mini-css-extract-plugin\n    if(module.hot) {\n      // 1657881499694\n      var cssReload = require(\"D:/HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/hmr/hotModuleReplacement.js\")(module.id, {\"hmr\":true,\"publicPath\":\"../../\",\"locals\":false});\n      module.hot.dispose(cssReload);\n      module.hot.accept(undefined, cssReload);\n    }\n  "],"sourceRoot":""}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/tabbar/news/collection.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/tabbar/news/collection.js.map
index 81682de..895c555 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/tabbar/news/collection.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/tabbar/news/collection.js.map
@@ -1 +1 @@
-{"version":3,"sources":["uni-app:///main.js",null,"webpack:///D:/鲁班家具小程序/luban-mall/pages/tabbar/news/collection.vue?c94f","webpack:///D:/鲁班家具小程序/luban-mall/pages/tabbar/news/collection.vue?77d0","webpack:///D:/鲁班家具小程序/luban-mall/pages/tabbar/news/collection.vue?d849","uni-app:///pages/tabbar/news/collection.vue"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;kDAAA;;;AAGA;AACA,4G,8FAHA;AACAA,EAAE,CAACC,iCAAH,GAAuCC,mBAAvC,CAGAC,UAAU,CAACC,mBAAD,CAAV,C;;;;;;;;;;;;;ACLA;AAAA;AAAA;AAAA;AAAA;AAAuH;AACvH;AAC8D;AACL;;;AAGzD;AACuL;AACvL,gBAAgB,2LAAU;AAC1B,EAAE,gFAAM;AACR,EAAE,qFAAM;AACR,EAAE,8FAAe;AACjB;AACA;AACA;AACA;AACA;AACA,EAAE,yFAAU;AACZ;AACA;;AAEA;AACe,gF;;;;;;;;;;;;ACtBf;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;;;;;;;;;;;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AACA;AACA;AACA,aAAa,kLAEN;AACP,KAAK;AACL;AACA,aAAa,8LAEN;AACP;AACA;AACA,CAAC;AACD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;ACtCA;AAAA;AAAA;AAAA;AAA2sB,CAAgB,0rBAAG,EAAC,C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACqB/tB;AACA,gD,g9DAAA;eACA;AACA;AACA,wBADA;AAEA,kBAFA;AAGA,sBAHA,EADA;;AAMA,MANA,kBAMA;AACA;AACA,uGADA;AAEA,mDAFA;AAGA,0DAHA;AAIA,wBAJA,EAIA;AACA;AACA,oBADA;AAEA,oBAFA,CALA;;AASA,qBATA,EASA;AACA,aAVA,EAUA;AACA,cAXA,EAWA;AACA,cAZA,EAYA;AACA,kBAbA,EAaA;AACA,kBAdA,EAcA;AACA,yBAfA,EAeA;AACA,sBAhBA;;AAkBA,GAzBA;AA0BA;AACA;AACA,6EADA,GADA,CA1BA;;;AA+BA,QA/BA,kBA+BA,EA/BA,EA+BA;AACA;AACA;AACA;AACA,GAnCA;AAoCA,QApCA,oBAoCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OANA;AAOA,KARA,MAQA;AACA;AACA;AACA;AACA;AACA,GAlDA;AAmDA,eAnDA,yBAmDA,CAnDA,EAmDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GA1DA;AA2DA;AACA,mBA5DA,+BA4DA;AACA;AACA;AACA,gBADA;;AAGA,GAjEA;AAkEA;AACA,iBAnEA,2BAmEA,GAnEA,EAmEA;AACA;AACA;AACA,gBADA;;AAGA,GAxEA;AAyEA;AACA;AACA,YAFA,oBAEA,IAFA,EAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAjBA;AAkBA;AACA,qBAnBA,+BAmBA;AACA;AACA,uBADA;AAEA,uBAFA;;AAIA;AACA;AACA;AACA,sBADA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA,2BADA;AAEA,+BAFA;AAGA,gCAHA;AAIA,wBAJA;;AAMA;AACA,aARA;AASA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SApBA;AAqBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,2BADA;AAEA,+BAFA;AAGA,iCAHA;AAIA,6EAJA;;AAMA;AACA,aARA;AASA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SArBA;AAsBA;AACA,KA3EA;AA4EA;AACA,cA7EA,sBA6EA,QA7EA,EA6EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAtFA;AAuFA;AACA,gBAxFA,wBAwFA,EAxFA,EAwFA;AACA;AACA;AACA;AACA,mBADA;AAEA,2BAFA;;AAIA;AACA;AACA;AACA;AACA;AACA,SALA;AAMA;AACA;AACA;AACA,2BADA;AAEA,2BAFA;;AAIA;AACA;AACA;AACA;AACA;AACA,SALA;AAMA;AACA,KAlHA;AAmHA;AACA,mBApHA,2BAoHA,EApHA,EAoHA;AACA;AACA;AACA,sEADA;;AAGA;AACA;AACA;AACA,4DADA;;AAGA;AACA,KA/HA,EAzEA,E","file":"pages/tabbar/news/collection.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/tabbar/news/collection.vue'\ncreatePage(Page)","import { render, staticRenderFns, recyclableRender, components } from \"./collection.vue?vue&type=template&id=9606a23c&\"\nvar renderjs\nimport script from \"./collection.vue?vue&type=script&lang=js&\"\nexport * from \"./collection.vue?vue&type=script&lang=js&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  null,\n  null,\n  false,\n  components,\n  renderjs\n)\n\ncomponent.options.__file = \"pages/tabbar/news/collection.vue\"\nexport default component.exports","export * from \"-!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--16-0!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./collection.vue?vue&type=template&id=9606a23c&\"","var components\ntry {\n  components = {\n    navTab: function() {\n      return import(\n        /* webpackChunkName: \"components/nav-tab/nav-tab\" */ \"@/components/nav-tab/nav-tab.vue\"\n      )\n    },\n    pullList: function() {\n      return import(\n        /* webpackChunkName: \"components/pull-list/pull-list\" */ \"@/components/pull-list/pull-list.vue\"\n      )\n    }\n  }\n} catch (e) {\n  if (\n    e.message.indexOf(\"Cannot find module\") !== -1 &&\n    e.message.indexOf(\".vue\") !== -1\n  ) {\n    console.error(e.message)\n    console.error(\"1. 排查组件名称拼写是否正确\")\n    console.error(\n      \"2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom\"\n    )\n    console.error(\n      \"3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件\"\n    )\n  } else {\n    throw e\n  }\n}\nvar render = function() {\n  var _vm = this\n  var _h = _vm.$createElement\n  var _c = _vm._self._c || _h\n}\nvar recyclableRender = false\nvar staticRenderFns = []\nrender._withStripped = true\n\nexport { render, staticRenderFns, recyclableRender, components }","import mod from \"-!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--12-1!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./collection.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--12-1!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./collection.vue?vue&type=script&lang=js&\"","<template>\r\n\t<view>\r\n\t\t<status-nav :ifReturn=\"true\" navBarTitle=\"收藏\" :marginBottom=\"0\"></status-nav>\r\n\t\t<!-- 导航 -->\r\n\t\t<view class=\"nav-list-bg\" :style=\"{top:newTop+'px'}\">\r\n\t\t\t<nav-tab :list=\"navTabList\" @chooseEv=\"chooseEv\"></nav-tab>\r\n\t\t</view>\r\n\t\t<!-- 列表 -->\r\n\t\t<view class=\"news-list-bg\" v-if=\"isLoading\">\r\n\t\t\t<pull-list :list=\"collectionList\" :collection=\"1\" :isShop=\"isShop\" @toDetail=\"toArticleDetail\" @collectionEv=\"collectionEv\"></pull-list>\r\n\t\t</view>\r\n\t\t<!-- 暂无更多内容 -->\r\n\t\t<view class=\"more-txt more-txt-other\" v-if=\"total!==0 && totalAll == total\">暂无更多内容</view>\r\n\t\t<nothing-page v-if=\"total==0&&totalAll == total\" content=\"还没有相关收藏哟(*^▽^*)\"></nothing-page>\r\n\t</view>\r\n</template>\r\n\r\n<script>\r\n\timport statusNav from '@/components/status-navs/status-nav';\r\n\timport navTab from '@/components/nav-tab/nav-tab.vue';\r\n\timport pullList from '@/components/pull-list/pull-list.vue';\r\n\timport {getCartNum,userInfoEv} from '@/jsFile/public-api.js';\r\n\timport {mapState} from 'vuex'//引入mapState\r\n\texport default {\r\n\t\tcomponents:{\r\n\t\t\tstatusNav,\r\n\t\t\tnavTab,\r\n\t\t\tpullList\r\n\t\t},\r\n\t\tdata() {\r\n\t\t\treturn {\r\n\t\t\t\tscrollHeight:uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - 50,\r\n\t\t\t\tnewWidth:uni.getSystemInfoSync().windowWidth,\r\n\t\t\t\tnewTop:uni.getSystemInfoSync().statusBarHeight + 50,\r\n\t\t\t\tcollectionList:[], //解答&资讯列表\r\n\t\t\t\tnavTabList:[ //导航列表\r\n\t\t\t\t\t{name:'商品'},\r\n\t\t\t\t\t{name:'文章'},\r\n\t\t\t\t],\r\n\t\t\t\tcurrentIndex:0, //当前位置\r\n\t\t\t\tpage:1, //第几页\r\n\t\t\t\tsize:10, //查询条数\r\n\t\t\t\ttotal:0, //总数\r\n\t\t\t\ttotalAll:-1, //计算总数\r\n\t\t\t\tisShop:true, //是否商品\r\n\t\t\t\tcacheBusinessId:-1, //商户id\r\n\t\t\t\tisLoading:false,\r\n\t\t\t}\r\n\t\t},\r\n\t\tcomputed:{\r\n\t\t\t...mapState({\r\n\t\t\t\tfootHeight: state => state.moduleA.footHeight,\r\n\t\t\t}),\r\n\t\t},\r\n\t\tonLoad(op) {\r\n\t\t\tif(op.business_id){\r\n\t\t\t\tthis.cacheBusinessId = op.business_id;\r\n\t\t\t}\r\n\t\t},\r\n\t\tonShow() {\r\n\t\t\tif(this.cacheBusinessId !== -1){\r\n\t\t\t\tthis.$requst.post('/api/index/change-business',{business_id:this.cacheBusinessId}).then(res=>{\r\n\t\t\t\t\tif(res.code == 0){\r\n\t\t\t\t\t\tthis.collectionList = [];\r\n\t\t\t\t\t\tthis.getCollectionList();\r\n\t\t\t\t\t\tuserInfoEv();\r\n\t\t\t\t\t}\r\n\t\t\t\t})\r\n\t\t\t}else{\r\n\t\t\t\tthis.collectionList = [];\r\n\t\t\t\tthis.getCollectionList();\r\n\t\t\t\tuserInfoEv();\r\n\t\t\t}\r\n\t\t},\r\n\t\tonReachBottom(e) {\r\n\t\t\tif(this.collectionList.length<this.total){\r\n\t\t\t\tthis.page++;\r\n\t\t\t\tthis.getArticleList();\r\n\t\t\t}\r\n\t\t\tthis.page++;\r\n\t\t\tthis.getCollectionList();\r\n\t\t},\r\n\t\t// 分享到微信\r\n\t\tonShareAppMessage() {\r\n\t\t\tlet path = uni.getStorageSync('page-path-options')+'?business_id='+uni.getStorageSync('business_id');\r\n\t\t\treturn {\r\n\t\t\t\tpath:path\r\n\t\t\t}\r\n\t\t},\r\n\t\t// 分享到朋友圈\r\n\t\tonShareTimeline(res){\r\n\t\t\tlet path = uni.getStorageSync('page-path-options')+'?business_id='+uni.getStorageSync('business_id');\r\n\t\t\treturn {\r\n\t\t\t\tpath:path\r\n\t\t\t}\r\n\t\t},\r\n\t\tmethods: {\r\n\t\t\t// 切换事件\r\n\t\t\tchooseEv(type){\r\n\t\t\t\tif(type == 0){\r\n\t\t\t\t\tthis.isShop = true;\r\n\t\t\t\t}\r\n\t\t\t\tif(type == 1){\r\n\t\t\t\t\tthis.isShop = false;\r\n\t\t\t\t}\r\n\t\t\t\tif(this.currentIndex !== type){\r\n\t\t\t\t\tthis.total=0;\r\n\t\t\t\t\tthis.totalAll=-1;\r\n\t\t\t\t\tthis.page = 1;\r\n\t\t\t\t\tthis.currentIndex = type;\r\n\t\t\t\t\tthis.collectionList=[];\r\n\t\t\t\t\tthis.getCollectionList();\r\n\t\t\t\t}\r\n\t\t\t},\r\n\t\t\t// 获取收藏列表\r\n\t\t\tgetCollectionList(){\r\n\t\t\t\tlet params = {\r\n\t\t\t\t\tpage:this.page,\r\n\t\t\t\t\tsize:this.size\r\n\t\t\t\t}\r\n\t\t\t\tthis.isLoading =false;\r\n\t\t\t\tif(this.currentIndex == 0){\r\n\t\t\t\t\tuni.showLoading({\r\n\t\t\t\t\t\ttitle: '加载中'\r\n\t\t\t\t\t});\r\n\t\t\t\t\tthis.$requst.get('/api/spu/collection',params).then(res=>{\r\n\t\t\t\t\t\tif(res.code == 0){\r\n\t\t\t\t\t\t\tthis.total = res.data.total;\r\n\t\t\t\t\t\t\tlet newArr = [];\r\n\t\t\t\t\t\t\tres.data.list.forEach(item=>{\r\n\t\t\t\t\t\t\t\tlet obj = {\r\n\t\t\t\t\t\t\t\t\tid:item.id,\r\n\t\t\t\t\t\t\t\t\tsrc:item.cover,\r\n\t\t\t\t\t\t\t\t\ttitle:item.name,\r\n\t\t\t\t\t\t\t\t\ttime:'',\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\tnewArr.push(obj)\r\n\t\t\t\t\t\t\t})\r\n\t\t\t\t\t\t\tthis.collectionList = this.collectionList.concat(newArr);\r\n\t\t\t\t\t\t\tif(this.collectionList.length == this.total){\r\n\t\t\t\t\t\t\t\tthis.totalAll = this.total;\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t\tuni.hideLoading();\r\n\t\t\t\t\t\tthis.isLoading =true;\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t\tif(this.currentIndex == 1){\r\n\t\t\t\t\tthis.$requst.get('/api/archives/collects',params).then(res=>{\r\n\t\t\t\t\t\tif(res.code == 0){\r\n\t\t\t\t\t\t\tthis.total = res.data.total;\r\n\t\t\t\t\t\t\tlet newArr = [];\r\n\t\t\t\t\t\t\tres.data.list.forEach(item=>{\r\n\t\t\t\t\t\t\t\tlet obj = {\r\n\t\t\t\t\t\t\t\t\tid:item.id,\r\n\t\t\t\t\t\t\t\t\tsrc:item.cover,\r\n\t\t\t\t\t\t\t\t\ttitle:item.title,\r\n\t\t\t\t\t\t\t\t\ttime:this.dateFormat(item.published_at.replace(/-/g,'/')),\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\tnewArr.push(obj)\r\n\t\t\t\t\t\t\t})\r\n\t\t\t\t\t\t\tthis.collectionList = this.collectionList.concat(newArr);\r\n\t\t\t\t\t\t\tconsole.log(this.collectionList,1212121)\r\n\t\t\t\t\t\t\tif(this.collectionList.length == this.total){\r\n\t\t\t\t\t\t\t\tthis.totalAll = this.total;\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t\tuni.hideLoading();\r\n\t\t\t\t\t\tthis.isLoading =true;\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t},\r\n\t\t\t// 时间格式转换\r\n\t\t\tdateFormat (dateData) {\r\n\t\t\t    var date = new Date(dateData)\r\n\t\t\t    var y = date.getFullYear()\r\n\t\t\t    var m = date.getMonth() + 1\r\n\t\t\t    m = m < 10 ? '0' + m : m\r\n\t\t\t    var d = date.getDate()\r\n\t\t\t    d = d < 10 ? '0' + d : d\r\n\t\t\t    const time = y + '.' + m + '.' + d\r\n\t\t\t    return time\r\n\t\t\t},\r\n\t\t\t//收藏\r\n\t\t\tcollectionEv(id){\r\n\t\t\t\tconsole.log(id,12121)\r\n\t\t\t\tif(this.currentIndex == 0){\r\n\t\t\t\t\tlet params = {\r\n\t\t\t\t\t\tid:id.id,\r\n\t\t\t\t\t\taction:'collect'\r\n\t\t\t\t\t}\r\n\t\t\t\t\tthis.$requst.post('/api/spu/un-record',params).then(res=>{\r\n\t\t\t\t\t\tif(res.code==0) {\r\n\t\t\t\t\t\t\tthis.$toolAll.tools.showToast('取消收藏成功');\r\n\t\t\t\t\t\t\tthis.getCollectionList();\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t\tif(this.currentIndex == 1){\r\n\t\t\t\t\tlet params = {\r\n\t\t\t\t\t\tarchive_id:id.id,\r\n\t\t\t\t\t\taction:'collect'\r\n\t\t\t\t\t}\r\n\t\t\t\t\tthis.$requst.post('/api/archives/un-record',params).then(res=>{\r\n\t\t\t\t\t\tif(res.code==0) {\r\n\t\t\t\t\t\t\tthis.$toolAll.tools.showToast('取消收藏成功');\r\n\t\t\t\t\t\t\tthis.getCollectionList();\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t},\r\n\t\t\t//去文章详情\r\n\t\t\ttoArticleDetail(id){\r\n\t\t\t\tif(this.currentIndex == 0){\r\n\t\t\t\t\tuni.navigateTo({\r\n\t\t\t\t\t\turl:`/pagesA/shop/detail?id=${id.id}&source=shop`\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t\tif(this.currentIndex == 1){\r\n\t\t\t\t\tuni.navigateTo({\r\n\t\t\t\t\t\turl:`/pages/tabbar/news/detail?id=${id.id}`\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n</script>\r\n\r\n<style>\r\n\r\n</style>\r\n"],"sourceRoot":""}
\ No newline at end of file
+{"version":3,"sources":["uni-app:///main.js",null,"webpack:///D:/鲁班家具小程序/luban-mall/pages/tabbar/news/collection.vue?c94f","webpack:///D:/鲁班家具小程序/luban-mall/pages/tabbar/news/collection.vue?77d0","webpack:///D:/鲁班家具小程序/luban-mall/pages/tabbar/news/collection.vue?d849","uni-app:///pages/tabbar/news/collection.vue"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;kDAAA;;;AAGA;AACA,4G,8FAHA;AACAA,EAAE,CAACC,iCAAH,GAAuCC,mBAAvC,CAGAC,UAAU,CAACC,mBAAD,CAAV,C;;;;;;;;;;;;;ACLA;AAAA;AAAA;AAAA;AAAA;AAAuH;AACvH;AAC8D;AACL;;;AAGzD;AACuL;AACvL,gBAAgB,2LAAU;AAC1B,EAAE,gFAAM;AACR,EAAE,qFAAM;AACR,EAAE,8FAAe;AACjB;AACA;AACA;AACA;AACA;AACA,EAAE,yFAAU;AACZ;AACA;;AAEA;AACe,gF;;;;;;;;;;;;ACtBf;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;;;;;;;;;;;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AACA;AACA;AACA,aAAa,kLAEN;AACP,KAAK;AACL;AACA,aAAa,8LAEN;AACP;AACA;AACA,CAAC;AACD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;ACtCA;AAAA;AAAA;AAAA;AAA2sB,CAAgB,0rBAAG,EAAC,C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACqB/tB;AACA,gD,g9DAAA;eACA;AACA;AACA,wBADA;AAEA,kBAFA;AAGA,sBAHA,EADA;;AAMA,MANA,kBAMA;AACA;AACA,uGADA;AAEA,mDAFA;AAGA,0DAHA;AAIA,wBAJA,EAIA;AACA;AACA,oBADA;AAEA,oBAFA,CALA;;AASA,qBATA,EASA;AACA,aAVA,EAUA;AACA,cAXA,EAWA;AACA,cAZA,EAYA;AACA,kBAbA,EAaA;AACA,kBAdA,EAcA;AACA,yBAfA,EAeA;AACA,sBAhBA;;AAkBA,GAzBA;AA0BA;AACA;AACA,6EADA,GADA,CA1BA;;;AA+BA,QA/BA,kBA+BA,EA/BA,EA+BA;AACA;AACA;AACA;AACA,GAnCA;AAoCA,QApCA,oBAoCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OANA;AAOA,KARA,MAQA;AACA;AACA;AACA;AACA;AACA,GAlDA;AAmDA,eAnDA,yBAmDA,CAnDA,EAmDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GA1DA;AA2DA;AACA,mBA5DA,+BA4DA;AACA;AACA;AACA,gBADA;;AAGA,GAjEA;AAkEA;AACA,iBAnEA,2BAmEA,GAnEA,EAmEA;AACA;AACA;AACA,gBADA;;AAGA,GAxEA;AAyEA;AACA;AACA,YAFA,oBAEA,IAFA,EAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAjBA;AAkBA;AACA,qBAnBA,+BAmBA;AACA;AACA,uBADA;AAEA,uBAFA;;AAIA;AACA;AACA;AACA,sBADA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA,2BADA;AAEA,+BAFA;AAGA,gCAHA;AAIA,wBAJA;;AAMA;AACA,aARA;AASA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SApBA;AAqBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,2BADA;AAEA,+BAFA;AAGA,iCAHA;AAIA,2EAJA;;AAMA;AACA,aARA;AASA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SApBA;AAqBA;AACA,KA1EA;AA2EA;AACA,cA5EA,sBA4EA,QA5EA,EA4EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KArFA;AAsFA;AACA,gBAvFA,wBAuFA,EAvFA,EAuFA;AACA;AACA;AACA;AACA,mBADA;AAEA,2BAFA;;AAIA;AACA;AACA;AACA;AACA;AACA,SALA;AAMA;AACA;AACA;AACA,2BADA;AAEA,2BAFA;;AAIA;AACA;AACA;AACA;AACA;AACA,SALA;AAMA;AACA,KAjHA;AAkHA;AACA,mBAnHA,2BAmHA,EAnHA,EAmHA;AACA;AACA;AACA,sEADA;;AAGA;AACA;AACA;AACA,4DADA;;AAGA;AACA,KA9HA,EAzEA,E","file":"pages/tabbar/news/collection.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/tabbar/news/collection.vue'\ncreatePage(Page)","import { render, staticRenderFns, recyclableRender, components } from \"./collection.vue?vue&type=template&id=9606a23c&\"\nvar renderjs\nimport script from \"./collection.vue?vue&type=script&lang=js&\"\nexport * from \"./collection.vue?vue&type=script&lang=js&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  null,\n  null,\n  false,\n  components,\n  renderjs\n)\n\ncomponent.options.__file = \"pages/tabbar/news/collection.vue\"\nexport default component.exports","export * from \"-!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--16-0!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./collection.vue?vue&type=template&id=9606a23c&\"","var components\ntry {\n  components = {\n    navTab: function() {\n      return import(\n        /* webpackChunkName: \"components/nav-tab/nav-tab\" */ \"@/components/nav-tab/nav-tab.vue\"\n      )\n    },\n    pullList: function() {\n      return import(\n        /* webpackChunkName: \"components/pull-list/pull-list\" */ \"@/components/pull-list/pull-list.vue\"\n      )\n    }\n  }\n} catch (e) {\n  if (\n    e.message.indexOf(\"Cannot find module\") !== -1 &&\n    e.message.indexOf(\".vue\") !== -1\n  ) {\n    console.error(e.message)\n    console.error(\"1. 排查组件名称拼写是否正确\")\n    console.error(\n      \"2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom\"\n    )\n    console.error(\n      \"3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件\"\n    )\n  } else {\n    throw e\n  }\n}\nvar render = function() {\n  var _vm = this\n  var _h = _vm.$createElement\n  var _c = _vm._self._c || _h\n}\nvar recyclableRender = false\nvar staticRenderFns = []\nrender._withStripped = true\n\nexport { render, staticRenderFns, recyclableRender, components }","import mod from \"-!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--12-1!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./collection.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--12-1!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../HBuilderX-app开发版/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./collection.vue?vue&type=script&lang=js&\"","<template>\r\n\t<view>\r\n\t\t<status-nav :ifReturn=\"true\" navBarTitle=\"收藏\" :marginBottom=\"0\"></status-nav>\r\n\t\t<!-- 导航 -->\r\n\t\t<view class=\"nav-list-bg\" :style=\"{top:newTop+'px'}\">\r\n\t\t\t<nav-tab :list=\"navTabList\" @chooseEv=\"chooseEv\"></nav-tab>\r\n\t\t</view>\r\n\t\t<!-- 列表 -->\r\n\t\t<view class=\"news-list-bg\" v-if=\"isLoading\">\r\n\t\t\t<pull-list :list=\"collectionList\" :collection=\"1\" :isShop=\"isShop\" @toDetail=\"toArticleDetail\" @collectionEv=\"collectionEv\"></pull-list>\r\n\t\t</view>\r\n\t\t<!-- 暂无更多内容 -->\r\n\t\t<view class=\"more-txt more-txt-other\" v-if=\"total!==0 && totalAll == total\">暂无更多内容</view>\r\n\t\t<nothing-page v-if=\"total==0&&totalAll == total\" content=\"还没有相关收藏哟(*^▽^*)\"></nothing-page>\r\n\t</view>\r\n</template>\r\n\r\n<script>\r\n\timport statusNav from '@/components/status-navs/status-nav';\r\n\timport navTab from '@/components/nav-tab/nav-tab.vue';\r\n\timport pullList from '@/components/pull-list/pull-list.vue';\r\n\timport {getCartNum,userInfoEv} from '@/jsFile/public-api.js';\r\n\timport {mapState} from 'vuex'//引入mapState\r\n\texport default {\r\n\t\tcomponents:{\r\n\t\t\tstatusNav,\r\n\t\t\tnavTab,\r\n\t\t\tpullList\r\n\t\t},\r\n\t\tdata() {\r\n\t\t\treturn {\r\n\t\t\t\tscrollHeight:uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - 50,\r\n\t\t\t\tnewWidth:uni.getSystemInfoSync().windowWidth,\r\n\t\t\t\tnewTop:uni.getSystemInfoSync().statusBarHeight + 50,\r\n\t\t\t\tcollectionList:[], //解答&资讯列表\r\n\t\t\t\tnavTabList:[ //导航列表\r\n\t\t\t\t\t{name:'商品'},\r\n\t\t\t\t\t{name:'文章'},\r\n\t\t\t\t],\r\n\t\t\t\tcurrentIndex:0, //当前位置\r\n\t\t\t\tpage:1, //第几页\r\n\t\t\t\tsize:10, //查询条数\r\n\t\t\t\ttotal:0, //总数\r\n\t\t\t\ttotalAll:-1, //计算总数\r\n\t\t\t\tisShop:true, //是否商品\r\n\t\t\t\tcacheBusinessId:-1, //商户id\r\n\t\t\t\tisLoading:false,\r\n\t\t\t}\r\n\t\t},\r\n\t\tcomputed:{\r\n\t\t\t...mapState({\r\n\t\t\t\tfootHeight: state => state.moduleA.footHeight,\r\n\t\t\t}),\r\n\t\t},\r\n\t\tonLoad(op) {\r\n\t\t\tif(op.business_id){\r\n\t\t\t\tthis.cacheBusinessId = op.business_id;\r\n\t\t\t}\r\n\t\t},\r\n\t\tonShow() {\r\n\t\t\tif(this.cacheBusinessId !== -1){\r\n\t\t\t\tthis.$requst.post('/api/index/change-business',{business_id:this.cacheBusinessId}).then(res=>{\r\n\t\t\t\t\tif(res.code == 0){\r\n\t\t\t\t\t\tthis.collectionList = [];\r\n\t\t\t\t\t\tthis.getCollectionList();\r\n\t\t\t\t\t\tuserInfoEv();\r\n\t\t\t\t\t}\r\n\t\t\t\t})\r\n\t\t\t}else{\r\n\t\t\t\tthis.collectionList = [];\r\n\t\t\t\tthis.getCollectionList();\r\n\t\t\t\tuserInfoEv();\r\n\t\t\t}\r\n\t\t},\r\n\t\tonReachBottom(e) {\r\n\t\t\tif(this.collectionList.length<this.total){\r\n\t\t\t\tthis.page++;\r\n\t\t\t\tthis.getArticleList();\r\n\t\t\t}\r\n\t\t\tthis.page++;\r\n\t\t\tthis.getCollectionList();\r\n\t\t},\r\n\t\t// 分享到微信\r\n\t\tonShareAppMessage() {\r\n\t\t\tlet path = uni.getStorageSync('page-path-options')+'?business_id='+uni.getStorageSync('business_id');\r\n\t\t\treturn {\r\n\t\t\t\tpath:path\r\n\t\t\t}\r\n\t\t},\r\n\t\t// 分享到朋友圈\r\n\t\tonShareTimeline(res){\r\n\t\t\tlet path = uni.getStorageSync('page-path-options')+'?business_id='+uni.getStorageSync('business_id');\r\n\t\t\treturn {\r\n\t\t\t\tpath:path\r\n\t\t\t}\r\n\t\t},\r\n\t\tmethods: {\r\n\t\t\t// 切换事件\r\n\t\t\tchooseEv(type){\r\n\t\t\t\tif(type == 0){\r\n\t\t\t\t\tthis.isShop = true;\r\n\t\t\t\t}\r\n\t\t\t\tif(type == 1){\r\n\t\t\t\t\tthis.isShop = false;\r\n\t\t\t\t}\r\n\t\t\t\tif(this.currentIndex !== type){\r\n\t\t\t\t\tthis.total=0;\r\n\t\t\t\t\tthis.totalAll=-1;\r\n\t\t\t\t\tthis.page = 1;\r\n\t\t\t\t\tthis.currentIndex = type;\r\n\t\t\t\t\tthis.collectionList=[];\r\n\t\t\t\t\tthis.getCollectionList();\r\n\t\t\t\t}\r\n\t\t\t},\r\n\t\t\t// 获取收藏列表\r\n\t\t\tgetCollectionList(){\r\n\t\t\t\tlet params = {\r\n\t\t\t\t\tpage:this.page,\r\n\t\t\t\t\tsize:this.size\r\n\t\t\t\t}\r\n\t\t\t\tthis.isLoading =false;\r\n\t\t\t\tif(this.currentIndex == 0){\r\n\t\t\t\t\tuni.showLoading({\r\n\t\t\t\t\t\ttitle: '加载中'\r\n\t\t\t\t\t});\r\n\t\t\t\t\tthis.$requst.get('/api/spu/collection',params).then(res=>{\r\n\t\t\t\t\t\tif(res.code == 0){\r\n\t\t\t\t\t\t\tthis.total = res.data.total;\r\n\t\t\t\t\t\t\tlet newArr = [];\r\n\t\t\t\t\t\t\tres.data.list.forEach(item=>{\r\n\t\t\t\t\t\t\t\tlet obj = {\r\n\t\t\t\t\t\t\t\t\tid:item.id,\r\n\t\t\t\t\t\t\t\t\tsrc:item.cover,\r\n\t\t\t\t\t\t\t\t\ttitle:item.name,\r\n\t\t\t\t\t\t\t\t\ttime:'',\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\tnewArr.push(obj)\r\n\t\t\t\t\t\t\t})\r\n\t\t\t\t\t\t\tthis.collectionList = this.collectionList.concat(newArr);\r\n\t\t\t\t\t\t\tif(this.collectionList.length == this.total){\r\n\t\t\t\t\t\t\t\tthis.totalAll = this.total;\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t\tuni.hideLoading();\r\n\t\t\t\t\t\tthis.isLoading =true;\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t\tif(this.currentIndex == 1){\r\n\t\t\t\t\tthis.$requst.get('/api/archives/collects',params).then(res=>{\r\n\t\t\t\t\t\tif(res.code == 0){\r\n\t\t\t\t\t\t\tthis.total = res.data.total;\r\n\t\t\t\t\t\t\tlet newArr = [];\r\n\t\t\t\t\t\t\tres.data.list.forEach(item=>{\r\n\t\t\t\t\t\t\t\tlet obj = {\r\n\t\t\t\t\t\t\t\t\tid:item.id,\r\n\t\t\t\t\t\t\t\t\tsrc:item.cover,\r\n\t\t\t\t\t\t\t\t\ttitle:item.title,\r\n\t\t\t\t\t\t\t\t\ttime:this.dateFormat(item.created_at.replace(/-/g,'/')),\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\tnewArr.push(obj)\r\n\t\t\t\t\t\t\t})\r\n\t\t\t\t\t\t\tthis.collectionList = this.collectionList.concat(newArr);\r\n\t\t\t\t\t\t\tif(this.collectionList.length == this.total){\r\n\t\t\t\t\t\t\t\tthis.totalAll = this.total;\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t\tuni.hideLoading();\r\n\t\t\t\t\t\tthis.isLoading =true;\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t},\r\n\t\t\t// 时间格式转换\r\n\t\t\tdateFormat (dateData) {\r\n\t\t\t    var date = new Date(dateData)\r\n\t\t\t    var y = date.getFullYear()\r\n\t\t\t    var m = date.getMonth() + 1\r\n\t\t\t    m = m < 10 ? '0' + m : m\r\n\t\t\t    var d = date.getDate()\r\n\t\t\t    d = d < 10 ? '0' + d : d\r\n\t\t\t    const time = y + '.' + m + '.' + d\r\n\t\t\t    return time\r\n\t\t\t},\r\n\t\t\t//收藏\r\n\t\t\tcollectionEv(id){\r\n\t\t\t\tconsole.log(id,12121)\r\n\t\t\t\tif(this.currentIndex == 0){\r\n\t\t\t\t\tlet params = {\r\n\t\t\t\t\t\tid:id.id,\r\n\t\t\t\t\t\taction:'collect'\r\n\t\t\t\t\t}\r\n\t\t\t\t\tthis.$requst.post('/api/spu/un-record',params).then(res=>{\r\n\t\t\t\t\t\tif(res.code==0) {\r\n\t\t\t\t\t\t\tthis.$toolAll.tools.showToast('取消收藏成功');\r\n\t\t\t\t\t\t\tthis.getCollectionList();\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t\tif(this.currentIndex == 1){\r\n\t\t\t\t\tlet params = {\r\n\t\t\t\t\t\tarchive_id:id.id,\r\n\t\t\t\t\t\taction:'collect'\r\n\t\t\t\t\t}\r\n\t\t\t\t\tthis.$requst.post('/api/archives/un-record',params).then(res=>{\r\n\t\t\t\t\t\tif(res.code==0) {\r\n\t\t\t\t\t\t\tthis.$toolAll.tools.showToast('取消收藏成功');\r\n\t\t\t\t\t\t\tthis.getCollectionList();\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t},\r\n\t\t\t//去文章详情\r\n\t\t\ttoArticleDetail(id){\r\n\t\t\t\tif(this.currentIndex == 0){\r\n\t\t\t\t\tuni.navigateTo({\r\n\t\t\t\t\t\turl:`/pagesA/shop/detail?id=${id.id}&source=shop`\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t\tif(this.currentIndex == 1){\r\n\t\t\t\t\tuni.navigateTo({\r\n\t\t\t\t\t\turl:`/pages/tabbar/news/detail?id=${id.id}`\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n</script>\r\n\r\n<style>\r\n\r\n</style>\r\n"],"sourceRoot":""}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/common/main.wxss b/unpackage/dist/dev/mp-weixin/common/main.wxss
index 1676c3d..7c6f9b0 100644
--- a/unpackage/dist/dev/mp-weixin/common/main.wxss
+++ b/unpackage/dist/dev/mp-weixin/common/main.wxss
@@ -792,22 +792,22 @@ page {background-color: #eaeaea;}
 	z-index: 99;
 	overflow-x: auto;
 }
-.nav-list-bg::-webkit-scrollbar{
+.news-nav-bg::-webkit-scrollbar{
 	width: 0;
 	height: 0;
 	opacity: 0;
 }
-.nav-list-bg .pull-nav-btns{
+.news-nav-bg .pull-nav-btns{
 	justify-content: start !important;
 }
-.nav-list-bg .pull-nav-btns .btn{
+.news-nav-bg .pull-nav-btns .btn{
 	width: 180rpx !important;
 	margin: 0 20rpx !important;
 }
-.nav-list-bg .pull-nav-btns .btn:first-child{
+.news-nav-bg .pull-nav-btns .btn:first-child{
 	margin-left: 0 !important;
 }
-.nav-list-bg .pull-nav-btns .btn:last-child{
+.news-nav-bg .pull-nav-btns .btn:last-child{
 	margin-right: 0 !important;
 }
 .news-list-bg{
diff --git a/unpackage/dist/dev/mp-weixin/pages/tabbar/news/collection.js b/unpackage/dist/dev/mp-weixin/pages/tabbar/news/collection.js
index 8558a71..8361672 100644
--- a/unpackage/dist/dev/mp-weixin/pages/tabbar/news/collection.js
+++ b/unpackage/dist/dev/mp-weixin/pages/tabbar/news/collection.js
@@ -313,12 +313,11 @@ var _default = {
                 id: item.id,
                 src: item.cover,
                 title: item.title,
-                time: _this2.dateFormat(item.published_at.replace(/-/g, '/')) };
+                time: _this2.dateFormat(item.created_at.replace(/-/g, '/')) };
 
               newArr.push(obj);
             });
             _this2.collectionList = _this2.collectionList.concat(newArr);
-            console.log(_this2.collectionList, 1212121);
             if (_this2.collectionList.length == _this2.total) {
               _this2.totalAll = _this2.total;
             }
diff --git a/unpackage/dist/dev/mp-weixin/pages/tabbar/news/news.wxml b/unpackage/dist/dev/mp-weixin/pages/tabbar/news/news.wxml
index fd0f332..6609e2c 100644
--- a/unpackage/dist/dev/mp-weixin/pages/tabbar/news/news.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/tabbar/news/news.wxml
@@ -1 +1 @@
-<view class="pad-b150"><status-nav vue-id="08fb4b62-1" ifReturn="{{false}}" navBarTitle="资讯" marginBottom="{{0}}" bind:__l="__l"></status-nav><view class="nav-list-bg" style="{{'top:'+(newTop+'px')+';'}}"><nav-tab vue-id="08fb4b62-2" list="{{navTabList}}" maxNum="{{5}}" newWidth="{{newWidth}}" data-event-opts="{{[['^chooseEv',[['chooseEv']]]]}}" bind:chooseEv="__e" bind:__l="__l"></nav-tab></view><block wx:if="{{isLoading}}"><view class="news-list-bg"><pull-list vue-id="08fb4b62-3" list="{{articleList}}" collection="{{0}}" data-event-opts="{{[['^toDetail',[['toArticleDetail']]]]}}" bind:toDetail="__e" bind:__l="__l"></pull-list></view></block><block wx:if="{{totalAll==total}}"><view class="more-txt">暂无更多内容</view></block><enter-cart vue-id="08fb4b62-4" bind:__l="__l"></enter-cart><foot-tab vue-id="08fb4b62-5" current="3" bind:__l="__l"></foot-tab></view>
\ No newline at end of file
+<view class="pad-b150"><status-nav vue-id="08fb4b62-1" ifReturn="{{false}}" navBarTitle="资讯" marginBottom="{{0}}" bind:__l="__l"></status-nav><view class="nav-list-bg news-nav-bg" style="{{'top:'+(newTop+'px')+';'}}"><nav-tab vue-id="08fb4b62-2" list="{{navTabList}}" maxNum="{{5}}" newWidth="{{newWidth}}" data-event-opts="{{[['^chooseEv',[['chooseEv']]]]}}" bind:chooseEv="__e" bind:__l="__l"></nav-tab></view><block wx:if="{{isLoading}}"><view class="news-list-bg"><pull-list vue-id="08fb4b62-3" list="{{articleList}}" collection="{{0}}" data-event-opts="{{[['^toDetail',[['toArticleDetail']]]]}}" bind:toDetail="__e" bind:__l="__l"></pull-list></view></block><block wx:if="{{totalAll==total}}"><view class="more-txt">暂无更多内容</view></block><enter-cart vue-id="08fb4b62-4" bind:__l="__l"></enter-cart><foot-tab vue-id="08fb4b62-5" current="3" bind:__l="__l"></foot-tab></view>
\ No newline at end of file