zhengkaixin 1 year ago
parent
commit
0437b2b135
8 changed files with 14 additions and 12 deletions
  1. 4 3
      .env.dev.js
  2. 1 1
      .env.prod.js
  3. 1 1
      .env.test.js
  4. 1 1
      apis/weixin.js
  5. BIN
      assets/img/logo3Ud.png
  6. 4 3
      pagesFinance/login/index.vue
  7. 1 1
      utils/mixin.js
  8. 2 2
      utils/request.js

+ 4 - 3
.env.dev.js

@@ -1,6 +1,6 @@
 const UNI_APP = {  
 	BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
-	BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
+	//BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
 	//BASE_URL: 'http://192.168.77.162:8081/charging-station/' ,
 	//BASE_URL: 'http://192.168.77.162:8081/charging-station/' ,
 	
@@ -13,11 +13,12 @@ const UNI_APP = {
 	//openId:"oK9Wr56yEh-TbCvUg3s9LYQSL8tM",//提现
 	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s", //杨所
 	//openId:"oK9Wr56yEh-TbCvUg3s9LYQSL8tM",
-	//openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
+	openId:"oSruR6YkhP7QDroLnZGxWis43Kn0",//zkx
 	//openId:"oK9Wr5zv8lvirni3txbxRkmpg8d0",//舒展, 物业
 	//openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU",
+	
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
-	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
+	VUE_APP_WXAPPID:"wxca33ab204e738ca4",
 }  
 module.exports = UNI_APP;

+ 1 - 1
.env.prod.js

@@ -4,7 +4,7 @@ const UNI_APP = {
 	NODE_ENV :"prod",
 	SIMPLE_RUN:false,
 	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//测试用openId
-	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
+	VUE_APP_WXAPPID:"wxca33ab204e738ca4",
 	
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869"

+ 1 - 1
.env.test.js

@@ -12,7 +12,7 @@ const UNI_APP = {
 	//openId:"oHjCawmHqG44pqUW54iBlenaHYB8",
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
-	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
+	VUE_APP_WXAPPID:"wxca33ab204e738ca4",
 	//zkx的测试openId
 	//openId:"oHjCawsJ5blME36lHaSpSVfEhleU",
 		//openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",

+ 1 - 1
apis/weixin.js

@@ -15,7 +15,7 @@ export function wxpay(orderId) {
 //根据code换取openid
 export function getDataByCode(code) {
 	return request({
-		url: '/wechat/findUserInfo/' + code,
+		url: '/youdian/findUserInfo/' + code,
 		params: {},
 		method: 'get',
 	})

BIN
assets/img/logo3Ud.png


+ 4 - 3
pagesFinance/login/index.vue

@@ -1,9 +1,10 @@
 <template>
 	<view>
 		<view class="login-logo">
-			<u-image width="120rpx" height="120rpx" src="../../assets/img/logo.png" border-radius="20"></u-image>
-			<h3>51充电联盟</h3>
-			<p>运管中心</p>
+			<u-image  width="450rpx" height="120rpx"  src="../../assets/img/logo3Ud.png" border-radius="20"></u-image>
+			<!-- -->
+			<p></p>
+			 <h3 >运管中心</h3>
 		</view>
 		<view class="login-form">
 			<u-form :model="form" ref="uForm">

+ 1 - 1
utils/mixin.js

@@ -1,4 +1,4 @@
-var prefix = 'jp_charging_merchantUser_' + process.car.NODE_ENV + '_';
+var prefix = 'jp_charging_merchantUser_ud_' + process.car.NODE_ENV + '_';
 
 var app = {
 	

+ 2 - 2
utils/request.js

@@ -17,7 +17,7 @@ const request = (options) => {
 	 	return requestSon(options);
 	 }
 	 var openId=carhelp.getOpenId()
-	var  urlindex="/wechat/findUserInfo"
+	var  urlindex="/youdian/findUserInfo"
 	var k=options.url.indexOf(urlindex)==-1;
 	
 	 if(!openId&&k){
@@ -72,7 +72,7 @@ const request = (options) => {
 				
 				var	url="/pagesFinance/login/index"
 				url+="?message=请登录&back="+ backurl
-				if(options.data.phone){
+				if(options.data&&options.data.phone){
 					url+="&phone="+options.data.phone
 					
 				}