gjy 3 years ago
parent
commit
c910302d53
2 changed files with 15 additions and 6 deletions
  1. 2 2
      config/index.js
  2. 13 4
      pages/erpbusiness/customer.vue

+ 2 - 2
config/index.js

@@ -1,9 +1,9 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://192.168.1.120:8090/',
+	// baseUrlNew: 'http://192.168.1.120:8090/',
 	// baseUrlNew: 'http://192.168.1.103:9100/',
 	// baseUrlNew: 'https://apitest.eliangeyun.com/',
-	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 13 - 4
pages/erpbusiness/customer.vue

@@ -14,10 +14,16 @@
 		</view>
 		<view class="content">
 			<view style='padding-left:20px;color:#AFB3BF;font-size:14px;' v-if='show==false'>近期客户</view>
-			<view v-if='searchKeyWord.length>0&&show==true' class='searchwrap' v-for='item in gridList' @click='checkcustomer(item)'>
-			{{item.customerName}}({{item.customerPhone}})
+			
+			<view v-for='item in gridList'>
+				<view v-if='searchKeyWord.length>0&&show==true' class='searchwrap' @click='checkcustomer(item)'>
+				{{item.customerName}}({{item.customerPhone}})
+				</view>
 			</view>
-			<view @click='recentcustomer(item)' class='wrap' v-else>{{item.searchContent}}</view>
+			<view   v-for='item in gridList' style='display:inline-block;'>
+				<view @click='recentcustomer(item)' class='wrap' v-if='show==false'>{{item.searchContent}}</view>
+			</view>
+			
 		</view>
 		
 		<view v-show="isContent">
@@ -125,6 +131,7 @@
 			}).then(res => {
 				if(res.data.data){
 					this.gridList=res.data.data.records
+					console.log(this.gridList)
 				}
 			})
 			this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer',{
@@ -181,6 +188,7 @@
 							}
 						})
 						uni.setStorageSync('checkcustomer',item)
+						that.show=false
 						uni.navigateBack()
 					})
 					.catch(res => {
@@ -237,6 +245,7 @@
 									})
 								}
 							})
+							that.show=false
 							uni.navigateBack()							
 							uni.hideLoading()
 						})
@@ -791,7 +800,7 @@
 		    background: #F5F6F9;
 		    margin: 5px 10px;
 		    border-radius: 20px;
-		    width: 42%;
+		    width: 92%;
 		    display: inline-block;
 		    padding: 10px;
 	}