添加商品也

App.vue

@@ -53,7 +53,7 @@
 	@import '@/static/customicons.css';
 	// 设置整个项目的背景色
 	page {
-		background-color: #f5f5f5;
+		background-color: #dddddd;
 	}
 
 	/* #endif */

components/goosList.vue

@@ -0,0 +1,146 @@
+<template>
+  <view class="list">
+    <uni-list class="uni-list--waterfall">
+      <!-- to 属性携带参数跳转详情页面，当前只为参考 -->
+      <uni-list-item
+        direction="column"
+        :border="false"
+        class="uni-list-item--waterfall"
+        title="自定义商品列表"
+        v-for="item in data"
+        :key="item._id"
+        :to="'/pages/detail/detail?id=' + item._id + '&title=' + item.name"
+      >
+        <!-- 通过header插槽定义列表左侧图片 -->
+        <template v-slot:header>
+          <view class="uni-thumb shop-picture shop-picture-column">
+            <image :src="baseurl + item.thumbnail" mode="aspectFill"></image>
+          </view>
+        </template>
+        <!-- 通过body插槽定义商品布局 -->
+        <template v-slot:body>
+          <view class="shop">
+            <view>
+              <view class="uni-title">
+                <text class="uni-ellipsis-2">{{ item.name }}</text>
+              </view>
+              <view>
+                <text class="uni-tag hot-tag">{{ item.type }}</text>
+                <!-- <text v-for="tag in item.tag" :key="tag" class="uni-tag">{{
+                  tag
+                }}</text> -->
+              </view>
+            </view>
+            <view>
+              <view class="shop-price">
+                <text>¥</text>
+                <text class="shop-price-text">{{ item.money }}</text>
+                <text>.00</text>
+              </view>
+              <!-- <view class="uni-note">{{ item.integral }}</view> -->
+              <view class="uni-note ellipsis">
+                <text class="uni-ellipsis-1">积分: {{ item.integral }}</text>
+                <text class="uni-link">详情 ></text>
+              </view>
+            </view>
+          </view>
+        </template>
+      </uni-list-item>
+    </uni-list>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    // 数据内容
+    data: { type: Array, default: () => [] },
+    name: { type: String, default: "默认title" },
+  },
+  computed: {},
+  data() {
+    return {
+      waterfall: false,
+      baseurl: "http://192.168.0.45:9002",
+    };
+  },
+  async mounted() {},
+  methods: {
+    async onClick(e) {
+      console.log(e);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/static/uni-ui.scss";
+.uni-list-item--waterfall {
+  width: 50%;
+  box-sizing: border-box;
+}
+
+.shop {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+.shop-picture {
+  width: 110px;
+  height: 110px;
+}
+
+.shop-picture-column {
+  width: 100%;
+  height: 170px;
+  margin-bottom: 10px;
+}
+
+.shop-price {
+  margin-top: 5px;
+  font-size: 12px;
+  color: #ff5a5f;
+}
+
+.shop-price-text {
+  font-size: 16px;
+}
+
+.hot-tag {
+  background: #ff5a5f;
+  border: none;
+  color: #fff;
+}
+
+.button-box {
+  height: 30px;
+  line-height: 30px;
+  font-size: 12px;
+  background: #007aff;
+  color: #fff;
+}
+
+.uni-link {
+  flex-shrink: 0;
+}
+
+.ellipsis {
+  display: flex;
+  overflow: hidden;
+}
+
+.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;
+}
+</style>

components/imgList.vue

@@ -32,7 +32,7 @@ export default {
   computed: {},
   data() {
     return {
-      baseurl: 'http://192.168.3.45:9002',
+      baseurl: 'http://192.168.0.45:9002',
     };
   },
   async mounted() {},

components/list.vue

@@ -26,7 +26,7 @@ export default {
   computed: {},
   data() {
     return {
-      baseurl: 'http://192.168.3.45:9002',
+      baseurl: 'http://192.168.0.45:9002',
     };
   },
   async mounted() {},

components/nav-bar.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="box-bg" :style="{'height': customBarH + 'px', 'padding-top': statusBarH + 'px' }">
+  <view class="box-bg" :style="{'height': customBarH + 'px' }">
     <uni-nav-bar>
         <block class="uni-picker" slot="left">
           <picker @change="bindPickerChange" :value="index" :range="array" :range-key="'name'">
@@ -83,7 +83,7 @@ $nav-height: 30px;
 
 	.box-bg {
 		background-color: #F5F5F5;
-		padding: 5px 0;
+		// padding: 5px 0;
 	}
 
 
@@ -94,7 +94,7 @@ $nav-height: 30px;
 		flex-direction: row;
 		align-items: center;
 		justify-content: flex-start;
-		// width: 160rpx;
+		width: 160rpx;
 		margin-left: 4px;
 	}
 
@@ -103,7 +103,7 @@ $nav-height: 30px;
 		display: flex;
 		/* #endif */
 		flex-direction: row;
-		// width: 500rpx;
+		width: 500rpx;
 		// flex: 1;
 		background-color: #f8f8f8;
 		height: $nav-height;
@@ -111,7 +111,7 @@ $nav-height: 30px;
 		flex-wrap: nowrap;
 		margin: 7px 0;
 		line-height: $nav-height;
-    width: 90%;
+    // width: 90%;
 	}
 
 	.input-uni-icon {

components/swiper-baner.vue

@@ -1,7 +1,7 @@
 <template>
   <swiper class="swiper" :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="time" :duration="duration">
     <swiper-item v-for="(item, index) in imgList" :key="index" @click="itemClick(item)">
-      <img class="img" :src="`http://192.168.3.45:9002${item.img}`" />
+      <img class="img" :src="`http://192.168.0.45:9002${item.img}`" />
     </swiper-item>
   </swiper>
 </template>

main.js

@@ -8,6 +8,7 @@ import NavBar from './components/nav-bar.vue'
 import baner from './components/swiper-baner.vue'
 import list from './components/list.vue'
 import imgList from './components/imgList.vue'
+import goosList from './components/goosList.vue'
 Vue.config.productionTip = false
 App.mpType = 'app'
 
@@ -15,6 +16,7 @@ Vue.component('navbar', NavBar)
 Vue.component('baner', baner)
 Vue.component('list', list)
 Vue.component('imgList', imgList)
+Vue.component('goosList', goosList)
 const app = new Vue({
   store,
   ...App

pages.json

@@ -21,14 +21,14 @@
 	],
 	// 用于设置应用的状态栏、导航条、标题、窗口背景色等。
 	"globalStyle": {
-		// "navigationBarTextStyle": "black",
-		// "navigationBarTitleText": "客户端",
-		// "navigationBarBackgroundColor": "#F8F8F8",
-		// "backgroundColor": "#F8F8F8",
-		// "app-plus": {
-		// 	"background": "#efeff4"
-		// }
-		"navigationStyle": "custom"
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "客户端",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8",
+		"app-plus": {
+			"background": "#efeff4"
+		}
+		// "navigationStyle": "custom"
 	},
 	"tabBar": {
 		// tab上的文字默认颜色

pages/journal/index.vue

@@ -47,7 +47,7 @@ export default {
   data() {
     return {
 		data: [],
-		baseurl: 'http://192.168.3.45:9002',
+		baseurl: 'http://192.168.0.45:9002',
     };
   },
   computed: {},

pages/market/index.vue

@@ -1,6 +1,15 @@
 <template>
 	<view class="container">
-    <uni-search-bar class="uni-mt-10" radius="100" placeholder="一直不显示" clearButton="none" cancelButton="none" @confirm="search" />
+    <uni-search-bar class="uni-mt-10" radius="100" placeholder="搜索" clearButton="auto" cancelButton="none" @confirm="search" />
+    <view class="iconBox">
+      <view class="box">
+        <view class="item" v-for="(item,index) in iconType" :key="index">
+          <uni-icons class="icons" :type="item.icon" size="26"></uni-icons>
+          <text>{{ item.name }}</text>
+        </view>
+      </view>
+    </view>
+    <goosList class="goos" :data="marketList"></goosList>
     <text>分类</text>
     <text>推荐</text>
     <text>悬浮购物车</text>
@@ -8,11 +17,26 @@
 </template>
 
 <script>
+  import { mapActions, mapState } from "vuex";
 	export default {
 		data() {
-			return {};
+			return {
+        iconType: [
+          { name: '会员', icon: 'vip-filled' },
+          { name: '期刊', icon: 'vip-filled' },
+          { name: '文章', icon: 'vip-filled' },
+          { name: '商品', icon: 'vip-filled' }
+        ]
+      };
+    },
+    computed: {
+      ...mapState(['marketList'])
+    },
+    async mounted() {
+      await this.marketQuery();
     },
 		methods: {
+      ...mapActions(['marketQuery']),
       search (e) {
         console.log(e);
       }
@@ -39,8 +63,34 @@
 		/* #endif */
 		padding: 0px;
 	}
-
-	.uni-mt-10 {
-    margin-top: 20px;
-	}
+  .goos /deep/ .uni-list {
+    display: flex;
+    flex-direction: row !important;
+    flex-wrap: wrap;
+    padding: 5px;
+    box-sizing: border-box;
+  }
+  .iconBox {
+    width: 100%;
+    padding:15px 0;
+    background: #fff;
+    margin-bottom: 10px;
+    .box {
+      margin: 0 auto;
+      width: 90%;
+      height: 80%;
+      display: flex;
+    }
+    .item {
+      width: 27%;
+      .icons {
+        display: block;
+      }
+      text {
+        width: 100%;
+        display: block;
+        text-align: center;
+      }
+    }
+  }
 </style>

static/uni-ui.scss

@@ -0,0 +1,119 @@
+.uni-flex {
+	display: flex;
+}
+
+.uni-flex-row {
+	@extend .uni-flex;
+	flex-direction: row;
+	box-sizing: border-box;
+}
+
+.uni-flex-column {
+	@extend .uni-flex;
+	flex-direction: column;
+}
+
+.uni-color-gary {
+	color: #3b4144;
+}
+
+/* 标题 */
+.uni-title {
+	display: flex;
+	margin-bottom: $uni-spacing-col-base;
+	font-size: $uni-font-size-lg;
+	font-weight: bold;
+	color: #3b4144;
+}
+
+.uni-title-sub {
+	display: flex;
+	// margin-bottom: $uni-spacing-col-base;
+	font-size: $uni-font-size-base;
+	font-weight: 500;
+	color: #3b4144;
+}
+
+/* 描述 额外文本 */
+.uni-note {
+	margin-top: 10px;
+	color: #999;
+	font-size: $uni-font-size-sm;
+}
+
+/* 列表内容 */
+.uni-list-box {
+	@extend .uni-flex-row;
+	flex: 1;
+	margin-top: 10px;
+}
+
+/* 略缩图 */
+.uni-thumb {
+	flex-shrink: 0;
+	margin-right: $uni-spacing-row-base;
+	width: 125px;
+	height: 75px;
+	border-radius: $uni-border-radius-lg;
+	overflow: hidden;
+	border: 1px #f5f5f5 solid;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+
+.uni-media-box {
+	@extend .uni-flex-row;
+	// margin-bottom: $uni-spacing-col-base;
+	border-radius: $uni-border-radius-lg;
+	overflow: hidden;
+	.uni-thumb {
+		margin: 0;
+		margin-left: 4px;
+		flex-shrink: 1;
+		width: 33%;
+		border-radius:0;
+		&:first-child {
+			margin: 0;
+		}
+	}
+}
+
+/* 内容 */
+.uni-content {
+	@extend .uni-flex-column;
+	justify-content: space-between;
+}
+
+/* 列表footer */
+.uni-footer {
+	@extend .uni-flex-row;
+	justify-content: space-between;
+	margin-top: $uni-spacing-col-lg;
+}
+.uni-footer-text {
+	font-size: $uni-font-size-sm;
+	color: $uni-text-color-grey;
+	margin-left: 5px;
+}
+
+/* 标签 */
+
+.uni-tag {
+	flex-shrink: 0;
+	padding: 0 5px;
+	border: 1px $uni-border-color solid;
+	margin-right: $uni-spacing-row-sm;
+	border-radius: $uni-border-radius-base;
+	background: $uni-bg-color-grey;
+	color: $uni-text-color;
+	font-size: $uni-font-size-sm;
+}
+
+/* 链接 */
+.uni-link {
+	margin-left: 10px;
+	color: $uni-text-color;
+	text-decoration: underline;
+}

store/index.js

@@ -2,18 +2,20 @@ 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 baseurl = 'http://192.168.0.45:18090';
 const api = {
   imgQuery: '/api/cms/imgnews/query',
   contentQuery: '/api/cms/contents/query',
-  intactQuery: '/api/journal/intact/query'
+  intactQuery: '/api/journal/intact/query',
+  marketQuery: '/api/market/wares/query',
 };
 
 const state = () => ({
   imgList: [],
   contentList: [],
   intactLiost: [],
-  details: {}
+  details: {},
+  marketList: []
 });
 
 const actions = {
@@ -32,6 +34,11 @@ const actions = {
     commit('intactQuery', res[1]?.data);
     return res[1]?.data.data;
   },
+  async marketQuery ({ commit }, payload) {
+    const res = await $request.get(`${baseurl}${api.marketQuery}`, payload);
+    commit('marketQuery', res[1]?.data);
+    return res[1]?.data.data;
+  },
 };
 
 const mutations = {
@@ -44,6 +51,9 @@ const mutations = {
   intactQuery(state, payload) {
     state.intactLiost = payload?.data;
   },
+  marketQuery(state, payload) {
+    state.marketList = payload?.data;
+  },
 };
 
 export default new Vuex.Store({

unpackage/dist/dev/mp-weixin/app.json

@@ -9,7 +9,10 @@
   ],
   "subPackages": [],
   "window": {
-    "navigationStyle": "custom"
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "客户端",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8"
   },
   "tabBar": {
     "color": "#000000",
@@ -65,7 +68,7 @@
     "navbar": "/components/nav-bar",
     "baner": "/components/swiper-baner",
     "list": "/components/list",
-    "img-list": "/components/imgList"
-  },
-  "sitemapLocation": "sitemap.json"
+    "img-list": "/components/imgList",
+    "goos-list": "/components/goosList"
+  }
 }

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -2354,7 +2354,7 @@
   border-color: #e9e9eb;
 }
 page {
-  background-color: #f5f5f5;
+  background-color: #dddddd;
 }
 .example-info {
   font-size: 14px;

unpackage/dist/dev/mp-weixin/components/goosList.json

@@ -0,0 +1,7 @@
+{
+  "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"
+  },
+  "component": true
+}

unpackage/dist/dev/mp-weixin/components/goosList.wxss

@@ -0,0 +1,159 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.uni-flex.data-v-22597ec5, .uni-flex-row.data-v-22597ec5, .uni-list-box.data-v-22597ec5, .uni-media-box.data-v-22597ec5, .uni-footer.data-v-22597ec5, .uni-flex-column.data-v-22597ec5, .uni-content.data-v-22597ec5 {
+  display: flex;
+}
+.uni-flex-row.data-v-22597ec5, .uni-list-box.data-v-22597ec5, .uni-media-box.data-v-22597ec5, .uni-footer.data-v-22597ec5 {
+  flex-direction: row;
+  box-sizing: border-box;
+}
+.uni-flex-column.data-v-22597ec5, .uni-content.data-v-22597ec5 {
+  flex-direction: column;
+}
+.uni-color-gary.data-v-22597ec5 {
+  color: #3b4144;
+}
+/* 标题 */
+.uni-title.data-v-22597ec5 {
+  display: flex;
+  margin-bottom: 16rpx;
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #3b4144;
+}
+.uni-title-sub.data-v-22597ec5 {
+  display: flex;
+  font-size: 28rpx;
+  font-weight: 500;
+  color: #3b4144;
+}
+/* 描述 额外文本 */
+.uni-note.data-v-22597ec5 {
+  margin-top: 10px;
+  color: #999;
+  font-size: 24rpx;
+}
+/* 列表内容 */
+.uni-list-box.data-v-22597ec5 {
+  flex: 1;
+  margin-top: 10px;
+}
+/* 略缩图 */
+.uni-thumb.data-v-22597ec5 {
+  flex-shrink: 0;
+  margin-right: 20rpx;
+  width: 125px;
+  height: 75px;
+  border-radius: 12rpx;
+  overflow: hidden;
+  border: 1px #f5f5f5 solid;
+}
+.uni-thumb image.data-v-22597ec5 {
+  width: 100%;
+  height: 100%;
+}
+.uni-media-box.data-v-22597ec5 {
+  border-radius: 12rpx;
+  overflow: hidden;
+}
+.uni-media-box .uni-thumb.data-v-22597ec5 {
+  margin: 0;
+  margin-left: 4px;
+  flex-shrink: 1;
+  width: 33%;
+  border-radius: 0;
+}
+.uni-media-box .uni-thumb.data-v-22597ec5:first-child {
+  margin: 0;
+}
+/* 内容 */
+.uni-content.data-v-22597ec5 {
+  justify-content: space-between;
+}
+/* 列表footer */
+.uni-footer.data-v-22597ec5 {
+  justify-content: space-between;
+  margin-top: 24rpx;
+}
+.uni-footer-text.data-v-22597ec5 {
+  font-size: 24rpx;
+  color: #999;
+  margin-left: 5px;
+}
+/* 标签 */
+.uni-tag.data-v-22597ec5 {
+  flex-shrink: 0;
+  padding: 0 5px;
+  border: 1px #c8c7cc solid;
+  margin-right: 10px;
+  border-radius: 6rpx;
+  background: #f8f8f8;
+  color: #333;
+  font-size: 24rpx;
+}
+/* 链接 */
+.uni-link.data-v-22597ec5 {
+  margin-left: 10px;
+  color: #333;
+  text-decoration: underline;
+}
+.uni-list-item--waterfall.data-v-22597ec5 {
+  width: 50%;
+  box-sizing: border-box;
+}
+.shop.data-v-22597ec5 {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+.shop-picture.data-v-22597ec5 {
+  width: 110px;
+  height: 110px;
+}
+.shop-picture-column.data-v-22597ec5 {
+  width: 100%;
+  height: 170px;
+  margin-bottom: 10px;
+}
+.shop-price.data-v-22597ec5 {
+  margin-top: 5px;
+  font-size: 12px;
+  color: #ff5a5f;
+}
+.shop-price-text.data-v-22597ec5 {
+  font-size: 16px;
+}
+.hot-tag.data-v-22597ec5 {
+  background: #ff5a5f;
+  border: none;
+  color: #fff;
+}
+.button-box.data-v-22597ec5 {
+  height: 30px;
+  line-height: 30px;
+  font-size: 12px;
+  background: #007aff;
+  color: #fff;
+}
+.uni-link.data-v-22597ec5 {
+  flex-shrink: 0;
+}
+.ellipsis.data-v-22597ec5 {
+  display: flex;
+  overflow: hidden;
+}
+.uni-ellipsis-1.data-v-22597ec5 {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.uni-ellipsis-2.data-v-22597ec5 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+

unpackage/dist/dev/mp-weixin/components/imgList.js

@@ -80,13 +80,13 @@ var components
 try {
   components = {
     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 */ 140))
+      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 */ 151))
     },
     uniList: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 111))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 130))
     },
     uniListItem: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 118))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 137))
     }
   }
 } catch (e) {
@@ -177,7 +177,7 @@ var _default2 =
   computed: {},
   data: function data() {
     return {
-      baseurl: 'http://192.168.3.45:9002' };
+      baseurl: 'http://192.168.0.45:9002' };
 
   },
   mounted: function mounted() {return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:case "end":return _context.stop();}}}, _callee);}))();},

unpackage/dist/dev/mp-weixin/components/list.js

@@ -80,13 +80,13 @@ var components
 try {
   components = {
     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 */ 140))
+      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 */ 151))
     },
     uniList: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 111))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 130))
     },
     uniListItem: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 118))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 137))
     }
   }
 } catch (e) {
@@ -171,7 +171,7 @@ var _default2 =
   computed: {},
   data: function data() {
     return {
-      baseurl: 'http://192.168.3.45:9002' };
+      baseurl: 'http://192.168.0.45:9002' };
 
   },
   mounted: function mounted() {return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:case "end":return _context.stop();}}}, _callee);}))();},

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 */ 125))
+      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 */ 144))
     },
     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 */ 132))
+      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 */ 111))
     },
     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 */ 140))
+      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 */ 151))
     },
     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 */ 147))
+      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 */ 158))
     }
   }
 } catch (e) {

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

@@ -3,25 +3,25 @@
 /* 水平间距 */
 .box-bg {
   background-color: #F5F5F5;
-  padding: 5px 0;
 }
 .uni-picker {
   display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: flex-start;
+  width: 160rpx;
   margin-left: 4px;
 }
 .input-view {
   display: flex;
   flex-direction: row;
+  width: 500rpx;
   background-color: #f8f8f8;
   height: 30px;
   border-radius: 15px;
   flex-wrap: nowrap;
   margin: 7px 0;
   line-height: 30px;
-  width: 90%;
 }
 .input-uni-icon {
   line-height: 30px;

unpackage/dist/dev/mp-weixin/components/swiper-baner.wxml

@@ -1 +1 @@
-<swiper class="swiper data-v-46e1a2a2" indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{time}}" duration="{{duration}}"><block wx:for="{{imgList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['itemClick',['$0'],[[['imgList','',index]]]]]]]}}" bindtap="__e" class="data-v-46e1a2a2"><image class="img _img data-v-46e1a2a2" src="{{'http://192.168.3.45:9002'+item.img}}"></image></swiper-item></block></swiper>
+<swiper class="swiper data-v-46e1a2a2" indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{time}}" duration="{{duration}}"><block wx:for="{{imgList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['itemClick',['$0'],[[['imgList','',index]]]]]]]}}" bindtap="__e" class="data-v-46e1a2a2"><image class="img _img data-v-46e1a2a2" src="{{'http://192.168.0.45:9002'+item.img}}"></image></swiper-item></block></swiper>

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

@@ -105,7 +105,7 @@ try {
       return __webpack_require__.e(/*! import() | uni_modules/uni-grid/components/uni-grid-item/uni-grid-item */ "uni_modules/uni-grid/components/uni-grid-item/uni-grid-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue */ 104))
     },
     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 */ 132))
+      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 */ 111))
     }
   }
 } catch (e) {
@@ -211,7 +211,7 @@ var _vuex = __webpack_require__(/*! vuex */ 16);function _interopRequireDefault(
   data: function data() {
     return {
       data: [],
-      baseurl: 'http://192.168.3.45:9002' };
+      baseurl: 'http://192.168.0.45:9002' };
 
   },
   computed: {},

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

@@ -94,10 +94,10 @@ var components
 try {
   components = {
     uniList: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 111))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 130))
     },
     uniListItem: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 118))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 137))
     }
   }
 } catch (e) {

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

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "uni-search-bar": "/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar"
+    "uni-search-bar": "/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
   }
 }

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

@@ -15,7 +15,34 @@
   display: block;
   padding: 0px;
 }
-.uni-mt-10 {
-  margin-top: 20px;
+.goos .uni-list {
+  display: flex;
+  flex-direction: row !important;
+  flex-wrap: wrap;
+  padding: 5px;
+  box-sizing: border-box;
+}
+.iconBox {
+  width: 100%;
+  padding: 15px 0;
+  background: #fff;
+  margin-bottom: 10px;
+}
+.iconBox .box {
+  margin: 0 auto;
+  width: 90%;
+  height: 80%;
+  display: flex;
+}
+.iconBox .item {
+  width: 27%;
+}
+.iconBox .item .icons {
+  display: block;
+}
+.iconBox .item text {
+  width: 100%;
+  display: block;
+  text-align: center;
 }
 

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

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

unpackage/dist/dev/mp-weixin/static/uni-ui.css

@@ -0,0 +1,119 @@
+.uni-flex {
+	display: flex;
+}
+
+.uni-flex-row {
+	@extend .uni-flex;
+	flex-direction: row;
+	box-sizing: border-box;
+}
+
+.uni-flex-column {
+	@extend .uni-flex;
+	flex-direction: column;
+}
+
+.uni-color-gary {
+	color: #3b4144;
+}
+
+/* 标题 */
+.uni-title {
+	display: flex;
+	margin-bottom: $uni-spacing-col-base;
+	font-size: $uni-font-size-lg;
+	font-weight: bold;
+	color: #3b4144;
+}
+
+.uni-title-sub {
+	display: flex;
+	// margin-bottom: $uni-spacing-col-base;
+	font-size: $uni-font-size-base;
+	font-weight: 500;
+	color: #3b4144;
+}
+
+/* 描述 额外文本 */
+.uni-note {
+	margin-top: 10px;
+	color: #999;
+	font-size: $uni-font-size-sm;
+}
+
+/* 列表内容 */
+.uni-list-box {
+	@extend .uni-flex-row;
+	flex: 1;
+	margin-top: 10px;
+}
+
+/* 略缩图 */
+.uni-thumb {
+	flex-shrink: 0;
+	margin-right: $uni-spacing-row-base;
+	width: 125px;
+	height: 75px;
+	border-radius: $uni-border-radius-lg;
+	overflow: hidden;
+	border: 1px #f5f5f5 solid;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+
+.uni-media-box {
+	@extend .uni-flex-row;
+	// margin-bottom: $uni-spacing-col-base;
+	border-radius: $uni-border-radius-lg;
+	overflow: hidden;
+	.uni-thumb {
+		margin: 0;
+		margin-left: 4px;
+		flex-shrink: 1;
+		width: 33%;
+		border-radius:0;
+		&:first-child {
+			margin: 0;
+		}
+	}
+}
+
+/* 内容 */
+.uni-content {
+	@extend .uni-flex-column;
+	justify-content: space-between;
+}
+
+/* 列表footer */
+.uni-footer {
+	@extend .uni-flex-row;
+	justify-content: space-between;
+	margin-top: $uni-spacing-col-lg;
+}
+.uni-footer-text {
+	font-size: $uni-font-size-sm;
+	color: $uni-text-color-grey;
+	margin-left: 5px;
+}
+
+/* 标签 */
+
+.uni-tag {
+	flex-shrink: 0;
+	padding: 0 5px;
+	border: 1px $uni-border-color solid;
+	margin-right: $uni-spacing-row-sm;
+	border-radius: $uni-border-radius-base;
+	background: $uni-bg-color-grey;
+	color: $uni-text-color;
+	font-size: $uni-font-size-sm;
+}
+
+/* 链接 */
+.uni-link {
+	margin-left: 10px;
+	color: $uni-text-color;
+	text-decoration: underline;
+}

unpackage/dist/dev/mp-weixin/static/uni-ui.scss

@@ -0,0 +1,119 @@
+.uni-flex {
+	display: flex;
+}
+
+.uni-flex-row {
+	@extend .uni-flex;
+	flex-direction: row;
+	box-sizing: border-box;
+}
+
+.uni-flex-column {
+	@extend .uni-flex;
+	flex-direction: column;
+}
+
+.uni-color-gary {
+	color: #3b4144;
+}
+
+/* 标题 */
+.uni-title {
+	display: flex;
+	margin-bottom: $uni-spacing-col-base;
+	font-size: $uni-font-size-lg;
+	font-weight: bold;
+	color: #3b4144;
+}
+
+.uni-title-sub {
+	display: flex;
+	// margin-bottom: $uni-spacing-col-base;
+	font-size: $uni-font-size-base;
+	font-weight: 500;
+	color: #3b4144;
+}
+
+/* 描述 额外文本 */
+.uni-note {
+	margin-top: 10px;
+	color: #999;
+	font-size: $uni-font-size-sm;
+}
+
+/* 列表内容 */
+.uni-list-box {
+	@extend .uni-flex-row;
+	flex: 1;
+	margin-top: 10px;
+}
+
+/* 略缩图 */
+.uni-thumb {
+	flex-shrink: 0;
+	margin-right: $uni-spacing-row-base;
+	width: 125px;
+	height: 75px;
+	border-radius: $uni-border-radius-lg;
+	overflow: hidden;
+	border: 1px #f5f5f5 solid;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+
+.uni-media-box {
+	@extend .uni-flex-row;
+	// margin-bottom: $uni-spacing-col-base;
+	border-radius: $uni-border-radius-lg;
+	overflow: hidden;
+	.uni-thumb {
+		margin: 0;
+		margin-left: 4px;
+		flex-shrink: 1;
+		width: 33%;
+		border-radius:0;
+		&:first-child {
+			margin: 0;
+		}
+	}
+}
+
+/* 内容 */
+.uni-content {
+	@extend .uni-flex-column;
+	justify-content: space-between;
+}
+
+/* 列表footer */
+.uni-footer {
+	@extend .uni-flex-row;
+	justify-content: space-between;
+	margin-top: $uni-spacing-col-lg;
+}
+.uni-footer-text {
+	font-size: $uni-font-size-sm;
+	color: $uni-text-color-grey;
+	margin-left: 5px;
+}
+
+/* 标签 */
+
+.uni-tag {
+	flex-shrink: 0;
+	padding: 0 5px;
+	border: 1px $uni-border-color solid;
+	margin-right: $uni-spacing-row-sm;
+	border-radius: $uni-border-radius-base;
+	background: $uni-bg-color-grey;
+	color: $uni-text-color;
+	font-size: $uni-font-size-sm;
+}
+
+/* 链接 */
+.uni-link {
+	margin-left: 10px;
+	color: $uni-text-color;
+	text-decoration: underline;
+}

unpackage/dist/dev/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.bak.json

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

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

@@ -1,88 +0,0 @@
-@charset "UTF-8";
-/* 水平间距 */
-/* 水平间距 */
-.flex {
-  display: flex;
-  flex-direction: row;
-}
-.uni-goods-nav {
-  display: flex;
-  flex: 1;
-  flex-direction: row;
-}
-.uni-tab__cart-box {
-  flex: 1;
-  height: 50px;
-  background-color: #fff;
-  z-index: 900;
-}
-.uni-tab__cart-sub-left {
-  padding: 0 5px;
-}
-.uni-tab__cart-sub-right {
-  flex: 1;
-}
-.uni-tab__right {
-  margin: 5px 0;
-  margin-right: 10px;
-  border-radius: 100px;
-  overflow: hidden;
-}
-.uni-tab__cart-button-left {
-  display: flex;
-  position: relative;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  margin: 0 10px;
-}
-.uni-tab__icon {
-  width: 18px;
-  height: 18px;
-}
-.image {
-  width: 18px;
-  height: 18px;
-}
-.uni-tab__text {
-  margin-top: 3px;
-  font-size: 12px;
-  color: #646566;
-}
-.uni-tab__cart-button-right {
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-  justify-content: center;
-  align-items: center;
-}
-.uni-tab__cart-button-right-text {
-  font-size: 14px;
-  color: #fff;
-}
-.uni-tab__cart-button-right:active {
-  opacity: 0.7;
-}
-.uni-tab__dot-box {
-  display: flex;
-  flex-direction: column;
-  position: absolute;
-  right: -2px;
-  top: 2px;
-  justify-content: center;
-  align-items: center;
-}
-.uni-tab__dot {
-  padding: 0 4px;
-  line-height: 15px;
-  color: #ffffff;
-  text-align: center;
-  font-size: 12px;
-  background-color: #ff0000;
-  border-radius: 15px;
-}
-.uni-tab__dots {
-  padding: 0 4px;
-  border-radius: 15px;
-}
-

vue.config.js

@@ -4,7 +4,7 @@ module.exports = {
     proxy: {
       '/api/': {
         // target: 'http://192.168.0.45:18090'
-        target: 'http://192.168.3.45:18090',
+        target: 'http://192.168.0.45:18090',
         secure: false,
         changeOrigin: true,
       }