asd123a20 2 years ago
parent
commit
058592005f
54 changed files with 1296 additions and 242 deletions
  1. 70 10
      pages/journal/index.vue
  2. 31 10
      pages/market/index.vue
  3. 2 2
      store/index.js
  4. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  5. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  6. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  7. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/imgList.js.map
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/list.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/nav-bar.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/swiper-baner.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/details/index.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/journal/index.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/market/index.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-card/components/uni-card/uni-card.js.map
  17. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid/uni-grid.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-group/components/uni-group/uni-group.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-tag/components/uni-tag/uni-tag.js.map
  28. 2 2
      unpackage/dist/dev/mp-weixin/common/runtime.js
  29. 128 77
      unpackage/dist/dev/mp-weixin/common/vendor.js
  30. 2 2
      unpackage/dist/dev/mp-weixin/components/imgList.js
  31. 2 2
      unpackage/dist/dev/mp-weixin/components/list.js
  32. 2 2
      unpackage/dist/dev/mp-weixin/components/nav-bar.js
  33. 33 27
      unpackage/dist/dev/mp-weixin/pages/journal/index.js
  34. 2 1
      unpackage/dist/dev/mp-weixin/pages/journal/index.json
  35. 1 1
      unpackage/dist/dev/mp-weixin/pages/journal/index.wxml
  36. 43 2
      unpackage/dist/dev/mp-weixin/pages/journal/index.wxss
  37. 2 2
      unpackage/dist/dev/mp-weixin/pages/list/index.js
  38. 40 12
      unpackage/dist/dev/mp-weixin/pages/market/index.js
  39. 3 1
      unpackage/dist/dev/mp-weixin/pages/market/index.json
  40. 1 1
      unpackage/dist/dev/mp-weixin/pages/market/index.wxml
  41. 19 5
      unpackage/dist/dev/mp-weixin/pages/market/index.wxss
  42. 2 1
      unpackage/dist/dev/mp-weixin/project.config.json
  43. 6 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.bak.json
  44. 280 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js
  45. 1 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.wxml
  46. 88 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.wxss
  47. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js
  48. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.js
  49. 14 14
      unpackage/dist/dev/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.js
  50. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.js
  51. 395 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js
  52. 6 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.json
  53. 1 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.wxml
  54. 51 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.wxss

+ 70 - 10
pages/journal/index.vue

@@ -4,33 +4,36 @@
     <baner></baner>
     <!-- 管理智慧 -->
     <uni-group title="管理智慧" margin-top="20">
-      <uni-grid :column="data.length" :highlight="true" @change="change">
+      <uni-grid :column="3" :highlight="true" @change="change">
         <uni-grid-item v-for="(item, index) in data" :index="index" :key="index">
           <view class="grid-item-box" style="background-color: #fff; height: 100%">
-            <image style="width: 100%; height: 100%;" :mode="scaleToFill" :src="baseurl + item.thumbnail"></image>
-            <!-- <text class="text">文本信息</text> -->
+            <image v-if="item.thumbnail" style="width: 100%; height: 100%;" mode="scaleToFill" :src="baseurl + item.thumbnail"></image>
+            <uni-icons v-else type="image" :size="30" color="#777" />
+            <text class="text">{{ item.name }}</text>
           </view>
         </uni-grid-item>
       </uni-grid>
     </uni-group>
     <!-- 财富生活 -->
     <uni-group title="财富生活" margin-top="20">
-      <uni-grid :column="data.length" :highlight="true" @change="change">
+      <uni-grid :column="3" :highlight="true" @change="change">
         <uni-grid-item v-for="(item, index) in data" :index="index" :key="index">
           <view class="grid-item-box" style="background-color: #fff; height: 100%">
-            <image style="width: 100%; height: 100%;" :mode="scaleToFill" :src="baseurl + item.thumbnail"></image>
-            <!-- <text class="text">文本信息</text> -->
+            <image v-if="item.thumbnail" style="width: 100%; height: 100%;" mode="scaleToFill" :src="baseurl + item.thumbnail"></image>
+            <uni-icons v-else type="image" :size="30" color="#777" />
+            <text class="text">{{ item.name }}</text>
           </view>
         </uni-grid-item>
       </uni-grid>
     </uni-group>
     <!-- 才智青年 -->
     <uni-group title="才智青年" margin-top="20">
-      <uni-grid :column="data.length" :highlight="true" @change="change">
+      <uni-grid :column="3" :highlight="true" @change="change">
         <uni-grid-item v-for="(item, index) in data" :index="index" :key="index">
           <view class="grid-item-box" style="background-color: #fff; height: 100%">
-            <image style="width: 100%; height: 100%;" :mode="scaleToFill" :src="baseurl + item.thumbnail"></image>
-            <!-- <text class="text">文本信息</text> -->
+            <image v-if="item.thumbnail" style="width: 100%; height: 100%;" mode="scaleToFill" :src="baseurl + item.thumbnail"></image>
+            <uni-icons v-else type="image" :size="30" color="#777" />
+            <text class="text">{{ item.name }}</text>
           </view>
         </uni-grid-item>
       </uni-grid>
@@ -57,10 +60,67 @@ export default {
 };
 </script>
 
-<style>
+<style lang="scss" scoped>
 .container {
   width: 100%;
   margin: 0;
   padding: 0;
 }
+.image {
+		width: 25px;
+		height: 25px;
+	}
+
+	.text {
+		font-size: 14px;
+		margin-top: 5px;
+	}
+
+	.example-body {
+		/* #ifndef APP-NVUE */
+		// display: block;
+		/* #endif */
+	}
+
+	.grid-dynamic-box {
+		margin-bottom: 15px;
+	}
+
+	.grid-item-box {
+		flex: 1;
+		// position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 15px 0;
+	}
+
+	.grid-item-box-row {
+		flex: 1;
+		// position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 15px 0;
+	}
+
+	.grid-dot {
+		position: absolute;
+		top: 5px;
+		right: 15px;
+	}
+
+	.swiper {
+		height: 420px;
+	}
+  .more {
+    width: 100%;
+    text-align: center;
+  }
 </style>

+ 31 - 10
pages/market/index.vue

@@ -1,25 +1,46 @@
 <template>
 	<view class="container">
-		<view class="intro">商城</view>
-		<text class="intro">详见:商城</text>
+    <uni-search-bar class="uni-mt-10" radius="100" placeholder="一直不显示" clearButton="none" cancelButton="none" @confirm="search" />
+    <text>分类</text>
+    <text>推荐</text>
+    <text>悬浮购物车</text>
 	</view>
 </template>
 
 <script>
 	export default {
 		data() {
-			return {}
-		},
+			return {};
+    },
 		methods: {
-
-		}
+      search (e) {
+        console.log(e);
+      }
+    }
 	}
 </script>
 
-<style>
-	.container {
-		padding: 20px;
+<style lang="scss" scope>
+	.search-result {
+		padding-top: 10px;
+		padding-bottom: 20px;
+		text-align: center;
+	}
+
+	.search-result-text {
+		text-align: center;
 		font-size: 14px;
-		line-height: 24px;
+		color:#666;
+	}
+
+	.example-body {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		padding: 0px;
+	}
+
+	.uni-mt-10 {
+    margin-top: 20px;
 	}
 </style>

+ 2 - 2
store/index.js

@@ -41,8 +41,8 @@ const mutations = {
   contentQuery(state, payload) {
     state.contentList = payload?.data;
   },
-  contentQuery(state, payload) {
-    state.contentList = payload?.data;
+  intactQuery(state, payload) {
+    state.intactLiost = payload?.data;
   },
 };
 

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/imgList.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/list.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/nav-bar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/swiper-baner.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/details/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/journal/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/market/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-card/components/uni-card/uni-card.js.map


File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid/uni-grid.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-group/components/uni-group/uni-group.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-tag/components/uni-tag/uni-tag.js.map


File diff suppressed because it is too large
+ 2 - 2
unpackage/dist/dev/mp-weixin/common/runtime.js


File diff suppressed because it is too large
+ 128 - 77
unpackage/dist/dev/mp-weixin/common/vendor.js


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

@@ -83,10 +83,10 @@ try {
       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))
     },
     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 */ 119))
+      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))
     },
     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 */ 126))
+      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))
     }
   }
 } catch (e) {

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

@@ -83,10 +83,10 @@ try {
       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))
     },
     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 */ 119))
+      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))
     },
     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 */ 126))
+      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))
     }
   }
 } catch (e) {

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

@@ -80,10 +80,10 @@ 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 */ 133))
+      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))
     },
     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 */ 111))
+      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))
     },
     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))

File diff suppressed because it is too large
+ 33 - 27
unpackage/dist/dev/mp-weixin/pages/journal/index.js


+ 2 - 1
unpackage/dist/dev/mp-weixin/pages/journal/index.json

@@ -2,6 +2,7 @@
   "usingComponents": {
     "uni-group": "/uni_modules/uni-group/components/uni-group/uni-group",
     "uni-grid": "/uni_modules/uni-grid/components/uni-grid/uni-grid",
-    "uni-grid-item": "/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item"
+    "uni-grid-item": "/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
   }
 }

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/journal/index.wxml


+ 43 - 2
unpackage/dist/dev/mp-weixin/pages/journal/index.wxss

@@ -1,7 +1,48 @@
-
-.container {
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.container.data-v-b879b15e {
   width: 100%;
   margin: 0;
   padding: 0;
 }
+.image.data-v-b879b15e {
+  width: 25px;
+  height: 25px;
+}
+.text.data-v-b879b15e {
+  font-size: 14px;
+  margin-top: 5px;
+}
+.grid-dynamic-box.data-v-b879b15e {
+  margin-bottom: 15px;
+}
+.grid-item-box.data-v-b879b15e {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 15px 0;
+}
+.grid-item-box-row.data-v-b879b15e {
+  flex: 1;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  padding: 15px 0;
+}
+.grid-dot.data-v-b879b15e {
+  position: absolute;
+  top: 5px;
+  right: 15px;
+}
+.swiper.data-v-b879b15e {
+  height: 420px;
+}
+.more.data-v-b879b15e {
+  width: 100%;
+  text-align: center;
+}
 

+ 2 - 2
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 */ 119))
+      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))
     },
     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 */ 126))
+      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))
     }
   }
 } catch (e) {

File diff suppressed because it is too large
+ 40 - 12
unpackage/dist/dev/mp-weixin/pages/market/index.js


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

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

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/market/index.wxml

@@ -1 +1 @@
-<view class="container"><view class="intro">商城</view><text class="intro">详见:商城</text></view>
+<view class="container"><uni-search-bar class="uni-mt-10" vue-id="3ac8154e-1" radius="100" placeholder="一直不显示" clearButton="none" cancelButton="none" data-event-opts="{{[['^confirm',[['search']]]]}}" bind:confirm="__e" bind:__l="__l"></uni-search-bar><text>分类</text><text>推荐</text><text>悬浮购物车</text></view>

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

@@ -1,7 +1,21 @@
-
-.container {
-	padding: 20px;
-	font-size: 14px;
-	line-height: 24px;
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.search-result {
+  padding-top: 10px;
+  padding-bottom: 20px;
+  text-align: center;
+}
+.search-result-text {
+  text-align: center;
+  font-size: 14px;
+  color: #666;
+}
+.example-body {
+  display: block;
+  padding: 0px;
+}
+.uni-mt-10 {
+  margin-top: 20px;
 }
 

+ 2 - 1
unpackage/dist/dev/mp-weixin/project.config.json

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

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

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

File diff suppressed because it is too large
+ 280 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js


File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.wxml


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

@@ -0,0 +1,88 @@
+@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;
+}
+

File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.js


File diff suppressed because it is too large
+ 395 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js


+ 6 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.json

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

File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.wxml


+ 51 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.wxss

@@ -0,0 +1,51 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.uni-searchbar {
+  display: flex;
+  flex-direction: row;
+  position: relative;
+  padding: 10px;
+}
+.uni-searchbar__box {
+  display: flex;
+  box-sizing: border-box;
+  overflow: hidden;
+  position: relative;
+  flex: 1;
+  justify-content: center;
+  flex-direction: row;
+  align-items: center;
+  height: 36px;
+  padding: 5px 8px 5px 0px;
+}
+.uni-searchbar__box-icon-search {
+  display: flex;
+  flex-direction: row;
+  padding: 0 8px;
+  justify-content: center;
+  align-items: center;
+  color: #B3B3B3;
+}
+.uni-searchbar__box-search-input {
+  flex: 1;
+  font-size: 14px;
+  color: #333;
+}
+.uni-searchbar__box-icon-clear {
+  align-items: center;
+  line-height: 24px;
+  padding-left: 8px;
+}
+.uni-searchbar__text-placeholder {
+  font-size: 14px;
+  color: #B3B3B3;
+  margin-left: 5px;
+}
+.uni-searchbar__cancel {
+  padding-left: 10px;
+  line-height: 36px;
+  font-size: 14px;
+  color: #333333;
+}
+