Merge remote-tracking branch 'origin/0702-v.2.2.0' into 0702-v.2.2.0

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

@@ -59,8 +59,6 @@
 			userid: '',
 			initTabNumMain: 0,
 			mainData: [{
-				'titlet': '人员排行1',
-				
 				'title': '人员排行',
 				'isLoad': false,
 				'topLineNum': 5,
@@ -69,8 +67,6 @@
 					'index_': 4
 				}
 			}, {
-				'titlet': '人员排行2',
-				
 				'title': '门店排行',
 				'isLoad': false,
 				'topLineNum': 5,
@@ -79,8 +75,6 @@
 					'index_': 4
 				}
 			}, {
-				'titlet': '人员排行3',
-				
 				'title': '部门排行',
 				'isLoad': false,
 				'topLineNum': Number.POSITIVE_INFINITY,

public/appnew/src/components/businessCollege/articleList.vue

@@ -3,7 +3,9 @@
 		<header-pulic :data="headerData"></header-pulic>
 		<nav>
 			<div class="nav-main">
-				<div v-for="(item, index) in mainData" :key="item.title" :class="{active:index === initTabNumMain}" @click="tabMain(index)">{{item.title}}</div>
+				<ul :style="'width: '+ulWid+'rem'">
+					<li v-for="(item, index) in mainData" :key="item.labelName" :data-id="item.id" :class="{active:index === initTabNumMain}" @click="tabMain(index)">{{item.labelName}}</li>
+				</ul>
 			</div>
 			<div class="nav-seat"></div>
 		</nav>
@@ -50,49 +52,81 @@
 				'noborder': true,
 				'isBack': false
 			},
+			ulWid: 6.9,
 			initTabNumMain: 0,
 			isStop: false,
 			isLoading: false,
 			noDataFlag: false,
-			mainData: [{
-				'title': '全部',
-				'type': 0,
-				'dataList': [{
-					'content': '企业八星级价值观,企业八星级价值观,企业八星级价值观',
-					'time': '2018-05-06 17:06:12',
-					'img': ''
-				},{
-					'content': '企业八星级价值观,企业八星级价值观,企业八星级价值观',
-					'time': '2018-05-06 17:06:12',
-					'img': ''
-				}]
-			},{
-				'title': '企业文化',
-				'type': 0,
-				'dataList': []
-			},{
-				'title': '团队绩效',
-				'type': 0,
-				'dataList': []
-			},{
-				'title': '团队建设',
-				'type': 0,
-				'dataList': []
-			},{
-				'title': '业务技巧',
-				'type': 0,
-				'dataList': []
-			}]
+			mainData: []
 		}),
 		created() {
 			let _this = this;
-			
+			_this.getLabel(()=>{
+				console.log(99);
+				_this.getPageList();
+			})
 		},
 		mounted() {
 			let _this = this;
 			
 		},
 		methods: {
+			getLabel(fn) {
+				let _this = this;
+				_this.axios({
+					method: 'get',
+					url: '/broker/getNewsLabel',
+					responseType: 'json',
+					data: {
+						'AuthToken': _this.$route.query.token,
+					}
+				})
+				.then(function(response) {
+					if(response.data.code == 200) {
+						let _data = response.data.data;
+						let _len = _data.length;
+						for(let i = 0;i<_len;i++){
+							_this.mainData.push({
+								'dataList': [],
+								'id': _data[i].id,
+								'labelName': _data[i].label_name
+							});
+						};
+						_this.ulWid = (_len*1.6>_this.ulWid)?(_len*1.6):_this.ulWid;
+						fn && fn();
+					} else {
+						layer.tipsX(response.data.msg);
+					}
+				})
+				.catch(function(error) {
+					layer.tipsX(error);
+				});
+			},
+			getPageList() {
+				let _this = this;
+				_this.axios({
+					method: 'get',
+					//url: '/broker/business_school',
+					url: 'http://c.tonglianjituan.com/broker/business_school',
+					responseType: 'json',
+					data: {
+						'AuthToken': _this.$route.query.token,
+						'pageNo': 1,
+						'pageSize': 1000
+					}
+				})
+				.then(function(response) {
+					if(response.data.code == 200) {
+						let _data = response.data.data;
+						
+					} else {
+						layer.tipsX(response.data.msg);
+					}
+				})
+				.catch(function(error) {
+					layer.tipsX(error);
+				});
+			},
 			tabMain() {
 				
 			},
@@ -101,17 +135,19 @@
 			}
 		},
 		computed: {
-
+			
 		}
 	}
 </script>
 
 <style scoped>
+	nav{
+		width: 7.5rem;
+	}
 	nav>.nav-main {
-		display: flex;
 		box-sizing: border-box;
 		background-color: white;
-		width: 100%;
+		width: 7.5rem;
 		height: .9rem;
 		line-height: .9rem;
 		padding: 0 .3rem;
@@ -119,23 +155,28 @@
 		position: fixed;
 		left: 0;
 		top: .88rem;
+		overflow-x: scroll;
+	}
+	nav>.nav-main>ul{
+		/*width: 10rem;*/
 	}
 	nav>.nav-seat {
 		height: .9rem;
 	}
-	nav>.nav-main>div {
+	nav>.nav-main>ul>li {
+		float: left;
 		font-size: .28rem;
-		flex: 1;
 		text-align: center;
 		color: #4c4c4c;
+		width: 1.6rem;
 	}
 	
-	nav>.nav-main>div.active {
+	nav>.nav-main>ul>li.active {
 		color: rgb(255, 148, 25);
 		position: relative;
 	}
 	
-	nav>.nav-main>div.active::after {
+	nav>.nav-main>ul>li.active::after {
 		content: '';
 		position: absolute;
 		left: 50%;

public/appnew/src/components/publicEg/entrance.vue

@@ -10,6 +10,7 @@
 
 <script>
 	let _token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjo1NzQyLCJuYW1lIjoiXHU0ZThlXHU3NmZjXHU3NmZjIiwicGhvbmUiOiIxMzkxODkzNzc0MSIsImxldmVsIjoyMH0sInRpbWVTdGFtcF8iOjE1Mjg5NDIzNTh9.-HlJUkvPCCrfhacC9WKcWEiNzUHhL0PujDGONcwPtA0';
+	let _token2 = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjo1NzM5LCJuYW1lIjoiXHU2MDNiXHU2ZDRiXHU4YmQ1MSIsInBob25lIjoiMTU2MDE2NTIzNTMiLCJsZXZlbCI6MzB9LCJ0aW1lU3RhbXBfIjoxNTMwNjA2ODU4fQ.8jL49CjtBMV6BqmaKdJfd4pkGBazrAgQQrutb53Z3mY';
 	export default {
 		name: '',
 		data() {
@@ -23,7 +24,10 @@
 				},
 				{
 					'path': '/businessCollege',
-					'nameCustom': '商学院'
+					'nameCustom': '商学院',
+					'query': {
+						'token': _token2
+					}
 				},
 				{
 					'path': '/feeds',

public/resource/js/agent.js

@@ -300,6 +300,7 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
                     var temp = document.getElementById('agent_tpl').innerHTML;
                     var doTempl = doT.template(temp);
                     $("#agentlist").html(doTempl(data.data.list));
+			 		agent.getEvaluationList();
                     /*分页代码*/
                     add_page(data.data.total, pageNo, agent.pageSize, agent.getList);
                     $ ('.J_preview').preview ();
@@ -387,6 +388,39 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
                     }
                 }
             });
+        },
+        getEvaluationList:function(){
+        	console.log('经纪人列表加载完成');
+        	console.log($('.number-evaluation').attr("data-id"));
+				var _data={
+				};
+				
+//			    var	_imgUploadLunbo = $('#agentlist').find(tr).find(td).eq(6); //详情页轮播图ul
+			    console.log(_imgUploadLunbo);
+//				var _xiangqingPicObj = _imgUploadLunbo.find('li>img');
+//			    var	_urlCut = location.origin + '/resource/lib/Attachments/images/';//要截取的部分url
+				$.each(_imgUploadLunbo, function(i, item) {
+					_data['agents_id[' + i + ']'] = item.attr("data-id");
+				});
+//				console.log(_data);
+        	$.ajax ({
+                url: '/index/agentEvaluateNumAndFraction',
+                type: 'GET',
+                async: true,
+                data: _data,
+                dataType: 'json',
+                success: function (data) {
+                    if (data.code == 200 && data.data != null) {
+                        var str = '';
+                        $.each(data.data, function(i,item) {
+                            str += '<option value="'+item.id+'">'+item.district_name+'</option>';
+                        });
+                        $('[name=district_id]').append(str);
+                        fn && fn();
+                    }
+                }
+            });
+        	
         }
     };
     return agent;

public/resource/template/agent_template_tpl.html

 <script id="agent_tpl" type="text/template">
     [% if(it) { %]
     [% for(var item in it){ %]
-    <tr data-groupname="[%= it[item]['groupname'] %]">
+    <tr data-groupname="[%= it[item]['groupname'] %]" class="text-center">
         <td>[%= it[item]["create_time"] %]</td>
         <td>[%= it[item]["id"] %]</td>
         <td>
@@ -13,8 +13,9 @@
         <td>[%= it[item]["phone"] %]</td>
         <td>[%= it[item]["groupname"] %]</td>
         <!--增加评价次数 分数2.2-->
-        <td>[%= it[item]["groupname"] %]</td>
-        <td>[%= it[item]["groupname"] %]</td>
+        <td class="number-evaluation text-center" data-id='[%= it[item]["id"] %]'>--</td>
+        <td class="score-evaluation text-center" data-id='[%= it[item]["id"] %]'>--</td>
+        
         <!--<td><span class="fa fa-check text-success"></span></td>-->
         <td>
             <a class="btn1 btn-success edit" href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>编辑</a>

public/resource/template/schoolBusiness_template_tpl.html

+<script id="schoolBusiness_list_tpl" type="text/template">
+    [% if(it) { %]
+    [% for(var item in it){ %]
+    <tr>
+        <td>[%= it[item]['create_time'] %]</td>
+        <!--<td>[%= hideTel(it[item]["name"]) %]</td>-->
+        <td>[% if(it[item]["name"] != null) { %]
+                [%= it[item]["name"] %]
+            [% } %]
+        </td>
+        <td>[%= it[item]["title"] %]</td>
+        <td>[% if(it[item]["label_name"] != null) { %]
+                [%= it[item]["label_name"] %]
+            [% } %]
+        </td>
+        <!--<td>[%= it[item]["label_name"] %]</td>-->
+        <!--没有评论数字段-->
+        <td>[%= it[item]["create_time"] %]</td>
+        
+        <td>
+            <a class="btn1 btn-success announcement-details" href="#modal-record" data-toggle="modal" data-createTime='[%= it[item]["create_time"] %]' data-title='[%= it[item]["title"] %]' data-content='[%= it[item]["content"] %]'>
+                编辑
+            </a>
+             [% if(check_auth('index/delNews')) { %]
+             	<!--删除权限-->
+            <a class="btn1 btn-success announcement-del" href="#modal-delete"  data-toggle="modal" data-id='[%= it[item]["id"] %]'>删除</a>
+            [% } %]
+            
+        </td>
+    </tr>
+    [% } %]
+    [% }else{ %]
+    <tr>
+        <td colspan="7" style="text-align:center;"> 暂无数据</td>
+    </tr>
+    [% } %]
+</script>
+