Merge remote-tracking branch 'origin/master'

# Conflicts:
#	api/api.js
#	pages/index/index.vue
#	pages/user/index.vue

api/api.js

@@ -359,11 +359,19 @@ export function getinstallment(data) {
 	});
 }
 
+// 到首页查询ip地址
 
-// 首页记录ip
-export function logoip() {
-	return request.get(`login/log`, {}, {
+
+export function getip() {
+	return request.get('login/log', {
 		noAuth: true
 	});
 }
 
+
+ // 查询签约是否成功
+// export function getqytrue(data) {
+// 	return request.get('order/getSignResult/',data,{
+// 		noAuth: true
+// 	})
+// }

components/productWindow/index.vue

@@ -450,12 +450,18 @@
 
 	.periodization .returnthedate a {
 		text-decoration: none;
-		display: block;
+		// display: block;
 		margin-top: 20rpx;
 		border: 1px solid rgb(255, 87, 51);
 		color: #000;
+		// width: 100% !important;
+		padding: 0 20rpx;
+		padding-right: 40rpx;
+		box-sizing: border-box;
+	}
+    .returnthedate{
+		width: 100% !important;
 	}
-
 	.periodization .returnthedate a:nth-of-type(1) {
 		width: 198rpx;
 		height: 60rpx;

pages/index/index.vue

@@ -170,6 +170,7 @@
 		setCouponReceive,
 		getTheme,
 		getAppVersion,
+		getip
 	} from '@/api/api.js';
 	import {
 		spread
@@ -370,6 +371,9 @@
 			this.setTabList()
 		},
 		onLoad(options) {
+			this.getipdz()
+
+
 			if (app.globalData.isIframe) {
 				setTimeout(() => {
 					let active;
@@ -420,7 +424,6 @@
 				let mapeMpQrCodeValue = this.$util.formatMpQrCodeData(qrCodeValue);
 				app.globalData.spread = mapeMpQrCodeValue.spread;
                 app.globalData.channelId = mapeMpQrCodeValue.channelId;
-
 			}
 			if (options.spread) app.globalData.spread = options.spread; //非小程序扫码进入情况下，直接获取url中的分销员id保存在globalDta中
             if (options.channelId) app.globalData.channelId = options.channelId; //非小程序扫码进入情况下，直接获取url中的分销员id保存在globalDta中
@@ -470,6 +473,14 @@
 				})
 			},
 
+			// 获取IP地址
+			getipdz(){
+				getip().then(res => {
+					console.log(res,111)
+				})
+			},
+
+
 			menusTap(url) {
 				goPage().then(res => {
 					if (url == '/pages/goods_cate/goods_cate') {

pages/users/order_confirm/index.vue

@@ -1110,7 +1110,7 @@
 					uid: this.$store.getters.uid
 				}
 				getidentity(data).then(res=>{
-					if (res.message == '操作成功') {
+					if (res.message == '操作成功' && res.data != '') {
 						this.sfxx = '已完成'
 						this.identification = res.data
 					}