test

.gitignore

@@ -1,3 +1,3 @@
 unpackage/
 .gitignore
-/common/config/config.js
+common/config/config.js

common/config/config.js

@@ -1,9 +1,9 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.26:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
 }else{
     // 生产环境
     URL_CONFIG = 'https://spi.caimei365.com'

pages.json

@@ -9,7 +9,8 @@
 		},{
 			"path": "pages/authorization/authorization",
 			"style": {
-				"navigationBarTitleText": "微信授权"
+				"navigationBarTitleText": "微信授权",
+				"navigationStyle":"custom"
 			}
 		},{
 		    "path" : "pages/tabBar/category/category",
@@ -68,11 +69,6 @@
 				"navigationBarTitleText": "商品详情",
 				"navigationStyle":"custom"
 			}
-		},{
-			"path": "pages/goods/product-detail",
-			"style": {
-				"navigationStyle":"custom"
-			}
 		},{
 			"path": "pages/service/aftersale",
 			"style": {

pages/authorization/authorization.vue

@@ -1,5 +1,6 @@
 <template>
-	<view class="container login">
+	<view class="container login" :style="{paddingTop:CustomBar+'px'}">
+		<cu-custom :navbar-data='nvabarData' @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="login-main">
 			<image class="logo" src="../../static/login-logo@3x.png" mode=""></image>
 			<text class="logo-text">生美/医美采购服务平台</text>
@@ -22,11 +23,18 @@
 	export default{
 		data() {
 			return{
+				nvabarData: {		//顶部自定义导航
+					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
+					showSearch: 0,
+					title: '微信授权', // 导航栏 中间的标题
+				},
+				CustomBar:this.CustomBar,// 顶部导航栏高度
 				authorizeType:''
 			}
 		},
 		onLoad(e) {
 			this.authorizeType = e.type
+			console.log(e)
 		},
 		methods:{
 			//授权登录 
@@ -38,12 +46,18 @@
 			    }
 			 },
 			undGetuserinfo(){
+				this.hanldBackFn()
+			},
+			hanldNavigateBack(){
+				this.hanldBackFn()
+			},
+			hanldBackFn(){
 				switch(this.authorizeType){
 					case '0':
 						this.$api.switchTabTo('/pages/tabBar/home/home')
 						break;
-					default :
-						uni.navigateBack({delta: 1});
+					default:
+						uni.navigateBack({delta: 1})
 				}
 			},
 			wxGetUserInfo(){
@@ -58,6 +72,9 @@
 					});	
 				})
 			},
+		},
+		onHide(){
+			this.$api.switchTabTo('/pages/tabBar/home/home')
 		}
 	}
 </script>

pages/login/register.vue

@@ -302,7 +302,6 @@
 	import authorize from '@/common/config/authorize.js' 
 	import { organizationRegister , organizationVerifyRegisterFirst ,organizationVerifyRegisterTwo } from "@/api/use.js"
 	import { getImageCode, getEmailCode, getMobileCode, uploadFileImage } from "@/api/utils.js"
-	var self;
 	export default{
 		components:{
 			mpvueCityPicker

pages/tabBar/home/home.vue

@@ -274,8 +274,7 @@
 			},
 			navToDetailPage(id) {//跳转商品详情页
 				this.modallayer = true;
-				this.$api.navigateTo(`/pages/goods/product-detail?id=${id}`)
-				// this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
 			},
 			handleContact(e){
 				console.log(e.detail.path)

pages/tabBar/user/user.vue

@@ -152,7 +152,7 @@
 			}
 		},
 		onLoad(){
-			
+
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo'])
@@ -227,7 +227,7 @@
 						}
 					})	
 				}
-			}
+			},			
 		}
 	}
 </script>