1

reado-app/.hbuilderx/launch.json

@@ -1,20 +1,23 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"mp-weixin" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-android"
+        }
     ]
 }

reado-app/pages/login/index.vue

@@ -24,9 +24,9 @@
 						</u-col>
 					</u-row>
 					<!-- #ifdef APP-PLUS -->
-					<u-form-item label="自动登录" style="position:relative;" class="form-item">
+					<!-- <u-form-item label="自动登录" style="position:relative;" class="form-item">
 						<u-switch v-model="loginBtn" class="login-btn"></u-switch>
-					</u-form-item>
+					</u-form-item> -->
 					<!-- #endif -->
 					<view class="form-btn">
 						<u-button type="primary" text="登录" @click="getHttpPublicKey"></u-button>

reado-app/pages/message/index.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<Nav title="消息" :isBack="false" />
 		<view class="section">
-			<u-list finished-text="没有更多了" @scrolltolower="scrolltolower" height="85vh">
+			<u-list finished-text="没有更多了" @scrolltolower="scrolltolower" height="85vh" :key="key">
 				<view v-for="item in msgList" :key="item.id" @click="handelDetail(item)">
 					<u-list-item>
 						<u-cell-group class="cell">
@@ -33,15 +33,17 @@
 				// 查询参数
 				queryParams: {
 					page: 1,
-					limit: 10
+					limit: 20
 				},
 				// 列表数据
-				msgList: []
+				msgList: [],
+				key: 0
 			};
 		},
 		onShow() {
-			this.queryParams.limit=10
+			this.queryParams.limit = 20
 			this.getMsgList()
+			this.key++
 		},
 		onPullDownRefresh() {
 			this.queryParams.limit += 10
@@ -89,10 +91,10 @@
 		width: 400rpx;
 		height: 400rpx;
 		position: absolute;
-		top: 30%;
+		top: 50%;
 		left: 50%;
 		margin-top: -200rpx;
-		margin-left: -200rpx
+		margin-left: -200rpx;
 	}
 
 	.cell {

reado-app/pages/reportForm/index.vue

@@ -2,8 +2,8 @@
 	<view class="content">
 		<Nav title="报表" :isBack="false" />
 		<view class="section">
-			<u-list finished-text="没有更多了" @scrolltolower="scrolltolower" height="85vh">
-				<view v-for="item in reportList" :key="item.id" @click="handelDetail(item.id)">
+			<u-list finished-text="没有更多了" @scrolltolower="scrolltolower" height="85vh" :key="key">
+				<view v-for="item in reportList" :key="item.id" @click="handelDetail(item.id)" class="item">
 					<u-list-item>
 						<u-cell-group>
 							<u-cell :title="item.reportTableName" :label="item.createTime" isLink></u-cell>
@@ -26,15 +26,17 @@
 				// 查询参数
 				queryParams: {
 					page: 1,
-					limit: 10
+					limit: 20
 				},
 				// 列表数据
-				reportList: []
+				reportList: [],
+				key: 0
 			};
 		},
 		onShow() {
-			this.queryParams.limit=10
+			this.queryParams.limit = 20
 			this.getAllReport()
+			this.key++
 		},
 		onPullDownRefresh() {
 			this.queryParams.limit += 10

reado-app/pages/reportForm/report-detail/index.vue

@@ -1,12 +1,12 @@
 <template>
 	<view class="content">
-		<Nav :title="title" isBack isRight @goBack="handelBack" @change="change" />
+		<Nav :title="title" isBack isRight @goBack="handelBack" />
 		<view id="luckysheet"
-			style="margin:0px;padding:0px;position:absolute;width:100%;height:95%;left: 0px;top: 80rpx;">
+			style="margin:0px;padding:0px;position:absolute;width:100%;height:87%;left: 0px;top: 80rpx;">
 		</view>
 		<view class="btn">
-			<u-button size="mini" type="primary" text="运行记录" @click="openRecord" hoverStayTime="0"></u-button>
-		</view>
+			<u-button type="primary" size="middle" text="运行记录" @click="openRecord" hoverStayTime="0"></u-button>
+		</view> -->
 		<!-- 运行记录弹框 -->
 		<u-popup :show="show" mode="center" :customStyle="{'padding':'10rpx','width':'80%'}">
 			<uni-table stripe emptyText="暂无更多数据">
@@ -21,7 +21,8 @@
 					</uni-tr>
 				</view>
 			</uni-table>
-			<u-button size="mini" type="primary" text="关闭" @click="show=false" style="width:30rpx;margin-top:10rpx" hoverStayTime="0">
+			<u-button size="middle" type="primary" text="关闭" @click="show=false" style="margin-top:10rpx"
+				hoverStayTime="0">
 			</u-button>
 		</u-popup>
 		<u-empty mode="data" icon="../../../static/data.png" v-if="!option">
@@ -36,11 +37,11 @@
 			return {
 				id: null,
 				title: null,
-				option: null,
+				option: {},
 				show: false,
 				page: 1,
 				limit: 10,
-				recordList: null,
+				recordList: [],
 			}
 		},
 		onLoad(options) {
@@ -68,14 +69,16 @@
 						this.option = tableData.option
 						if (this.option) {
 							tableData.option.allowEdit = false
-							luckysheet.create(this.option)
 							this.showToolbar(tableData)
+							luckysheet.create(this.option)
 						}
 					}
 				})
 			},
 			showToolbar(tableData) {
 				tableData.showtoolbar = false
+				this.option.enableAddRow = false
+				this.option.enableAddBackTop = false
 				let data = tableData.option.showtoolbarConfig
 				for (let item in data) {
 					data[item] = false
@@ -115,15 +118,20 @@
 		display: none !important;
 	}
 
+	::v-deep .u-button {
+		width: 160rpx;
+		height: 60rpx
+	}
+
 	.btn {
-		z-index: 999;
 		position: absolute;
-		bottom: 30rpx;
-		right: 0;
+		left: 50%;
+		bottom: 2%;
+		margin-left: -80rpx;
 	}
-	
-	.uni-td{
-		width:600rpx;
+
+	.uni-td {
+		width: 600rpx;
 		overflow: hidden;
 		text-overflow: ellipsis;
 	}

reado-app/pages/reportForm/report-detail/recordDetail.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<Nav :title="title" isBack isRight @goBack="handelBack" @change="change" />
+		<Nav :title="title" isBack isRight @goBack="handelBack" />
 		<view id="luckysheet"
 			style="margin:0px;padding:0px;position:absolute;width:100%;height:95%;left: 0px;top: 80rpx;">
 		</view>
@@ -40,14 +40,16 @@
 						this.option = tableData.option
 						if (this.option) {
 							tableData.option.allowEdit = false
-							luckysheet.create(this.option)
 							this.showToolbar(tableData)
+							luckysheet.create(this.option)
 						}
 					}
 				})
 			},
 			showToolbar(tableData) {
 				tableData.showtoolbar = false
+				this.option.enableAddRow=false
+				this.option.enableAddBackTop=false
 				let data = tableData.option.showtoolbarConfig
 				for (let item in data) {
 					data[item] = false