components/swiper-baner.vue

@@ -35,11 +35,11 @@ export default {
       console.log(e, '123');
       let path;
       // 栏目
-      if (e.type == 0) path = `/pages/list/index?column=${e.column}`;
+      if (e.type == 1) path = `/pages/list/index?column=${e.column}`;
       // 单页
-      if (e.type == 1) path = `/pages/details/index?id=${e._id}`;
+      if (e.type == 2) path = `/pages/details/index?pages=${e._pages}`;
       // 链接
-      if (e.type == 2) {
+      if (e.type == 0) {
         location.href = e.url;
         return;
       }

pages/details/index.vue

@@ -7,6 +7,9 @@
 
 <script>
 	export default {
+    onLoad: function (option) { //option为object类型，会序列化上个页面传递的参数
+      console.log(option.id); //打印出上个页面传递的参数。
+    },
 		data() {
 			return {}
 		},

pages/index/index.vue

@@ -16,13 +16,4 @@
 	}
 </script>
 
-<style>
+<style></style>
-	.container {
-		font-size: 14px;
-		line-height: 24px;
-	}
-	.searchInput {
-		width: 80%;
-		margin: 0 auto;
-	}
-</style>

pages/list/index.vue

@@ -1,30 +1,38 @@
 <template>
 	<view class="container">
-    111
+    <navbar></navbar>
-    
+    <uni-list>
-    <!-- <uni-list>
+      <uni-list-item v-for="(item, index) in contentList" :key="index" :title="item.title" :note="item.describe" showArrow
-      <uni-list-item v-for="(item, index) in list" :key="index" :title="item.title" :note="item.describe" showArrow
+        :thumb="`http://192.168.3.45:9002${item.thumbnail}`"
-        :thumb="item.url"
         thumb-size="lg" rightText="详情" />
-    </uni-list> -->
+    </uni-list>
 	</view>
 </template>
 
 <script>
+  import { mapActions, mapState } from 'vuex'
 	export default {
+    onLoad: function (option) { //option为object类型，会序列化上个页面传递的参数
+      console.log(option.column); // column 类型
+      this.column = option.column;
+    },
+    computed: {
+      ...mapState(['contentList'])
+    },
 		data() {
 			return {
-        list: []
+        column: ''
       }
 		},
-		methods: {}
+    async  mounted() {
+      await this.contentQuery({ column: this.column });
+    },
+		methods: {
+      ...mapActions(['contentQuery'])
+    }
 	}
 </script>
 
 <style>
-	.container {
+	
-		padding: 20px;
-		font-size: 14px;
-		line-height: 24px;
-	}
 </style>

store/index.js

@@ -2,26 +2,37 @@ import Vue from 'vue';
 import Vuex from 'vuex';
 import $request from '../lib/request.js';
 Vue.use(Vuex);
+const baseurl = 'http://192.168.3.45:18090';
 const api = {
-  imgQuery: 'http://192.168.3.45:18090/api/cms/imgnews/query'
+  imgQuery: '/api/cms/imgnews/query',
+  contentQuery: '/api/cms/contents/query'
 };
 
 const state = () => ({
-  imgList: []
+  imgList: [],
+  contentList: []
 });
 
 const actions = {
   async imgQuery({ commit }) {
-    const res = await $request.get(api.imgQuery);
+    const res = await $request.get(`${baseurl}${api.imgQuery}`);
     commit('imgQuery', res[1].data);
     return res;
   },
+  async contentQuery({ commit }, payload) {
+    const res = await $request.get(`${baseurl}${api.contentQuery}`, payload);
+    commit('contentQuery', res[1].data);
+    return res;
+  },
 };
 
 const mutations = {
   imgQuery(state, payload) {
     state.imgList = payload.data;
   },
+  contentQuery(state, payload) {
+    state.contentList = payload.data;
+  },
 };
 
 export default new Vuex.Store({

unpackage/dist/dev/mp-weixin/components/nav-bar.js

@@ -80,16 +80,16 @@ var components
 try {
   components = {
     uniNavBar: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar */ "uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue */ 78))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar */ "uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue */ 94))
     },
     uniIcons: function() {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 85))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 101))
     },
     uniCard: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-card/components/uni-card/uni-card */ "uni_modules/uni-card/components/uni-card/uni-card").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-card/components/uni-card/uni-card.vue */ 93))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-card/components/uni-card/uni-card */ "uni_modules/uni-card/components/uni-card/uni-card").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-card/components/uni-card/uni-card.vue */ 109))
     },
     uniTag: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-tag/components/uni-tag/uni-tag */ "uni_modules/uni-tag/components/uni-tag/uni-tag").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-tag/components/uni-tag/uni-tag.vue */ 100))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-tag/components/uni-tag/uni-tag */ "uni_modules/uni-tag/components/uni-tag/uni-tag").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-tag/components/uni-tag/uni-tag.vue */ 116))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/details/index.js

@@ -139,6 +139,9 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 //
 var _default =
 {
+  onLoad: function onLoad(option) {//option为object类型，会序列化上个页面传递的参数
+    console.log(option.id); //打印出上个页面传递的参数。
+  },
   data: function data() {
     return {};
   },

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -1,10 +1,28 @@
 
-.container {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* .container {
 	font-size: 14px;
 	line-height: 24px;
-}
+} */
-.searchInput {
+/* .searchInput {
 	width: 80%;
 	margin: 0 auto;
-}
+} */
 

unpackage/dist/dev/mp-weixin/pages/list/index.json

@@ -1,3 +1,6 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
+    "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item"
+  }
 }

unpackage/dist/dev/mp-weixin/pages/list/index.wxss

@@ -1,7 +1,2 @@
 
-.container {
-	padding: 20px;
-	font-size: 14px;
-	line-height: 24px;
-}
 

unpackage/dist/dev/mp-weixin/project.config.json

@@ -31,8 +31,7 @@
       "outputPath": ""
     },
     "disableUseStrict": false,
-    "useCompilerPlugins": false,
+    "useCompilerPlugins": false
-    "minifyWXML": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.23.2",

unpackage/dist/dev/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/dev/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.wxml

@@ -0,0 +1 @@
+<view class="uni-badge--x"><slot></slot><block wx:if="{{text}}"><text data-event-opts="{{[['tap',[['onClick']]]]}}" class="{{['uni-badge',classNames]}}" style="{{$root.s0}}" bindtap="__e">{{displayValue}}</text></block></view>

unpackage/dist/dev/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.wxss

@@ -0,0 +1,74 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.uni-badge--x {
+  display: inline-block;
+  position: relative;
+}
+.uni-badge--absolute {
+  position: absolute;
+}
+.uni-badge--small {
+  -webkit-transform: scale(0.8);
+          transform: scale(0.8);
+  -webkit-transform-origin: center center;
+          transform-origin: center center;
+}
+.uni-badge {
+  display: flex;
+  overflow: hidden;
+  box-sizing: border-box;
+  justify-content: center;
+  flex-direction: row;
+  height: 20px;
+  line-height: 18px;
+  color: #fff;
+  border-radius: 100px;
+  background-color: #8f939c;
+  background-color: transparent;
+  border: 1px solid #fff;
+  text-align: center;
+  font-family: 'Helvetica Neue', Helvetica, sans-serif;
+  font-size: 12px;
+}
+.uni-badge--info {
+  color: #fff;
+  background-color: #8f939c;
+}
+.uni-badge--primary {
+  background-color: #2979ff;
+}
+.uni-badge--success {
+  background-color: #18bc37;
+}
+.uni-badge--warning {
+  background-color: #f3a73f;
+}
+.uni-badge--error {
+  background-color: #e43d33;
+}
+.uni-badge--inverted {
+  padding: 0 5px 0 0;
+  color: #8f939c;
+}
+.uni-badge--info-inverted {
+  color: #8f939c;
+  background-color: transparent;
+}
+.uni-badge--primary-inverted {
+  color: #2979ff;
+  background-color: transparent;
+}
+.uni-badge--success-inverted {
+  color: #18bc37;
+  background-color: transparent;
+}
+.uni-badge--warning-inverted {
+  color: #f3a73f;
+  background-color: transparent;
+}
+.uni-badge--error-inverted {
+  color: #e43d33;
+  background-color: transparent;
+}
+

unpackage/dist/dev/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "uni-badge": "/uni_modules/uni-badge/components/uni-badge/uni-badge"
+  },
+  "component": true
+}

unpackage/dist/dev/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.wxss

@@ -0,0 +1,134 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.uni-list-item {
+  display: flex;
+  font-size: 16px;
+  position: relative;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  flex-direction: row;
+}
+.uni-list-item--disabled {
+  opacity: 0.3;
+}
+.uni-list-item--hover {
+  background-color: #f1f1f1;
+}
+.uni-list-item__container {
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  padding: 12px 15px;
+  padding-left: 15px;
+  flex: 1;
+  overflow: hidden;
+}
+.container--right {
+  padding-right: 0;
+}
+.uni-list--border {
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+}
+.uni-list--border:after {
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  height: 1px;
+  content: '';
+  -webkit-transform: scaleY(0.5);
+  transform: scaleY(0.5);
+  background-color: #e5e5e5;
+}
+.uni-list-item__content {
+  display: flex;
+  padding-right: 8px;
+  flex: 1;
+  color: #3b4144;
+  flex-direction: column;
+  justify-content: space-between;
+  overflow: hidden;
+}
+.uni-list-item__content--center {
+  justify-content: center;
+}
+.uni-list-item__content-title {
+  font-size: 14px;
+  color: #3b4144;
+  overflow: hidden;
+}
+.uni-list-item__content-note {
+  margin-top: 6rpx;
+  color: #999;
+  font-size: 12px;
+  overflow: hidden;
+}
+.uni-list-item__extra {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+  align-items: center;
+}
+.uni-list-item__header {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.uni-list-item__icon {
+  margin-right: 18rpx;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+}
+.uni-list-item__icon-img {
+  display: block;
+  height: 26px;
+  width: 26px;
+  margin-right: 10px;
+}
+.uni-icon-wrapper {
+  display: flex;
+  align-items: center;
+  padding: 0 10px;
+}
+.flex--direction {
+  flex-direction: column;
+  align-items: initial;
+}
+.flex--justify {
+  justify-content: initial;
+}
+.uni-list--lg {
+  height: 40px;
+  width: 40px;
+}
+.uni-list--base {
+  height: 26px;
+  width: 26px;
+}
+.uni-list--sm {
+  height: 20px;
+  width: 20px;
+}
+.uni-list-item__extra-text {
+  color: #999;
+  font-size: 12px;
+}
+.uni-ellipsis-1 {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.uni-ellipsis-2 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+

unpackage/dist/dev/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/dev/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.wxml

@@ -0,0 +1 @@
+<view class="uni-list uni-border-top-bottom"><block wx:if="{{border}}"><view class="uni-list--border-top"></view></block><slot></slot><block wx:if="{{border}}"><view class="uni-list--border-bottom"></view></block></view>

unpackage/dist/dev/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.wxss

@@ -0,0 +1,35 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.uni-list {
+  display: flex;
+  background-color: #ffffff;
+  position: relative;
+  flex-direction: column;
+}
+.uni-list--border {
+  position: relative;
+  z-index: -1;
+}
+.uni-list--border-top {
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  height: 1px;
+  -webkit-transform: scaleY(0.5);
+  transform: scaleY(0.5);
+  background-color: #e5e5e5;
+  z-index: 1;
+}
+.uni-list--border-bottom {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  left: 0;
+  height: 1px;
+  -webkit-transform: scaleY(0.5);
+  transform: scaleY(0.5);
+  background-color: #e5e5e5;
+}
+