From f8f7114fc9eead67889596975010a4b4af821305 Mon Sep 17 00:00:00 2001
From: yangjie <812952667@qq.com>
Date: Tue, 25 May 2021 17:07:04 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=95=86=E5=9F=8E=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                      | 186 ++++++++++++++---------------
 pages/goods/goods.vue              |  11 +-
 pages/tabBar/category/category.vue |   3 +
 pages/tabBar/home/home.vue         |   3 +
 4 files changed, 109 insertions(+), 94 deletions(-)

diff --git a/manifest.json b/manifest.json
index af41417..b019afe 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,95 +1,95 @@
 {
-	"name": "嗨森逛",
-	"appid": "__UNI__E807B53",
-	"description": "",
-	"versionName": "1.2.0",
-	"versionCode": "100",
-	"transformPx": false,
-	"app-plus": {
-		"usingComponents": true, //是否启用`自定义组件模式`，为true表示新的`自定义组件模式` ，否则为`template模板模式`   
-		"softinput": {
-			"navBar": "none" // 是否显示软键盘上的导航条  
-		},
-		/* 5+App特有相关 */
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"modules": {
-			"Share": {},
-			"OAuth": {}
-		},
-		/* 模块配置 */
-		"distribute": {
-			"orientation": ["portrait-primary"],
-			/* 应用发布信息 */
-			"android": {
-				/* android打包配置 */
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			"ios": {},
-			/* ios打包配置 */
-			"sdkConfigs": {}
-		}
-	},
-	/* SDK配置 */
-	"quickapp": {},
-	/* 快应用特有相关 */
-	"mp-weixin": {
-		/* 小程序特有相关 */
-		"appid": "wx8d49e2f83025229d",
-		"setting": {
-			"urlCheck": true
-		},
-		"permission": {
-			"scope.userLocation": {
-				"desc": "你的位置信息将用于小程序定位"
-			}
-		}
-	},
-	"h5": {
-		"sdkConfigs": {
-			"maps": {
-				"qqmap": {
-					"key": "7UMBZ-HFEHX-HSD4Q-Z3QY6-OQKN7-2QBDB"
-				}
-			}
-		},
-		"title": "嗨森逛",
-		"router": {
-			"mode": "hash",
-			"base": "/H5/"
-		},
-		"devServer" : {
-		    "port" : "",
-		    "https" : true
-		},
-		"domain": "https://hsgcs.dctpay.com",
-		"template": ""
-	}
+    "name" : "嗨森逛",
+    "appid" : "__UNI__E807B53",
+    "description" : "",
+    "versionName" : "1.2.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "app-plus" : {
+        "usingComponents" : true, //是否启用`自定义组件模式`，为true表示新的`自定义组件模式` ，否则为`template模板模式`   
+        "softinput" : {
+            "navBar" : "none" // 是否显示软键盘上的导航条  
+        },
+        /* 5+App特有相关 */
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {
+            "Share" : {},
+            "OAuth" : {}
+        },
+        /* 模块配置 */
+        "distribute" : {
+            "orientation" : [ "portrait-primary" ],
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {},
+            /* ios打包配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        /* 小程序特有相关 */
+        "appid" : "wx8d49e2f83025229d",
+        "setting" : {
+            "urlCheck" : true
+        },
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序定位"
+            }
+        }
+    },
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "7UMBZ-HFEHX-HSD4Q-Z3QY6-OQKN7-2QBDB"
+                }
+            }
+        },
+        "title" : "嗨森逛",
+        "router" : {
+            "mode" : "",
+            "base" : ""
+        },
+        "devServer" : {
+            "port" : "",
+            "https" : false
+        },
+        "domain" : "https://hsgcs.dctpay.com",
+        "template" : ""
+    }
 }
diff --git a/pages/goods/goods.vue b/pages/goods/goods.vue
index 96efc07..3cf3313 100644
--- a/pages/goods/goods.vue
+++ b/pages/goods/goods.vue
@@ -1,5 +1,14 @@
 <template>
 	<view>
+		
+		<view class="header">
+			<!-- 头部-默认显示 -->
+			<view class="before" :style="{ opacity: 1 - afterHeaderOpacity, zIndex: beforeHeaderzIndex }">
+				<view class="back"><view class="icon xiangqian" @tap="back" v-if="showBack"></view></view> 
+				<view class="middle"></view>
+			</view>
+		</view>
+		
 		<!-- 底部菜单 -->
 		<view class="footer">
 			<button v-if="user == '' " class="width100 fotct btnfot" @click="getuserinfo">
@@ -143,7 +152,7 @@
 			this.getCouponById();
 			// #ifdef MP
 			//小程序隐藏返回按钮
-			// this.showBack = false;
+			this.showBack = false;
 			// #endif
 			//option为object类型，会序列化上个页面传递的参数
 		},
diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index b74566a..b54d7f3 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -70,6 +70,9 @@
 	import authorize from '../../../components/Authorize';
 	let app = getApp();
 	export default {
+		components: {
+			authorize
+		},
 		data() {
 			return {
 				showCategoryIndex: 0,
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 8e834f9..70fe3b4 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -121,6 +121,9 @@
 	import authorize from '../../../components/Authorize';
 	let app = getApp();
 	export default {
+		components: {
+			authorize
+		},
 		data() {
 			return {
 				showHeader: true,