From 824df64b1911e846ec59d029aeb50ce70583ad8f Mon Sep 17 00:00:00 2001
From: yangjie <812952667@qq.com>
Date: Tue, 8 Jun 2021 19:51:04 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=20=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/share.js                          |  35 ++++
 components/zc-grid-item/zc-grid-item.vue | 145 ++++++++++++++
 components/zc-grid-wrap/zc-grid-wrap.vue | 129 ++++++++++++
 components/zc-grid/zc-grid.vue           | 205 ++++++++++++++++++++
 main.js                                  |   7 +-
 pages.json                               |  67 +++++--
 pages/tabBar/home/home.vue               | 237 ++++++++++++++++-------
 static/img/headzq.png                    | Bin 0 -> 4090 bytes
 uni.scss                                 |   6 +-
 9 files changed, 735 insertions(+), 96 deletions(-)
 create mode 100644 common/share.js
 create mode 100644 components/zc-grid-item/zc-grid-item.vue
 create mode 100644 components/zc-grid-wrap/zc-grid-wrap.vue
 create mode 100644 components/zc-grid/zc-grid.vue
 create mode 100644 static/img/headzq.png

diff --git a/common/share.js b/common/share.js
new file mode 100644
index 0000000..5a1e159
--- /dev/null
+++ b/common/share.js
@@ -0,0 +1,35 @@
+export default{
+    data(){
+        return {
+           //设置默认的分享参数
+           //如果页面不设置share，就触发这个默认的分享
+            share:{
+                title:'嗨森逛',
+                path:'/pages/tabBar/home/home',
+                imageUrl:'',
+                desc:'',
+                content:''
+            }
+        }
+    },
+    onShareAppMessage(res) {
+        return {
+            title:this.share.title,
+            path:this.share.path,
+            imageUrl:this.share.imageUrl,
+            desc:this.share.desc,
+            content:this.share.content,
+            success(res){
+                uni.showToast({
+                    title:'分享成功'
+                })
+            },
+            fail(res){
+                uni.showToast({
+                    title:'分享失败',
+                    icon:'none'
+                })
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/components/zc-grid-item/zc-grid-item.vue b/components/zc-grid-item/zc-grid-item.vue
new file mode 100644
index 0000000..1180be7
--- /dev/null
+++ b/components/zc-grid-item/zc-grid-item.vue
@@ -0,0 +1,145 @@
+<template>
+	<view v-if="width" class="uni-grid-item">
+		<view :class="{ 'uni-grid-item--border': showBorder, 'uni-grid-item__box-square': square, 'uni-grid-item--border-top': showBorder && index < column, 'uni-highlight': highlight }"
+		 :style="{  'border-right-color': borderColor ,'border-bottom-color': borderColor ,'border-top-color': borderColor }"
+		 class="uni-grid-item__box" @click="_onClick">
+			<view class="uni-grid-item__box-item" :class="{'uni-grid-item__box-item-square': square}">
+				<slot />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'UniGridItem',
+		inject: ['grid'],
+		data() {
+			return {
+				column: 0,
+				showBorder: true,
+				square: true,
+				highlight: true,
+				left: 0,
+				top: 0,
+				index: 0,
+				openNum: 2,
+				width: 0,
+				borderColor: '#e5e5e5'
+			}
+		},
+		created() {
+			this.column = this.grid.column
+			this.showBorder = this.grid.showBorder
+			this.square = this.grid.square
+			this.highlight = this.grid.highlight
+			this.top = this.hor === 0 ? this.grid.hor : this.hor
+			this.left = this.ver === 0 ? this.grid.ver : this.ver
+			this.borderColor = this.grid.borderColor
+			this.index = this.grid.index++
+			this.grid.children.push(this)
+		},
+		methods: {
+			_onClick() {
+				// console.log('点击', this.index);
+				this.grid.change({
+					detail: {
+						index: this.index
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.uni-grid-item {
+		/* #ifndef APP-NVUE */
+		height: 100%;
+		/* #endif */
+		width: 168rpx;
+	}
+
+	.uni-grid-item__box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		position: relative;
+		flex-direction: row;
+		align-items: center;
+/* 		margin-top: 9rpx;
+		margin-right: 17rpx;
+		margin-bottom: 9rpx;
+		margin-left: 17rpx; */
+		/* #ifdef APP-NVUE */
+		justify-content: center;
+
+		/* #endif */
+	}
+
+	.uni-grid-item__box-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		width: 100%;
+		/* #endif */
+		position: relative;
+		flex: 1;
+		justify-content: center;
+		flex-direction: column;
+		align-items: center;
+		width: 152rpx;
+		height: 146rpx;
+/* 		padding-top: 10rpx;
+		padding-right: 23rpx;
+		padding-bottom: 10rpx;
+		padding-left: 23rpx; */
+		border-radius: 1rpx;
+		/* padding: 15px 0; */
+	}
+
+	.uni-grid-item__box-item-square {
+		position: absolute;
+		top: 0;
+		bottom: 0;
+	}
+
+	.uni-grid-item--image {
+		width: 25px;
+		height: 25px;
+	}
+
+	.uni-grid-item--text {
+		font-size: 24px;
+		margin-top: 5px;
+	}
+
+	.uni-grid-item__box-square {
+		height: 0;
+		padding-top: 100%;
+	}
+
+	.uni-grid-item--border {
+		position: relative;
+		border-bottom-color: #e5e5e5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+		border-right-color: #e5e5e5;
+		border-right-style: solid;
+		border-right-width: 1px;
+	}
+
+	.uni-grid-item--border-top {
+		border-top-color: #e5e5e5;
+		border-top-style: solid;
+		border-top-width: 1px;
+		/* #ifndef APP-NVUE */
+		height: 100%;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.uni-highlight:active {
+		background-color: #f1f1f1;
+	}
+</style>
diff --git a/components/zc-grid-wrap/zc-grid-wrap.vue b/components/zc-grid-wrap/zc-grid-wrap.vue
new file mode 100644
index 0000000..39dd864
--- /dev/null
+++ b/components/zc-grid-wrap/zc-grid-wrap.vue
@@ -0,0 +1,129 @@
+<template>
+	<view class="uni-grid-wrap">
+		<view :id="elId" ref="uni-grid" class="uni-grid" :class="{ 'uni-grid--border': showBorder }" :style="{ 'border-left-style':'solid','border-left-color':borderColor, 'border-left-width':showBorder?'1px':0 }">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = weex.requireModule('dom');
+	// #endif
+	export default {
+		name: 'UniGrid',
+		props: {
+			// 每列显示个数
+			column: {
+				type: Number,
+				default: 3
+			},
+			// 是否显示边框
+			showBorder: {
+				type: Boolean,
+				default: true
+			},
+			// 边框颜色
+			borderColor: {
+				type: String,
+				default: '#e5e5e5'
+			},
+			// 全局标记水平方向移动距离 ，起点为中心，负数为左移动，正数为右移动
+			hor: {
+				type: Number,
+				default: 0
+			},
+			// 全局标记垂直方向移动距离 ，起点为中心，负数为上移动，正数为下移动
+			ver: {
+				type: Number,
+				default: 0
+			},
+			// 是否正方形显示,默认为 true
+			square: {
+				type: Boolean,
+				default: true
+			},
+			highlight: {
+				type: Boolean,
+				default: true
+			}
+		},
+		provide() {
+			return {
+				grid: this
+			}
+		},
+		data() {
+			const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			return {
+				index: 0,
+				elId,
+				width: 0
+			}
+		},
+		created() {
+			this.children = []
+			this.index = 0
+		},
+		mounted() {
+			setTimeout(() => {
+				this._getSize((width) => {
+					this.children.forEach((item, index) => {
+						item.width = width
+					})
+				})
+			}, 50)
+		},
+		methods: {
+			change(e) {
+				this.$emit('change', e)
+			},
+			_getSize(fn) {
+				// #ifndef APP-NVUE
+				uni.createSelectorQuery()
+					.in(this)
+					.select(`#${this.elId}`)
+					.boundingClientRect()
+					.exec(ret => {
+						this.width = parseInt(ret[0].width / this.column) - 1 + 'px'
+						fn(this.width)
+					})
+				// #endif
+				// #ifdef APP-NVUE
+				dom.getComponentRect(this.$refs['uni-grid'], (ret) => {
+					this.width = parseInt(ret.size.width / this.column) - 1 + 'px'
+					fn(this.width)
+				})
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.uni-grid-wrap {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: column;
+		/* #ifdef H5 */
+		width: 100%;
+		/* #endif */
+	}
+
+	.uni-grid {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		flex-wrap: wrap;
+	}
+
+	.uni-grid--border {
+		border-left-color: #e5e5e5;
+		border-left-style: solid;
+		border-left-width: 1px;
+	}
+</style>
\ No newline at end of file
diff --git a/components/zc-grid/zc-grid.vue b/components/zc-grid/zc-grid.vue
new file mode 100644
index 0000000..74e6100
--- /dev/null
+++ b/components/zc-grid/zc-grid.vue
@@ -0,0 +1,205 @@
+<template>
+	<view class="warp">
+		<view class="example-body">
+			<uni-grid  :show-border="false" :square="false" :highlight="false" @change="change">
+				<uni-grid-item :hor="0" :ver="0" marker="badge" type="error" style="width: 25%;text-align: center;" text="12" v-for="item in list" :key="item.id">
+					<image class="image" :src="item.url" mode="aspectFill" @click="webTo" />
+					<text class="text">{{item.text}}</text>
+				</uni-grid-item>
+			</uni-grid>
+		</view>
+	</view>
+</template>
+
+<script>
+	import uniGrid from '@/components/zc-grid-wrap/zc-grid-wrap.vue'
+	import uniGridItem from '@/components/zc-grid-item/zc-grid-item.vue'
+	export default {
+		components: {
+			uniGrid,
+			uniGridItem
+		},
+		props:{
+			list:{
+				type:Array,
+				default:function () {
+					return []
+				}
+			}
+		},
+		data() {
+			return {
+				// list: [{
+				// 		url: 'https://img-cdn-qiniu.dcloud.net.cn/uniapp/images/cbd.jpg',
+				// 		text: 'Grid 1'
+				// 	},
+				// 	{
+				// 		url: 'https://img-cdn-qiniu.dcloud.net.cn/uniapp/images/muwu.jpg',
+				// 		text: 'Grid 2'
+				// 	},
+				// 	{
+				// 		url: 'https://img-cdn-qiniu.dcloud.net.cn/uniapp/images/cbd.jpg',
+				// 		text: 'Grid 3'
+				// 	},
+				// 	{
+				// 		url: 'https://img-cdn-qiniu.dcloud.net.cn/uniapp/images/muwu.jpg',
+				// 		text: 'Grid 4'
+				// 	},
+				// 	{
+				// 		url: 'https://img-cdn-qiniu.dcloud.net.cn/uniapp/images/cbd.jpg',
+				// 		text: 'Grid 5'
+				// 	},
+				// 	{
+				// 		url: 'https://img-cdn-qiniu.dcloud.net.cn/uniapp/images/muwu.jpg',
+				// 		text: 'Grid 6'
+				// 	},
+				// 	{
+				// 		url: 'https://img-cdn-qiniu.dcloud.net.cn/uniapp/images/cbd.jpg',
+				// 		text: 'Grid 7'
+				// 	},
+				// 	{
+				// 		url: 'https://img-cdn-qiniu.dcloud.net.cn/uniapp/images/muwu.jpg',
+				// 		text: 'Grid 8'
+				// 	},
+				// 	{
+				// 		url: 'https://img-cdn-qiniu.dcloud.net.cn/uniapp/images/cbd.jpg',
+				// 		text: 'Grid 9'
+				// 	}
+				// ]
+			}
+		},
+		methods: {
+			change(e) {
+				let {
+					index
+				} = e.detail
+				console.log(index)
+			},
+			webTo() {
+				this.$emit('goTo')
+			}
+		}
+	}
+</script>
+
+<style>
+	/* 头条小程序组件内不能引入字体 */
+	/* #ifdef MP-TOUTIAO */
+	@font-face {
+		font-family: uniicons;
+		font-weight: normal;
+		font-style: normal;
+		src: url('~@/static/uni.ttf') format('truetype');
+	}
+
+	/* #endif */
+
+	/* #ifndef APP-NVUE */
+	page {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		background-color: #efeff4;
+		min-height: 100%;
+		height: auto;
+	}
+
+	view {
+		font-size: 28rpx;
+		line-height: inherit;
+	}
+
+	.example {
+		padding: 0 30rpx 30rpx;
+	}
+
+	.example-info {
+		padding: 30rpx;
+		color: #3b4144;
+		background: #ffffff;
+	}
+
+	.example-body {
+		text-align: center;
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: center;
+		padding: 0;
+		font-size: 14rpx;
+		background-color: #ffffff;
+	}
+
+	/* #endif */
+	.example {
+		padding: 0 30rpx;
+	}
+
+	.example-info {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		padding: 30rpx;
+		color: #3b4144;
+		background-color: #ffffff;
+		font-size: 30rpx;
+	}
+
+	.example-info-text {
+		font-size: 28rpx;
+		line-height: 36rpx;
+	}
+
+
+	.example-body {
+		flex-direction: column;
+		padding: 0rpx;
+		padding-bottom: 10px;
+		background-color: #ffffff;
+	}
+
+	.word-btn-white {
+		font-size: 18px;
+		color: #FFFFFF;
+	}
+
+	.word-btn {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		border-radius: 6px;
+		height: 48px;
+		margin: 15px;
+		background-color: #007AFF;
+	}
+
+	.word-btn--hover {
+		background-color: #4ca2ff;
+	}
+
+
+	.image {
+		width: 80rpx;
+		height: 80rpx;
+		margin-bottom: 20rpx;
+		border-radius: 10rpx;
+	}
+
+	.text {
+		font-size: 26rpx;
+		line-height: 26rpx;
+		width: 104rpx;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		color: #3A3C40;
+	}
+
+	.example-body {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+	}
+</style>
diff --git a/main.js b/main.js
index d090f90..5266c88 100644
--- a/main.js
+++ b/main.js
@@ -1,12 +1,13 @@
 import Vue from 'vue'
 import App from './App'
-// import api from './Utils/Api.js'
 import {VueJsonp} from 'vue-jsonp'
+import share from 'common/share.js'
+import imgGrid from './components/zc-grid/zc-grid.vue'
 Vue.config.productionTip = false
-// Vue.prototype.api = api;
 Vue.use(VueJsonp)
 App.mpType = 'app'
-
+Vue.mixin(share)
+ Vue.component('imgGrid',imgGrid)
 const app = new Vue({
     ...App
 })
diff --git a/pages.json b/pages.json
index e1aaa9c..cbd1ede 100644
--- a/pages.json
+++ b/pages.json
@@ -5,6 +5,9 @@
 			"style": {
 				"navigationBarTextStyle": "black",
 				// "enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
 				"onReachBottomDistance": 50,
 				"app-plus": {
 					"titleNView": false, //禁用原生导航栏
@@ -20,6 +23,9 @@
 		{
 			"path": "pages/goods/store-list/store-list",
 			"style": {
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "门店列表",
 				"enablePullDownRefresh": false
 			}
@@ -29,6 +35,9 @@
 			"path": "pages/tabBar/category/category",
 			"style": {
 				"navigationBarTextStyle": "black",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
 				"app-plus": {
 					"titleNView": false, //禁用原生导航栏
 					"bounce": "none"
@@ -41,6 +50,9 @@
 			"style": {
 				"enablePullDownRefresh": true,
 				"navigationBarTextStyle": "black",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
 				"app-plus": {
 					"titleNView": false, //禁用原生导航栏
 					"softinputNavBar": "none",
@@ -57,8 +69,8 @@
 			"style": {
 				"enablePullDownRefresh": true,
 				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#f06c7a",
-				"backgroundColorTop": "#f06c7a",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
 				"app-plus": {
 					"titleNView": false, //禁用原生导航栏
@@ -74,6 +86,9 @@
 			"path": "pages/goods/goods-list/goods-list",
 			"style": {
 				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": true,
 				"app-plus": {
 					"bounce": "none"
@@ -84,6 +99,9 @@
 			"path": "pages/goods/HM-search/HM-search",
 			"style": {
 				"navigationBarTitleText": "搜索",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
 				"app-plus": {
 					"softinputNavBar": "none"
 				}
@@ -93,7 +111,9 @@
 			"path": "pages/goods/goods",
 			"style": {
 				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#f1f1f1",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
 				"onReachBottomDistance": 50,
 				"h5": {
 					"titleNView": false
@@ -107,7 +127,8 @@
 		{
 			"path": "pages/login/login",
 			"style": {
-				"navigationBarBackgroundColor": "#f06c7a",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
 				"app-plus": {
 					"bounce": "none", //关闭窗口回弹效果
@@ -119,7 +140,8 @@
 			"path": "pages/login/register",
 			"style": {
 				"navigationBarTitleText": "手机号登录",
-				"navigationBarBackgroundColor": "#f06c7a",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
 				"app-plus": {
 					"bounce": "none", //关闭窗口回弹效果
@@ -131,7 +153,8 @@
 			"path": "pages/login/resetpasswd",
 			"style": {
 				"navigationBarTitleText": "修改密码",
-				"navigationBarBackgroundColor": "#f06c7a",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
 				"app-plus": {
 					"bounce": "none", //关闭窗口回弹效果
@@ -142,20 +165,27 @@
 			"path": "pages/order/confirmation",
 			"style": {
 				"navigationBarTitleText": "确认订单",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
 				"softinputNavBar": "none"
 			}
 		}, {
 			"path": "pages/user/setting/setting",
 			"style": {
-				"navigationBarBackgroundColor": "#f8f8f8",
 				"navigationBarTitleText": "我的设置",
-				"backgroundColorTop": "#ffffff",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
 				"backgroundColorBottom": "#f3f3f3"
 			}
 		}, {
 			"path": "pages/user/myQR/myQR",
 			"style": {
 				"navigationBarTitleText": "我的二维码",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
 				"app-plus": {
 					"bounce": "none"
 				}
@@ -165,14 +195,15 @@
 			"style": {
 				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "消息列表",
-				"navigationBarBackgroundColor": "#f06c7a",
+				"navigationBarBackgroundColor": "#0083f5",
 				"navigationBarTextStyle": "white"
 			}
 		}, {
 			"path": "pages/user/coupon/coupon",
 			"style": {
 				"navigationBarTitleText": "优惠券",
-				"navigationBarBackgroundColor": "#f06c7a",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
 				"app-plus": {
 					"bounce": "none"
@@ -182,8 +213,8 @@
 			"path": "pages/user/keep/keep",
 			"style": {
 				"navigationBarTitleText": "我的收藏",
-				"navigationBarBackgroundColor": "#f06c7a",
-				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
 				"app-plus": {
 					"bounce": "none"
 				}
@@ -272,7 +303,7 @@
 			"path": "pages/user/order_details/order_details",
 			"style": {
 				// "navigationBarTitleText": "订单详情",
-				"navigationBarBackgroundColor": "#f06c7a",
+				"navigationBarBackgroundColor": "#0083f5",
 				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": false
 			}
@@ -323,8 +354,8 @@
 			"style": {
 				"navigationBarTitleText": "",
 				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#f06c7a",
-				"backgroundColorTop": "#f06c7a",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -334,8 +365,8 @@
 				"enablePullDownRefresh": false,
 				"navigationBarTitleText": "",
 				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#f06c7a",
-				"backgroundColorTop": "#f06c7a",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white"
 			}
 
@@ -361,7 +392,7 @@
 	},
 	"tabBar": {
 		"color": "#333333",
-		"selectedColor": "#f06c7a",
+		"selectedColor": "#0083f5",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [{
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index b9cde28..d4f6903 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -29,6 +29,7 @@
 		<!-- 占位 -->
 		<view v-if="showHeader" class="place"></view>
 		<!-- 轮播图 -->
+		<view class="height90 backcor008 viewbor"></view>
 		<view class="swiper">
 			<view class="swiper-box">
 				<swiper circular="true" autoplay="true" @change="swiperChange">
@@ -42,12 +43,40 @@
 				</view>
 			</view>
 		</view>
+		<!-- /菜单 -->
+		<view class="height60 backcorfff"></view>
+		<imgGrid :list="imgList"></imgGrid>
+		
+		<!-- 赠券 -->
+		<view style="width: 91%;margin-left: 5%;">
+			<image class="mart30 width100" mode="widthFix" src="../../../static/img/headzq.png"></image>
+		</view>
+		<swiper v-if="list&&list.length>0" class="orange-content" :display-multiple-items="4" next-margin="'50rpx'">
+			<swiper-item class="swiper-hed" v-for="(item,index) in list" :key="index">
+				<view class="swiper-item" @tap="tapList" :data-id="item.id" :data-index="index" style="height:80px;">
+					<image class="img" :src="item.img" style="border-Radius:10rpx;}" mode="aspectFill"></image>
+					<view class="subject fotct">{{item.subject}}</view>
+				</view>
+			</swiper-item>
+		</swiper>
+		
+		<!-- 金币 -->
+		<view></view>
+		<swiper v-if="list&&list.length>0" class="orange-content" :display-multiple-items="4" next-margin="'50rpx'">
+			<swiper-item class="swiper-hed" v-for="(item,index) in list" :key="index">
+				<view class="swiper-item" @tap="tapList" :data-id="item.id" :data-index="index" style="height:80px;">
+					<image class="img" :src="item.img" style="border-Radius:10rpx;}" mode="aspectFill"></image>
+					<view class="subject fotct">{{item.subject}}</view>
+				</view>
+			</swiper-item>
+		</swiper>
+		
 		<!-- 广告图 -->
 		<!-- <view class="banner" @click="tao">
 			<image src="/static/img/banner.jpg"></image>
 		</view> -->
 		<!-- 商品列表 -->
-		<view class="goods-list">
+		<!-- 	<view class="goods-list">
 			<view class="title">
 				<image src="/static/img/hua.png"></image>
 				赠券专区
@@ -70,9 +99,8 @@
 					</view>
 				</view>
 			</view>
-			<!-- <view class="loading-text">{{ loadingText }}</view> -->
-		</view>
-
+		</view> -->
+		<!-- 
 		<view class="goods-list">
 			<view class="title">
 				<image src="/static/img/hua.png"></image>
@@ -103,8 +131,7 @@
 					</view>
 				</view>
 			</view>
-			<!-- <view class="loading-text">{{ loadingText }}</view> -->
-		</view>
+		</view> -->
 
 	</view>
 </template>
@@ -148,29 +175,57 @@
 				loadingText: '正在加载...',
 				pageNum: 1,
 				pageSize: 6,
+				imgList: [{
+						url: '/static/img/wxpay.png',
+						text: '美食'
+					},
+					{
+						url: '/static/img/wxpay.png',
+						text: '加油'
+					},
+					{
+						url: '/static/img/wxpay.png',
+						text: '美食'
+					},
+					{
+						url: '/static/img/wxpay.png',
+						text: '美食'
+					}
+				],
+				list: [{
+						id: 1,
+						img: '/static/img/wenj.png',
+						subject: '104'
+					},
+					{
+						id: 1,
+						img: '/static/img/wenj.png',
+						subject: '123'
+					},
+					{
+						id: 1,
+						img: '/static/img/wenj.png',
+						subject: '112'
+					},
+					{
+						id: 1,
+						img: '/static/img/wenj.png',
+						subject: '221'
+					},
+					{
+						id: 1,
+						img: '/static/img/wenj.png',
+						subject: '343'
+					},
+					{
+						id: 1,
+						img: '/static/img/wenj.png',
+						subject: '123'
+					}
+				]
 			};
 		},
-		onPageScroll(e) {
-			//兼容iOS端下拉时顶部漂移
-			// this.headerPosition = e.scrollTop >= 0 ? "fixed" : "absolute";
-			// this.headerTop = e.scrollTop >= 0 ? null : 0;
-			// this.statusTop = e.scrollTop >= 0 ? null : -this.statusHeight + 'px';
-		},
-		//下拉刷新，需要自己在page.json文件中配置开启页面下拉刷新 "enablePullDownRefresh": true
-		onPullDownRefresh() {
-			// setTimeout(function() {
-			// 	uni.stopPullDownRefresh();
-			// }, 1000);
-		},
-		//上拉加载，需要自己在page.json文件中配置"onReachBottomDistance"
-		onReachBottom() {
 
-		},
-
-
-		authColse() {
-
-		},
 		onShow() {
 			// #ifdef H5
 			var arr1 = window.location.href;
@@ -178,7 +233,7 @@
 			if (!app.globalData.userInfo && arr2[1] != undefined && arr2[2] == '2#/') {
 				this.getH5UserInfo(arr2[1]);
 			}
-		
+
 			if (app.globalData.userInfo && arr2[1] != undefined && arr2[2] == '1#/') {
 				this.getH5AccessToken(arr2[1]);
 			}
@@ -306,8 +361,8 @@
 						uni.setStorage({
 							key: "openId",
 							data: res.return_data
-							.object
-							.highUser.openIdH5
+								.object
+								.highUser.openIdH5
 						})
 						app.globalData.openId = res.return_data
 							.object
@@ -406,45 +461,6 @@
 					}
 				});
 			},
-
-			//消息列表
-			toMsg() {
-				// uni.navigateTo({
-				// 	url: '../../msg/msg'
-				// })
-				// uni.showToast({
-				// 	title: '暂未开通',
-				// 	icon: 'none'
-				// });
-			},
-			//搜索跳转
-			toSearch() {
-				uni.navigateTo({
-					url: '../../goods/HM-search/HM-search'
-				})
-				// uni.showToast({ title: '建议跳转到新页面做搜索功能' });
-			},
-			//轮播图跳转
-			toSwiper(e) {
-				// uni.showToast({
-				// 	title: e.src,
-				// 	icon: 'none'
-				// });
-				uni.reLaunch({
-					url: '../category/category'
-				})
-			},
-
-			//商品跳转
-			toGoods(e) {
-				// uni.showToast({
-				// 	title: '商品' + e.goods_id,
-				// 	icon: 'none'
-				// });
-				uni.navigateTo({
-					url: '../../goods/goods?id=' + e
-				});
-			},
 			//轮播图指示器
 			swiperChange(event) {
 				this.currentSwiper = event.detail.current;
@@ -455,7 +471,7 @@
 <style lang="scss">
 	page {
 		position: relative;
-		background-color: #fff;
+		background-color: #FFFFFF;
 	}
 
 	@font-face {
@@ -503,9 +519,9 @@
 		display: flex;
 		align-items: center;
 		position: fixed;
+		background-color: #0083f5;
 		top: 0;
 		z-index: 10;
-		background-color: #fff;
 
 		/*  #ifdef  APP-PLUS  */
 		top: var(--status-bar-height);
@@ -518,6 +534,7 @@
 			display: flex;
 			align-items: center;
 			font-size: 28upx;
+			color: #FFFFFF;
 
 			.icon {
 				height: 60upx;
@@ -584,15 +601,21 @@
 		/*  #endif  */
 	}
 
+	.viewbor {
+		border-radius: 0px 0px 10px 10px;
+		position: relative;
+	}
+
 	.swiper {
 		width: 100%;
-		margin-top: 10upx;
 		display: flex;
 		justify-content: center;
+		position: absolute;
+		top: 60px;
 
 		.swiper-box {
 			width: 92%;
-			height: 150px;
+			height: 130px;
 			overflow: hidden;
 			border-radius: 15upx;
 			box-shadow: 0upx 8upx 25upx rgba(0, 0, 0, 0.2);
@@ -602,12 +625,12 @@
 
 			swiper {
 				width: 100%;
-				height: 150px;
+				height: 130px;
 
 				swiper-item {
 					image {
 						width: 100%;
-						height: 150px;
+						height: 130px;
 					}
 				}
 			}
@@ -861,4 +884,70 @@
 			}
 		}
 	}
+
+	//赠券专区
+	.orange-wrap {
+		position: relative;
+		box-sizing: border-box;
+	}
+	.orange-title {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+		padding-right: 30rpx;
+	}
+
+	.orange-title .al {
+		font-weight: 700;
+		font-size: 34rpx;
+	}
+
+	.orange-title .ar {
+		font-size: 28rpx;
+		color: #777;
+		position: relative;
+		top: 10rpx;
+
+	}
+
+	.orange-content {
+		height: 110px;
+		width: 90%;
+		margin-left: 5%;
+		border: 2px solid #ff5836;
+		margin-top: -4px;
+		background-color: white;
+	}
+
+	.swiper-hed {
+		width: 28%;
+	}
+
+	.orange-content .swiper-item {
+		height: 140rpx;
+		margin-left: 14rpx;
+		margin-top: 14rpx;
+	}
+
+	.orange-content .swiper-item .img {
+		width: 100%;
+		height: 100%;
+	}
+
+	.orange-content .swiper-item .subject {
+		font-size: 26rpx;
+		width: 100%;
+		color: #ff5836;
+	}
+
+	.lookmore {
+		background-color: #e2e2e2;
+		text-align: center;
+		line-height: 140rpx;
+	}
+
+	.lookmore .moretext {
+		color: #777;
+		font-size: 28rpx;
+	}
 </style>
diff --git a/static/img/headzq.png b/static/img/headzq.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca8809f065e8b994851570fb43a0f46541fc1a55
GIT binary patch
literal 4090
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

literal 0
HcmV?d00001

diff --git a/uni.scss b/uni.scss
index 4198567..977cef0 100644
--- a/uni.scss
+++ b/uni.scss
@@ -225,7 +225,11 @@ $uni-font-size-paragraph:30upx;
 .backcorf06{
 	background-color: #f06c7a;
 }
-
+
+.backcor008{
+	background-color: #0083f5;
+}
+
 
 .backcor89 {
   background-color: #089bf5;