取消跟进上传图片大小限制

public/app/js/customer_gj.js

@@ -226,12 +226,13 @@ require(['vue', 'vconsole', 'css!style/customerinfo_sub_page.css', 'css!style/cu
 					layerTipsX('目前最多只能上传一张');
 					return false;
 				}else{
-					if(e.target.files[0].size > 1000000){
-						layerTipsX('图片过大，请重新选择');
-						return false;
-					}else{
-						_fd.append('image', e.target.files[0]);
-					};
+//					if(e.target.files[0].size > 1000000){
+//						layerTipsX('图片过大，请重新选择');
+//						return false;
+//					}else{
+//						_fd.append('image', e.target.files[0]);
+//					};
+					_fd.append('image', e.target.files[0]);
 				};
 				$.ajax({
 					url: ServerHostTempC + "/chat/uploadImg",

public/appnew/src/assets/js/public.js

@@ -32,6 +32,9 @@ export default {
 		} else {
 			return str;
 		}
+	},
+	jineComma(str) {
+		
 	},
 	dealJineNum(num) {
 		if(isFinite(num)) {

public/appnew/src/components/achieveMain/achieveFork.vue

@@ -2,7 +2,10 @@
 	<div>
 		<header-pulic :data="headerData"></header-pulic>
 		<nav>
-			<div v-for="(item, index) in mainData" :key="item.title" :class="{active:index === initTabNumMain}" @click="tabMain(index)">{{item.title}}</div>
+			<div class="nav-main">
+				<div v-for="(item, index) in mainData" :key="item.title" :class="{active:index === initTabNumMain}" @click="tabMain(index)">{{item.title}}</div>
+			</div>
+			<div class="nav-seat"></div>
 		</nav>
 
 		<main>
@@ -11,9 +14,11 @@
 					<li v-for="(item2, index2) in item.listData">
 						<achieve-fork-li :data="item2" :dataindex="index2"></achieve-fork-li>
 					</li>
+					<li class="self-achieve-li" v-if="mainData[index].selfData">
+						<achieve-fork-li :data="mainData[index].selfData" :dataindex="mainData[index].selfData.index_-1"></achieve-fork-li>
+					</li>
 				</ul>
 				<footer class="oh achieve-footer">
-					<achieve-fork-li :data="mainData[index].selfData" :dataindex="mainData[index].selfData.index_-1"></achieve-fork-li>
 					<p class="time-title tc">统计时间：{{statisticsStartTime+'-'+statisticsEndTime}}</p>
 					<div class="btn-area">
 						<div class="oh">
@@ -31,12 +36,10 @@
 </template>
 
 <script>
-	import headerPulic from '@/components/publicEg/headPublic';
 	import achieveForkLi from '@/components/achieveMain/achieveForkLi';
 	import '@/assets/js/layer041002.js';
 	export default {
 		components: {
-			'header-pulic': headerPulic,
 			'achieve-fork-li': achieveForkLi
 		},
 		data: () => ({
@@ -68,10 +71,7 @@
 				'title': '部门排行',
 				'isLoad': false,
 				'topLineNum': Number.POSITIVE_INFINITY,
-				'listData': [],
-				'selfData': {
-					'index_': 4
-				}
+				'listData': []
 			}],
 			statisticsStartTime: '',
 			statisticsEndTime: '',
@@ -105,36 +105,40 @@
 				let _this = this;
 				_this.initTabNumMain = index;
 				if(!_this.mainData[index].isLoad) {
-					_this.ajaxMainNum(function() {
-						if(!_this.tabsMain[index].data[0].isLoadSub) {
-							Vue.set(_this.tabsMain[index].data[0], 'isLoadSub', true);
-							_this.ajaxUl();
-						} else {
-							console.log(_this.tabsMain[index].data[0].isLoadSub);
-						};
-					});
-				}
+					_this.ajaxUl();
+				};
 			},
 			ajaxUl() {
 				let _this = this;
+				let _index = _this.initTabNumMain;
 				_this.axios({
 					method: 'get',
 					url: '/broker/selectPerformanceByTime',
 					responseType: 'json',
 					data: {
 						'agent_id': _this.userid,
-						'type': 1,
+						'type': _index + 1,
 						'AuthToken': _this.token
 					}
 				})
 				.then(function(response) {
 					if(response.data.code == 200) {
+						_this.mainData[_index].isLoad = true;
 						_this.statisticsStartTime = response.data.data.start_time.replace(/-/g, '.');
 						_this.statisticsEndTime = response.data.data.end_time.replace(/-/g, '.');
-						_this.mainData[0].listData = response.data.data.list;
-						_this.mainData[0].selfData = response.data.data.list.filter(function(item, index, array) {
-							return(item.agent_id === item.is_my);
-						})[0];
+						_this.mainData[_index].listData = response.data.data.list.slice(0, _this.mainData[_index].topLineNum);
+						if(_index < 2){
+							//部门业绩（即区域业绩）时不需要这个
+							_this.mainData[_index].selfData = response.data.data.list.filter(function(item, index, array) {
+								if(_index === 0){
+									//人员排行
+									return(item.agent_id === item.is_my);
+								}else if(_index === 1){
+									//门店排行
+									return(item.store_id === item.is_my);
+								}else{};
+							})[0];
+						};
 					} else {
 						layer.tipsX(response.data.msg);
 					}
@@ -148,26 +152,33 @@
 </script>
 
 <style>
-	nav {
+	nav>.nav-main {
 		display: flex;
+		box-sizing: border-box;
 		background-color: white;
+		width: 100%;
 		height: .9rem;
 		line-height: .9rem;
 		padding: 0 .3rem;
 		border-bottom: 1px solid #eee;
+		position: fixed;
+		left: 0;
+		top: .88rem;
 	}
-	
-	nav>div {
+	nav>.nav-seat {
+		height: .9rem;
+	}
+	nav>.nav-main>div {
 		flex: 1;
 		text-align: center;
 	}
 	
-	nav>div.active {
+	nav>.nav-main>div.active {
 		color: rgb(255, 148, 25);
 		position: relative;
 	}
 	
-	nav>div.active::after {
+	nav>.nav-main>div.active::after {
 		content: '';
 		position: absolute;
 		left: 50%;
@@ -178,6 +189,15 @@
 		border-radius: .03rem;
 		background-color: rgb(255, 161, 50);
 	}
+	.main-sec{
+		min-height: 100%;
+	}
+	.main-sec>ul{
+		padding-bottom: 2.2rem;
+	}
+	.self-achieve-li{
+		margin-top: .2rem;
+	}
 	footer{
 		background-color: white;
 		border-top: 1px solid #ccc;

public/appnew/src/main.js

@@ -48,10 +48,12 @@ axios.interceptors.response.use((res) => {
 Vue.use(VueAxios, axios);
 //Vue.use(VueAwesomeSwiper);
 Vue.prototype.common = common;
-//Vue.prototype.$qs = qs;
 //把common注册到Vue全局
 Vue.config.productionTip = true;
 
+import headerPulic from '@/components/publicEg/headPublic';
+Vue.component('header-pulic', headerPulic);//注册全局组件
+
 /* eslint-disable no-new */
 new Vue({
   el: '#app',