Merge branch 'v3' of http://git.jihengcc.cn/starfire/spark-sale into v3

config/api.js

@@ -2,10 +2,10 @@
 // const API_BASE = 'http://192.168.1.126:30000'
 //const API_BASE = 'http://192.168.1.117:8089'
 //const API_BASE = 'http://192.168.1.145/newApi'
-//const API_BASE = 'http://192.168.1.109/newApi'
+const API_BASE = 'http://192.168.1.109/newApi'
 // const API_BASE = 'http://192.168.1.117:8089'
 //const API_BASE = 'http://192.168.1.145/newApi'
-const API_BASE = 'http://192.168.1.117:8089'
+//const API_BASE = 'http://192.168.1.117:8089'
 // const API_BASE = 'http://192.168.1.145/newApi'
 
 module.exports = {

pages/report/index.vue

@@ -8,7 +8,7 @@
 					<view class="info-introduce">久未跟进</view>
 					<view class="info-text">长时间未跟进的客户</view>
 				</view>
-				<view class="content-info">
+				<view class="content-info" @click.native="goUrl('/pagesMain/renewList')">
 					<view class="info-num">{{ info.beAboutToExpire }}</view>
 					<view class="info-introduce">即将到期</view>
 					<view class="info-text">会员卡即将过期的会员</view>
@@ -27,7 +27,7 @@
 		</view>
 		<view class="last-content">
 			<view><text style="font-size: 44rpx;font-weight: bold;">客户管理</text></view>
-			<view class="content-customer">
+			<view class="content-customer" @click.native="goUrl('/pagesMain/customerList')">
 				<view style="width:10%;margin: 0 30rpx;">
 					<u-image width="100%" src="/static/images/allCustomer.png" mode="widthFix"></u-image>
 				</view>
@@ -38,12 +38,12 @@
 				
 			</view>
 			<view class="content-last">
-				<view class="last-info">
+				<view class="last-info" @click.native="goUrl('/pagesMain/threadList')">
 					<view class="imageBox"><u-image width="80rpx" height="60rpx" :src="noVip"></u-image></view>
 					<view class="info-num" style="text-align: center;">{{ info.noVip }}</view>
-					<view class="info-text text-c">非会员</view>
+					<view class="info-text text-c">线索</view>
 				</view>
-				<view class="last-info">
+				<view class="last-info" >
 					<view class="imageBox"><u-image width="80rpx" height="60rpx" :src="latelyAdd" mode="widthFix"></u-image></view>
 					<view class="info-num" style="text-align: center;">{{ info.latelyAdd }}</view>
 					<view class="info-text text-c">最近新增</view>
@@ -56,7 +56,7 @@
 				<view class="last-info">
 					<view class="imageBox"><u-image width="80rpx" height="60rpx" :src="overdue" mode="widthFix"></u-image></view>
 					<view class="info-num" style="text-align: center;">{{ info.overdue }}</view>
-					<view class="info-text text-c">过期会员</view>
+					<view class="info-text text-c">无效会员</view>
 				</view>
 			</view>
 		</view>
@@ -96,6 +96,11 @@
 						})
 					}
 				})
+			},
+			goUrl(url){
+				uni.navigateTo({
+					url: url
+				});
 			}
 		}
 	}

pagesMain/businessList.vue

@@ -122,7 +122,8 @@
 					{ text: '未联系', type: 1  },
 					{ text: '有意向', type: 2  },
 					{ text: '已预约', type: 3  },
-					{ text: '商机', type: 4  }
+					{ text: '商机', type: 4  },
+					{ text: '无效', type: 0  }
 				],
 				saleShow: false,
 				saleList: []

pagesMain/threadList.vue

@@ -105,7 +105,8 @@
 					{ text: '未联系', type: 1  },
 					{ text: '有意向', type: 2  },
 					{ text: '已预约', type: 3  },
-					{ text: '商机', type: 4  }
+					{ text: '商机', type: 4  },
+					{ text: '无效', type: 0  }
 				],
 			}
 		},