瀏覽代碼

龙游对接

xklr/wly 6 月之前
父節點
當前提交
b8e44b19f6
共有 5 個文件被更改,包括 8 次插入1300 次删除
  1. 3 5
      App.vue
  2. 2 0
      pages/index/index.vue
  3. 2 2
      static/.config.json
  4. 1 1
      static/js/mf.js
  5. 0 1292
      static/js/sdk/ydool-jssdk.4.0.0.js

+ 3 - 5
App.vue

@@ -35,7 +35,7 @@
 		onLaunch: function(option) {
 			let token = window.location.search.split('token=')[1]
 			let serialNumber = window.location.search.split('serialNumber=')[1]
-			console.log('App Launch',token,serialNumber)
+			console.log('App Launch', token, serialNumber)
 			// console.log(token)
 			let t = this;
 			inforeq((res) => {
@@ -48,11 +48,9 @@
 							console.log('success');
 						}
 					});
-					
 					t.globalData.token = token
-					
 				}
-				if(serialNumber && serialNumber.length > 0){
+				if (serialNumber && serialNumber.length > 0) {
 					uni.setStorage({
 						key: 'serialNumber',
 						data: serialNumber,
@@ -145,4 +143,4 @@ this.globalData.SET_SYSTEM_INFO = e
 this.globalData.SET_CUSTOM_BAR = customBar
 this.globalData.SET_STATUS_BAR = statusBar
 }
-})
+})

+ 2 - 0
pages/index/index.vue

@@ -218,6 +218,7 @@
 			},
 			//兰溪
 			lanxi() {
+				
 				let t = this;
 				uni.getStorage({
 					key: 'token',
@@ -360,6 +361,7 @@
 				});
 
 				function errordata() {
+					console.log(1)
 					uni.showModal({
 						title: '提示',
 						content: '您还未登录请先去登录!',

+ 2 - 2
static/.config.json

@@ -1,7 +1,7 @@
 {
 	"prodIp": "http://220.191.237.238:10066",
 	"img_prod_host": "http://img.xklr.net/",
-	"devIp": "https://lxh5api.xklr.net",
+	"devIp": "",
 	"testIp": "http://testapi.xklr.net:8601",
 	"appConfig": {
 		"jt_service_url": "http://118.31.70.1:8601",
@@ -11,7 +11,7 @@
 		"district": "111111"
 	},
 	"notes": {
-		"devIp1": "http://192.168.3.77:10066",
+		"devIp1": "http://192.168.3.77:10066,http://192.168.1.103:10066",
 		"prodIp": "正式ip/线下图片地址 http://apiv3.xklr.net   //兰溪 https://lxh5api.xklr.net  //龙游 http://220.191.237.238:10066",
 		"testIp": "正式测试服ip",
 		"devIp/devip1": "开发ip",

+ 1 - 1
static/js/mf.js

@@ -80,7 +80,7 @@ let getAge = function (startDateStr, endDateStr) {
   //计算两个日期相差多少年
   let startDate = new Date(startDateStr);
   let endDate = new Date(endDateStr);
-  let yearNum = endDate.getFullYear() - startDate.getFullYear();
+  let yearNum = endDate.getFullYear() - startDate.getFullYear()-1;
   //获取两个日期(月+日)部分
   let sStr = startDateStr.substring(5, 10);
   let eStr = endDateStr.substring(5, 10);

File diff suppressed because it is too large
+ 0 - 1292
static/js/sdk/ydool-jssdk.4.0.0.js