1.对接首页统计

2.对接商户进件失败修改

Utils/Api.js

@@ -69,3 +69,8 @@ export const getStoreListByMer = params => {
 export const getStoreDetailById = params => {
 	return POST('GET', `${base}/store/getStoreDetailById`, params).then(res => res.data);
 }
+
+//手机查询统计
+export const moveHomeCount = params => {
+	return POST('POST', `${base}/salesman/moveHomeCount`, params).then(res => res.data);
+}

pages/index/merchant-incoming-parts/merchant-incoming-parts.vue

@@ -42,14 +42,14 @@
 					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
 			</view>
 			<view class="notes">
-				注:商户初始密码为注册手机号后6位
+				注:商户初始密码为123456
 			</view>
 		</view>
-		<view class="checkboxg font14" v-if="merchart == 1 && currentstatus != 1">
+		<!-- <view class="checkboxg font14" v-if="merchart == 1 && currentstatus != 1">
 			<checkbox-group class="aliitem fcor666" @change="changechk">
 				<checkbox class="checbox" value="cb" :checked="ischecked" />同意<text class="fcor089">《什么什么什么什么法哦》</text>
 			</checkbox-group>
-		</view>
+		</view> -->
 		<!--第一步 已录入账户信息 -->
 		<view class="width100 mart10 backcorfff font14" v-if="merchart == 1 && currentstatus == 1">
 			<view class="username">
@@ -1109,7 +1109,6 @@
 				})
 				if (this.merchart != 1) {
 					this.merchart = this.merchart - 1;
-					console.log('============--------')
 					this.getMerDetail(0);
 				}
 			},
@@ -1170,7 +1169,6 @@
 						if ((res.return_data.merStatus == 4 || res.return_data.merStatus == 2) && this.merchart !=
 							1) {
 							this.currentstatus = 0;
-							console.log('============')
 							//第二步
 							this.merchantId = res.return_data.merType;
 							this.companyname = res.return_data.merName
@@ -1261,13 +1259,13 @@
 					});
 					return;
 				}
-				if (!this.ischecked) {
-					uni.showToast({
-						title: '请勾选',
-						icon: "none"
-					});
-					return;
-				}
+				// if (!this.ischecked) {
+				// 	uni.showToast({
+				// 		title: '请勾选',
+				// 		icon: "none"
+				// 	});
+				// 	return;
+				// }
 				let datas = {
 					"loginName": this.loginphone,
 					"name": this.mercontacts,

pages/login/login.vue

@@ -2,15 +2,15 @@
 	<view class="login">
 		<view class="content">
 			<!-- 头部logo -->
-			<view class="header">
+			<!-- <view class="header">
 				<image src="../../static/logo.png"></image>
-			</view>
+			</view> -->
 			<!-- 主体表单 -->
-			<view class="main">
+			<view class="main mart90">
 				<wInput v-model="phoneData" type="text" placeholder="用户名/电话" :focus="isFocus"></wInput>
 				<wInput v-model="passData" type="password" placeholder="密码" isShowPass="true"></wInput>
 			</view>
-			<wButton class="wbutton" text="登 录" :rotate="isRotate" @click="startLogin"></wButton>
+			<wButton class="wbutton" text="登 录"  bgColor="#089bf5" :rotate="isRotate" @click="startLogin"></wButton>
 		</view>
 	</view>
 </template>

pages/tabBar/home/home.vue

@@ -14,11 +14,11 @@
 			<view class="width94 mart15">
 				<view class="width50 fcorfff font14 flleft">
 					<view class="width100">进件成功数量</view>
-					<view class="width100 mart15 font22">0</view>
+					<view class="width100 mart15 font22">{{auditnum.contractSuccess}}</view>
 				</view>
 				<view class="width48 fcorfff font14 flright">
 					<view class="width100">待审核数量</view>
-					<view class="width100 mart15 font22">0</view>
+					<view class="width100 mart15 font22">{{auditnum.contractAudit}}</view>
 				</view>
 			</view>
 			<!-- 非业务员 -->
@@ -52,7 +52,7 @@
 </template>
 
 <script>
-	import {getDiscountList} from '../../../Utils/Api.js'
+	import {getDiscountList,moveHomeCount} from '../../../Utils/Api.js'
 	let app = getApp();
 	export default {
 		data() {
@@ -83,7 +83,9 @@
 					// 	img: ''
 					// },
 				],
-				userInfo:app.globalData.userInfo
+				userInfo:app.globalData.userInfo, //登录信息
+				auditnum:'' //统计数据
+				
 			};
 		},
 		onLoad() {
@@ -99,6 +101,9 @@
 						img: ''
 					}]
 			}
+		},
+		onShow() {
+			this.moveHomeCount();
 		},
 		methods: {
 			getDiscountList() {
@@ -111,6 +116,14 @@
 			
 					}
 				})
+			},
+			// 查询统计
+			moveHomeCount(){
+				moveHomeCount().then(res => {
+					if (res.return_code == '000000') {
+						this.auditnum = res.return_data;
+					}
+				})
 			},
 			/**
 			 * 跳转功能

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>炫支付</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/cweb/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.5a385107.js></script><script src=/cweb/static/js/index.47494f15.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/cweb/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.5a385107.js></script><script src=/cweb/static/js/index.2ecf215f.js></script></body></html>