Ver Fonte

改配置

zhengkaixin há 1 ano atrás
pai
commit
1ca55d510a

+ 2 - 2
components/ShareServer.vue

@@ -75,7 +75,7 @@
 				})
 			},
 			setUrl(url){
-				this.url=process.car.IMG_URL+"railroad-phone/#"+url;
+				this.url=url;
 			},
 			setTitle(text,id){
 				this.title=text;
@@ -86,7 +86,7 @@
 			//微信分享自定义
 			wxShare() {
 				var userInfo=this.carhelp.getPersonInfo()
-				var img=process.car.IMG_URL+"railroad-phone/"+require("@/assets/img/logo.png")
+				var img=require("@/assets/img/logo.png")
 				
 				var title=this.title
 			//	var desc=

+ 3 - 15
config/.env.dev.js

@@ -2,11 +2,9 @@ const UNI_APP = {
 	ProjectName :"荆鹏电管家",
 	BASE_URL: 'http://36.134.122.108/railroad-server/',
 
-	IMG_URL:"http://www.jsrailway.com.cn/",
 	
-	//BASE_URL:'http://192.168.77.162:8086/railroad-server/',
+	BASE_URL:'http://192.168.77.162:8081/electric-manager-api/',
 	//BASE_URL:'http://192.168.77.222:8086/railroad-server/',
-		//BASE_URL: 'http://192.168.33.220:8086/',
 	
 	NODE_ENV :"dev",
 	SIMPLE_RUN:true,// 无视权限控制跳转页面   , 用于样式人员快速访问各种功能 ,快速测试等
@@ -15,19 +13,9 @@ const UNI_APP = {
 	//openId:"oK9Wr57rAcNzihDN2PEdptprT0As", 
 	// openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
 	openId:"oBEnI6GDWCRQqn_xlyPlCYFY8Amg",//zkx
-	//openId:"oBEnI6FVaHBZOgnxVa70ePPIBd68",//sz
-	//
-	//openId:"oBEnI6DtjgbX65mL4_nUFtVgo-8Y",
-	//openId:"oBEnI6PiaBMNUMTnjT0ffT1R2JOk",//杨所
-	//openId:"oBEnI6JvouUwF7id9fxyueukbAfQ",//  王工
 	
-	
-	//openId:"oK9Wr58zNwDernF0TL6o3mdUxk2A",
-	//		openId:"oK9Wr5xRUoP9EygZqBec0xkJMVTs",
-	//openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU",//zq
-	//小鹏管家appid
-	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
-	VUE_APP_WXAPPID:"wx1052afafacae1c63",
+	//appid
+	VUE_APP_WXAPPID:"wx0b3c41a903053808",
 	VUE_APP_ALIAPPID:"2021003131641247",
 }  
 

+ 3 - 3
config/.env.prod.js

@@ -1,13 +1,13 @@
 const UNI_APP = {  	
 	ProjectName :"荆鹏电管家",
 	BASE_URL: 'http://36.134.122.108/railroad-server/',
-		IMG_URL:"http://www.jsrailway.com.cn/",
+	
 	NODE_ENV :"prod",
 	SIMPLE_RUN:false,
 	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId
 	openId:"123456",
-	//小鹏管家appid
-	VUE_APP_WXAPPID:"wx1052afafacae1c63",
+	//appid
+	VUE_APP_WXAPPID:"wx0b3c41a903053808",
 
 	
 	VUE_APP_ALIAPPID:"2021003131641247",

+ 5 - 16
config/.env.test.js

@@ -1,25 +1,14 @@
 const UNI_APP = {  
 	ProjectName :"荆鹏电管家",
 	BASE_URL: 'http://36.134.122.108/railroad-server/',
-		IMG_URL:"http://www.jsrailway.com.cn/",
-    //BASE_URL: 'https://charging.xiaoxinda.com/charging-station-server/',
-   
-
+	
 	NODE_ENV :"test",
 	SIMPLE_RUN:false,
-	//openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId
-	//openId:"oHjCawmHqG44pqUW54iBlenaHYB8",D
-	//小鹏管家appid
-	VUE_APP_WXAPPID:"wx1052afafacae1c63",
+	
+	//appid
+	VUE_APP_WXAPPID:"wx0b3c41a903053808",
 	VUE_APP_ALIAPPID:"2021003131641247",
-	//zkx的测试openId
-	// openId:"oHjCawsJ5blME36lHaSpSVfEhleU",
-	// openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",
-	// openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU",
-	//zq的测试openId
-	//openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU"
-	//openId:"test004",
-	openId:"123456",
+	
 	
 }  
 

+ 1 - 1
pages.json

@@ -2,7 +2,7 @@
 
 	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
 		{
-		    "path" : "pages/login/login",
+		    "path" : "pages/businessHall/login/login",
 		    "style" :                                                                                    
 		    {
 		        //登录

+ 14 - 2
pages/login/login.vue → pages/businessHall/login/login.vue

@@ -2,6 +2,10 @@
 	<view>
 		<view class="logo">
 			<image class="img" src="@/assets/img/logo.png" mode=""></image>
+			
+		</view>
+		<view  class="logoText">
+			荆鹏电管家
 		</view>
 		<!-- 手机号/密码 -->
 		<view class="input-box">
@@ -16,8 +20,8 @@
 			 login:password.length&&phone.length
 		 }" @click="submit" >登录</button>
 		 
-		 <view class="reset">
-		 	联系园区管家重置密码
+		 <view class="reset" @click="gotoUrl('')">
+		 	忘记密码? <span style="color:#387aea ;">点击找回</span>
 		 </view>
 	</view>
 </template>
@@ -97,6 +101,14 @@
 		background-color: #fff;
 		padding-top: 160rpx;
 	}
+	.logoText{
+		width: 160rpx;
+		margin: 0 auto;
+		line-height: 46rpx;
+		color: rgba(16,16,16,1);
+		font-size: 32rpx;
+		margin-top: 20rpx;
+	}
 	.logo{
 		margin: 0 auto;
 		width: 160rpx;