Merge branch 'develop' of http://106.15.103.105/lihuizhen/ec-report-refactor into develop

components/NormalTable/NormalTable.vue

@@ -4,10 +4,10 @@
 		<scroll-view scroll-x="true" >
 			<view class="scroll-view_H">
 				<u-table >
-					<u-tr>
-						<u-th style="width: 150px;" v-for="(item, index) in columns" :key="index">{{item.title}}</u-th>
+					<u-tr v-if="elementInfo.table.tableHeader.showHeader" :style="[headerStyle]">
+						<u-th  v-for="(item, index) in columns" :key="index">{{item.title}}</u-th>
 					</u-tr>
-					<u-tr v-for="(cell, cellIndex) in chartTables" :key="cellIndex" >
+					<u-tr v-for="(cell, cellIndex) in chartTables" :key="cellIndex" @tap="cellClick(cell)">
 						<u-td style="width: 150px;"  v-for="(item, index) in columns" :key="index">
 							{{cell[item.dataIndex]}}
 						</u-td>
@@ -32,6 +32,19 @@
 				chartTables: []
 			};
 		},
+		mounted() {
+			
+		},
+		computed: {
+			headerStyle() {
+				return {
+					'width': '150rpx',
+					'height': this.elementInfo.table.tableHeader.headerRowHeight + 'px',
+					'color': this.elementInfo.table.tableHeader.titleColor,
+					'background-color': this.elementInfo.table.tableHeader.backgroundColor,
+				}
+			}
+		},
 		methods: {
 			initChart() {
 				this.$nextTick(() => {
@@ -39,6 +52,12 @@
 					this.chartTables = this.elementData.dataList.chartTables
 				})
 			},
+			cellClick(e) {
+				const { index, data } = this.elementInfo.child
+				const paramName = this.elementInfo.table.primaryKey
+				const value = e[paramName]
+				uni.$emit('handleLinkParams', { index, paramName, value: value })
+			}
 		}
 	}
 </script>

pages/center/password.vue

@@ -63,6 +63,10 @@
         methods: {
             // 登录
             submit() {
+                if (this.params.password1 != this.params.password2) {
+                    this.$u.toast('两次输入密码不一致')
+                    return
+                }
             	this.$refs.uForm.validate(async valid => {
             		if (valid) {
             			let res = await this.$u.api.changePassword(this.params)