解决钉钉兼容性问题

src/assets/css/reset.css

@@ -1,5 +1,11 @@
 body, h1, h2, h3, h4, h5, h6, hr, p, blockquote, dl, dt, dd, ul, ol, li, pre, form, fieldset, legend, button, input, textarea, th, td { margin:0; padding:0; }
-body, button, input, select, textarea {font-size:14px;color: #303133; }
+body, button, input, select, textarea {
+	font-size:14px;
+	color: #303133;
+    font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif;
+	-webkit-font-smoothing: antialiased;
+	-webkit-tap-highlight-color: transparent;
+}
 h1, h2, h3, h4, h5, h6{ font-size:100%; }
 address, cite, dfn, em, var { font-style:normal; }
 code, kbd, pre, samp { font-family:couriernew, courier, monospace; }

src/components/UserImage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="box-sizing: border-box;">
     <img v-if="info.img_url" class="logo_img" :src="info.img_url" :width="width" :height="height" />
     <div v-else class="user_name_div" :style="{
 	   width: width,
@@ -111,6 +111,7 @@
     text-align: center;
     color: #fff;
     margin: 0 auto;
+	box-sizing: border-box;
   }
   .logo_img{
     border-radius: 50%;

src/home.vue

@@ -176,7 +176,7 @@
                 :key="index"
                 style="text-align:center;width:80px;cursor:pointer;margin:0 20px;"
               >
-                <div class="" style="cursor:pointer;position: relative;">
+                <div class="" style="cursor:pointer;position: relative;height: 60px;">
                   <svg-icon
                     v-if="item.rank <= 3"
                     :icon-class="
@@ -1610,7 +1610,9 @@ export default {
   ::v-deep .el-radio-button__inner{
     border: 0px solid #DCDFE6;
     border-radius: 5px;
-    padding:10px 18px;
+    padding:0px 18px;
+	height: 36px;
+	line-height: 38px;
   }
   ::v-deep .el-radio-button--medium .el-radio-button__inner{
     padding: 7px 13px;

src/index.vue

@@ -22,14 +22,20 @@
 		<el-container class="main">
 			<el-aside>
 				<el-menu :default-active="defaultActive" class="el-menu-vertical-demo" :router="true" @select="activeRouter" >
-					<el-submenu :index="index.toString()" v-for="(item, index) in routers" :key="index">
-						<template slot="title"><span class="iconfont titleIcon" :class="item.icon" style="font-size: 20px;"></span><span style="margin-left: 5px;">{{item.name}}</span></template>
-						<template v-for="(item2, index2) in item.children">
-							<el-menu-item :index="returnIndex(index,index2)" :ref="item2.path" :route="item2.path" :key="index2" class="font-flex-word">
-								<span slot="title" style="margin-left: 10px;width:120px">{{ item2.name }}</span>
-							</el-menu-item>
-						</template>
-					</el-submenu>
+					<template v-for="(item, index) in routers">
+						<el-submenu :index="index.toString()"  :key="index" v-if="item.children.length>1">
+							<template slot="title"><span class="iconfont titleIcon" :class="item.icon" style="font-size: 20px;"></span><span style="margin-left: 5px;">{{item.name}}</span></template>
+							<template v-for="(item2, index2) in item.children">
+								<el-menu-item :index="returnIndex(index,index2)" :ref="item2.path" :route="item2.path" :key="index2" class="font-flex-word">
+									<span slot="title" style="margin-left: 10px;width:120px">{{ item2.name }}</span>
+								</el-menu-item>
+							</template>
+						</el-submenu>
+						<el-menu-item :index="returnIndex(index,index)" :route="item.children[0].path" :ref="item.children[0].path" v-else>
+								  <span class="iconfont titleIcon" :class="item.icon" style="font-size: 20px;"></span>
+								  <span slot="title" style="margin-left: 5px;">{{ item.children[0].name }}</span>
+						</el-menu-item>
+					</template>	  
 				</el-menu>
 			</el-aside>
 			<el-main>

src/init.vue

@@ -10,7 +10,7 @@
 		<el-dialog title="通知" :visible.sync="dialogFormVisible" width="480px" :show-close="false" :close-on-click-modal="false">
 			<div>
 				<div style="font-size: 18px;">尊敬的用户:</div>
-				<div style="margin: 10px 0;">您当前的套餐已到期，如需继续使用，请点击续费详情进行续费。</div>
+				<div style="margin: 10px 0;">您当前的套餐已到期，如需继续使用，请联系客服或扫描下方二维码进行续费。</div>
 			</div>
 			<div style="border-radius: 15px;border: 1px solid #f1f1f1;padding: 10px; width: 276px;box-sizing: border-box;margin: 0 auto;">
 				<img src="./assets/image/code.png"/>

src/main.js

@@ -67,7 +67,7 @@ Vue.prototype.$axios = (type, url, data,heaStr) => {
 			    var ajax = Vue.prototype.$http(json).then(res => {
 			        resolve(res);
 			    }).catch(error => {   //中断请求和请求出错的处理
-			            if (error.message == "interrupt") {
+			            if (error == "interrupt") {
 			                console.log('已中断请求');
 			                return;
 			            } else {

src/views/abPoint/award_punish.vue

@@ -17,7 +17,7 @@
 			</el-col>
 		</el-row>
 
-		<el-table v-if="tabs == 'success'" :data="dataList" stripe fit v-loading="table_loading" @row-click="open_detail">
+		<el-table v-if="tabs == 'success'" res="table1" :data="dataList" stripe fit v-loading="table_loading" @row-click="open_detail">
 			<el-table-column label="姓名" prop="employee_id" align="left">
 				<template slot-scope="scope">
 					<div class="flex-box flex-contet-conter">
@@ -26,8 +26,13 @@
 					</div>
 				</template>
 			</el-table-column>
-			<el-table-column prop="remark" show-overflow-tooltip label="奖扣内容"></el-table-column>
-			<el-table-column prop="point" label="积分" width="120">
+			
+			<el-table-column show-overflow-tooltip label="奖扣内容">
+				<template slot-scope="scope">
+					{{ scope.row.remark_data.customize }}
+				</template>
+			</el-table-column>
+			<el-table-column  label="积分" width="120">
 				<template slot-scope="scope">
 					<span :class="{ color_green: scope.row.point < 0, color_red: scope.row.point > 0 }">
 						<span v-show="scope.row.point > 0">+</span>
@@ -35,7 +40,8 @@
 					</span>
 				</template>
 			</el-table-column>
-			<el-table-column prop="create_time" label="奖扣时间" width="150">
+			
+			<el-table-column label="奖扣时间" width="150">
 				<template slot-scope="scope">
 					{{ cuttString(scope.row.create_time) }}
 				</template>
@@ -45,7 +51,7 @@
 			</template>
 		</el-table>
 
-		<el-table v-if="tabs !== 'success'" :data="dataList" stripe fit v-loading="table_loading" @row-click="open_detail1">
+		<el-table v-else :data="dataList2" res="table2" stripe fit v-loading="table_loading" @row-click="open_detail1">
 			<el-table-column label="姓名" prop="employee_id" align="left">
 				<template slot-scope="scope">
 					<div class="flex-box flex-contet-conter">
@@ -54,13 +60,16 @@
 					</div>
 				</template>
 			</el-table-column>
-			<el-table-column prop="remark" show-overflow-tooltip label="奖扣内容">
+			<el-table-column show-overflow-tooltip label="奖扣内容">
 				<template slot-scope="scope">
 					{{ scope.row.remark.customize }}
 				</template>
 			</el-table-column>
-			<el-table-column prop="event_time" label="奖扣时间" width="150"></el-table-column>
-
+			<el-table-column label="奖扣时间" width="150">
+				<template slot-scope="scope">
+					{{ cuttString(scope.row.event_time) }}
+				</template>
+			</el-table-column>
 			<template slot="empty">
 				<noData></noData>
 			</template>
@@ -272,6 +281,7 @@ export default {
 			},
 			tabs: 'success',
 			dataList: [],
+			dataList2: [],
 			pageLimit: 10,
 			keyword: '',
 			showTitle: false,
@@ -319,7 +329,7 @@ export default {
 
 			employee_name: JSON.parse(localStorage.getItem('SET_EMPLOYEE_MAP')),
 			fileList: [],
-			userId:167
+			userId:'',
 		};
 	},
 	components: {
@@ -328,16 +338,13 @@ export default {
 		noData
 	},
 	mounted() {
-		// if(this.$route.query.type == 1){
-		//   this.point_a()
-		// }else if(this.$route.query.type == 2){
-		//   this.point_b()
-		// }
 		this.getData()
+		this.userId=this.$getUserData().id
 	},
 	watch: {
 		tabs(val) {
 			this.dataList = [];
+			this.dataList2 = [];
 			this.formData.total = 0;
 			this.keyword = '';
 			this.formData.page = 1;
@@ -449,7 +456,12 @@ export default {
 			this.$axios('get', this.tabs == 'success' ? '/api/integral/statistics/integral' : '/api/integral/review/entry/list', data)
 				.then(res => {
 					if (res.data.code == 1) {
-						this.dataList = res.data.data.list;
+						if(this.tabs == 'success'){
+							this.dataList = res.data.data.list;
+						}else{
+							this.dataList2 = res.data.data.list;
+						}
+						
 						this.formData.total = res.data.data.total;
 					}
 				})