123

App.vue

@@ -158,9 +158,35 @@
 							aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : res.data[
 								0].id
 						})
+						that.handleLabelList( res.data[0].id)
+						that.handlePublicRecord(res.data[0].id)
 					}
 				}).catch(err => {})
 			},
+			// 公共卡片列表
+			handleLabelList(id) {
+				let that = this
+				that.$model.getLabelList({
+					aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : id
+				}).then(res => {
+					console.log("公共卡片项目", res)
+					if (res.code == 0) {
+						that.$store.commit('changeLabelList', res.data)
+					}
+				})
+			},
+			// 公共手动记录内容
+			handlePublicRecord(id) {
+				let that = this
+				that.$model.getPublicRecord({
+					aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : id
+				}).then(res => {
+					console.log("公共手动记录", res)
+					if (res.code == 0) {
+						that.$store.commit('changePublicRecord', res.data)
+					}
+				})
+			},
 		}
 	}
 </script>

element/manuallyAdd/record.vue

@@ -1,15 +1,99 @@
 <template>
-	<view v-if="isRecord">
+	<view class="wrapper" v-if="isRecord">
-		<recordWeight v-if="rtype==2"></recordWeight>
+		<view class="bg" @click="onTap">
-		<skipAdd v-if="rtype==6"></skipAdd>
+			<view class="edit" @click.stop>
-		<lungAdd v-if="rtype==8"></lungAdd>
+				<view class="title">手动记录</view>
+				<view class="editem">
+					<view class="left">日期</view>
+					<view class="right">
+						<picker mode="date" :end="endDate" @change="changeLog" fields="time">
+							<view class="uni-input">{{regTime?regTime:'请选择'}}</view>
+							<icon class="iconfont icon-arrow-down-bold"></icon>
+						</picker>
+					</view>
+				</view>
+				<view v-if="rtype!=8">
+					<!-- 项目 -->
+					<view class="editem" v-if="info&&info.list.length">
+						<view class="left">项目</view>
+						<view class="right">
+							<picker :range="info.list" range-key="name" :value="lableTndex" @change="bindLableChange">
+								<view class="uni-input">{{name?name:'请选择'}}</view>
+								<icon class="iconfont icon-arrow-down-bold"></icon>
+							</picker>
+						</view>
+					</view>
+					<!-- 项目时长类型 -->
+					<view class="editem" v-if="info&&info.list.length&&listType">
+						<view class="name">{{listType==1?'个数':'时长'}}</view>
+						<view class="right" v-if="listType==4">
+							<picker mode="multiSelector" :range="timeList" :value="timesTndex" @change="bindTimeChange">
+								<view class="size16">{{time_m?time_m+':':'请选择'}}{{time_s?time_s:''}}</view>
+							</picker>
+							<uni-icons type="bottom" class="ml-15 c666"></uni-icons>
+						</view>
+						<view class="right" v-if="listType!=4">
+							<input :type="listType==1?'number':'digit'" v-model="number" placeholder="请输入">
+							{{listType==1?'个':'秒'}}
+						</view>
+					</view>
+					<view class="editem" v-if="info.time">
+						<view class="name">时长</view>
+						<view class="right">
+							<picker mode="multiSelector" :range="timeList" :value="timesTndex" @change="bindTimeChange">
+								<view class="size16">{{time_m?time_m+':':'请选择'}}{{time_s?time_s:''}}</view>
+							</picker>
+							<uni-icons type="bottom" class="ml-15 c666"></uni-icons>
+						</view>
+					</view>
+					<view class="editem" v-if="info.number">
+						<view class="name">个数</view>
+						<view class="right">
+							<input type="number" v-model="number" placeholder="请输入">个
+						</view>
+					</view>
+					<view class="editem" v-if="info.height">
+						<view class="name">身高</view>
+						<view class="right">
+							<input type="digit" v-model="height" placeholder="请输入身高" />cm
+						</view>
+					</view>
+					<view class="editem" v-if="info.weight">
+						<view class="name">体重</view>
+						<view class="right">
+							<input type="digit" v-model="weight" placeholder="请输入体重">kg
+						</view>
+					</view>
+				</view>
+				<!-- 肺活量 -->
+				<view class="" v-if="rtype==8">
+					<view class="editem">
+						<view class="name">第一次</view>
+						<view class="right">
+							<input type="digit" v-model="number1" placeholder="请输入">ml
+						</view>
+					</view>
+					<view class="editem">
+						<view class="name">第二次</view>
+						<view class="right">
+							<input type="digit" v-model="number2" placeholder="请输入">ml
+						</view>
+					</view>
+					<view class="editem">
+						<view class="name">第三次</view>
+						<view class="right">
+							<input type="digit" v-model="number3" placeholder="请输入">ml
+						</view>
+					</view>
+				</view>
+				<view class="btn close" @click="onTap()">取消</view>
+				<view class="btn" @click="handleTarget">确定</view>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
-	import recordWeight from './weightAdd.vue';
-	import skipAdd from "./skipAdd.vue"
-	import lungAdd from "./lungAdd.vue"
 	import {
 		mapState
 	} from "vuex";
@@ -17,19 +101,244 @@
 		props: {
 			rtype: {},
 		},
-		components: {
-			skipAdd,
-			lungAdd,
-			recordWeight
-		},
 		data() {
-			return {}
+			return {
+				name: "",
+				number: '',
+				regTime: "",
+				number1: '',
+				number2: "",
+				number3: "",
+				time_m: "",
+				time_s: "",
+				weight: "",
+				height: '',
+				timeList: [],
+				lableTndex: 0,
+				timesTndex: [1, 0],
+				listType: null,
+			}
 		},
 		computed: {
-			...mapState(["isRecord"]),
+			...mapState(["isRecord", "PublicRecord", "labelList"]),
+			info() {
+				let that = this
+				let info = {}
+				if (that.PublicRecord.length) {
+					that.PublicRecord.forEach(ite => {
+						if (ite.id == that.rtype) {
+							info = ite
+						}
+					})
+				}
+				console.log("手动内容", info, that.rtype)
+				return info
+			},
+			endDate() {
+				return this.$tools.getDate("start")
+			},
+			startDate() {
+				return this.$tools.GetDateStr(-90);
+			},
+		},
+		mounted() {
+			let that = this
+			that.timeList = that.$tools.gethms()
 		},
 		methods: {
-
+			// 手动记录
+			handleTarget() {
+				let that = this
+				if (that.rtype == 2) {
+					that.handleinsertmeasure()
+				} else if (that.rtype == 6) {
+					that.handleskipmeasure()
+				} else if (that.rtype == 8) {
+					that.handleLungmeasure()
+				} else {
+					that.handlepublicmeasure()
+				}
+			},
+			// 通用
+			handlepublicmeasure() {
+				let that = this
+				if (!that.name) {
+					that.$tools.msg("请选择测量项目")
+					return
+				}
+				if (!that.regTime) {
+					that.$tools.msg("请选择日期")
+					return
+				}
+				if (that.listType == 4 && (!that.time_m || !that.time_s)) {
+					that.$tools.msg("请输入时长")
+					return
+				}
+				if (that.listType != 4 && !that.number) {
+					let msg = that.listType == 1 ? '请输入个数' : '请输入时长'
+					that.$tools.msg(msg)
+					return
+				}
+				let time_m = that.time_m + ':' + that.time_s
+				that.$model.getpublicmeasure({
+					acd_id: that.rtype,
+					name: that.name,
+					record_time: that.regTime,
+					data: that.listType == 4 ? time_m : that.number,
+					aud_id: uni.getStorageSync('userid')
+				}).then(res => {
+					if (res.code != 0) return
+					that.$tools.msg(res.msg)
+					that.$store.dispatch("getUserInfo", {
+						aud_id: uni.getStorageSync('userid'),
+					})
+					that.$store.dispatch("getPublicContent", {
+						acd_id: that.acd_id,
+						aud_id: uni.getStorageSync('userid')
+					})
+					that.onTap()
+				})
+			},
+			// 肺活量
+			handleLungmeasure() {
+				let that = this
+				if (!that.regTime) {
+					that.$tools.msg("请选择测量日期")
+					return
+				}
+				if (!that.number1) {
+					that.$tools.msg("请输入第一次吸气值")
+					return
+				}
+				if (!that.number2) {
+					that.$tools.msg("请输入第二次吸气值")
+					return
+				}
+				if (!that.number3) {
+					that.$tools.msg("请输入第三次吸气值")
+					return
+				}
+				that.$model.getLungmeasure({
+					aud_id: uni.getStorageSync('userid'),
+					time: that.regTime,
+					one: that.number1,
+					two: that.number2,
+					three: that.number3
+				}).then(res => {
+					if (res.code != 0) return
+					that.$tools.msg(res.msg)
+					that.$store.dispatch("getUserInfo", {
+						aud_id: uni.getStorageSync('userid')
+					})
+					that.$store.dispatch("getLungResult", {
+						aud_id: uni.getStorageSync('userid')
+					})
+					that.onTap()
+				})
+			},
+			// 跳绳
+			handleskipmeasure() {
+				let that = this
+				if (!that.regTime) {
+					that.$tools.msg("请选择测量日期")
+					return
+				}
+				if (!that.number) {
+					that.$tools.msg("请输入跳绳个数")
+					return
+				}
+				that.$model.getskipmeasure({
+					aud_id: uni.getStorageSync('userid'),
+					num: that.number,
+					r_time: that.regTime,
+					time_m: that.time_m,
+					time_s: that.time_s,
+					type: "free",
+				}).then(res => {
+					if (res.code != 0) return
+					that.$tools.msg(res.msg)
+					that.$store.dispatch("getUserInfo", {
+						aud_id: uni.getStorageSync('userid'),
+					})
+					that.$store.dispatch("getSkipResult", {
+						aud_id: uni.getStorageSync('userid'),
+					})
+					that.onTap()
+				})
+			},
+			// 身体
+			handleinsertmeasure() {
+				let that = this
+				if (!that.regTime) {
+					that.$tools.msg("请选择测量日期")
+					return
+				}
+				if (!that.height) {
+					that.$tools.msg("请输入测量身高")
+					return
+				}
+				if (!that.weight) {
+					that.$tools.msg("请输入测量体重")
+					return
+				}
+				that.$model.getinsertmeasure({
+					aud_id: uni.getStorageSync('userid'),
+					time: that.regTime,
+					weight: that.weight,
+					height: that.height,
+				}).then(res => {
+					if (res.code != 0) return
+					that.$tools.msg(res.msg)
+					that.$store.dispatch("getResult", {
+						aud_id: uni.getStorageSync('userid')
+					})
+					that.$store.dispatch("getUserInfo", {
+						aud_id: uni.getStorageSync('userid')
+					})
+					that.$store.dispatch("GetBodyTrendList", {
+						aud_id: uni.getStorageSync('userid'),
+						s_time: that.startDate,
+						e_time: that.endDate
+					})
+					that.onTap()
+				})
+			},
+			bindTimeChange(e) {
+				let that = this
+				let m = e.target.value[0]
+				let s = e.target.value[1]
+				that.timesTndex = e.target.value
+				let time_m = Number(that.timeList[0][m].substring(0, 2)) * 60
+				let time_s = Number(that.timeList[1][s].substring(0, 2))
+				that.time_m = that.timeList[0][m].substring(0, 2)
+				that.time_s = that.timeList[1][s].substring(0, 2)
+			},
+			bindLableChange(e) {
+				console.log("e", e)
+				this.name = this.info.list[e.detail.value].name
+				this.listType = this.info.list[e.detail.value].type
+			},
+			changeLog(e) {
+				this.regTime = e.detail.value
+			},
+			onTap() {
+				let that = this
+				that.name = ""
+				that.weight = ""
+				that.height = ""
+				that.regTime = ""
+				that.number1 = ""
+				that.number2 = ""
+				that.number3 = ""
+				that.number = ''
+				that.time_m = ""
+				that.time_s = ""
+				that.timeList = []
+				that.lableTndex = 0
+				that.timesTndex = [1, 0]
+				that.listType = null
+				that.$store.commit("changeRecord", false);
+			},
 		}
 	}
 </script>

element/ren-calendar/ren-calendar.vue

@@ -2,11 +2,11 @@
     <view class="calendar-wrapper">
         <view class="header">
             <view class="pre" @click="changeMonth('pre')">
-                <uni-icons type="back"></uni-icons>
+                <uni-icons type="back" size="26"></uni-icons>
             </view>
             <view>{{y+'年'+formatNum(m)+'月'}}</view>
             <view class="next" @click="changeMonth('next')">
-                <uni-icons type="forward"></uni-icons>
+                <uni-icons type="forward" size="26"></uni-icons>
             </view>
         </view>
         <view class="week">

manifest.json

@@ -2,8 +2,8 @@
     "name" : "Reedaw",
     "appid" : "__UNI__20604F1",
     "description" : "面向儿童青少年的健康体质测量APP",
-    "versionName" : "1.2.1",
+    "versionName" : "1.2.2",
-    "versionCode" : 121,
+    "versionCode" : 122,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

@@ -269,6 +269,36 @@
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
+		},
+		{
+			"path": "pages/PublicCards/PublicCards",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/PublicCards/charts",
+			"style": {
+				"navigationBarTitleText": "运动曲线"
+			}
+		},
+		{
+			"path": "pages/PublicCards/history",
+			"style": {
+				"navigationBarTitleText": "历史记录"
+			}
+		},
+		{
+			"path": "pages/PublicCards/contrast",
+			"style": {
+				"navigationBarTitleText": "数据对比"
+			}
+		},
+		{
+			"path": "pages/PublicCards/pkdetail",
+			"style": {
+				"navigationBarTitleText": "对比详情"
+			}
 		}
 	],
 	"globalStyle": {

pages/business/search.vue

@@ -54,7 +54,7 @@
 			uni.onBluetoothAdapterStateChange(function(res) {
 				that.$store.commit("changeBluetooth", res.available);
 			})
-
+			console.log("搜索")
 		},
 		onUnload() {
 			console.log("onUnload")

pages/home/home.vue

@@ -4,11 +4,13 @@
 		<headerIndex :isArea="false"></headerIndex>
 		<!-- 卡片数据 -->
 		<view class="radius50"></view>
-		<view class="list">
+		<view class="list" v-if="user">
 			<view v-for="(item,index) in user.card_data_list">
 				<!-- 标题 -->
-				<view class="card box" @click="handlerReport(item)"
+				<view class="card box" @click="handlerReport(item)" :style="{'backgroundColor':item.background_color}">
-					:class="[item.acd_id==6?'tiao':item.acd_id==8?'fei':'shen']">
+					<view class="boxBg">
+						<image :src="item.background_pic"></image>
+					</view>
 					<view class="title border">
 						<view class="name2">{{item.card_name}}</view>
 						<view class="time">
@@ -79,7 +81,7 @@
 		},
 		onLoad(options) {
 			let that = this
-			console.log("首页options",options)
+			console.log("首页options", options)
 			if (options && options.type == 1) {
 				that.handleUserList()
 			}
@@ -124,13 +126,37 @@
 							aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : res.data[0].id
 						})
 						that.$store.dispatch("getCardList", {
-							aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : res.data[
+							aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : res.data[0].id
-								0].id
 						})
+						that.handleLabelList(res.data[0].id)
+						that.handlePublicRecord(res.data[0].id)
 					}
 				}).catch(err => {})
 			},
-
+			// 公共卡片列表
+			handleLabelList(id) {
+				let that = this
+				that.$model.getLabelList({
+					aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : id
+				}).then(res => {
+					console.log("公共卡片项目", res)
+					if (res.code == 0) {
+						that.$store.commit('changeLabelList', res.data)
+					}
+				})
+			},
+			// 公共手动记录内容
+			handlePublicRecord(id) {
+				let that = this
+				that.$model.getPublicRecord({
+					aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : id
+				}).then(res => {
+					console.log("公共手动记录", res)
+					if (res.code == 0) {
+						that.$store.commit('changePublicRecord', res.data)
+					}
+				})
+			},
 			// 设置数据页卡片
 			handleCard() {
 				uni.navigateTo({
@@ -241,44 +267,18 @@
 		overflow: hidden;
 	}
 
-	.tiao {
+	.boxBg {
-		background-color: #dff3fe !important;
-
-	}
-
-	.fei {
-		background-color: #fcf0f0 !important;
-	}
-
-
-	.card::after {
-		content: '';
 		width: 250rpx;
 		height: 215rpx;
 		position: absolute;
 		right: 15px;
 		z-index: 9;
-	}
-
-	.shen::after {
-		content: '';
 		bottom: -50rpx;
-		background: url("../../static/Fill0.png") no-repeat;
-		background-size: 100% 100%;
-	}
 
-	.tiao:after {
+		image {
-		content: '';
+			width: 100%;
-		bottom: -50rpx;
+			height: 100%;
-		background: url("../../static/Fill2.png") no-repeat;
+		}
-		background-size: 100% 100%;
-	}
-
-	.fei:after {
-		content: '';
-		bottom: -50rpx;
-		background: url("../../static/Fill1.png") no-repeat;
-		background-size: 100% 100%;
 	}
 
 	.content {

pages/my/userInfo.vue

@@ -4,7 +4,7 @@
 			<view class="headbox">
 				<view class="touxiang">
 					<image v-if="headimg" :src="headimg" class="headimage" />
-					<icon v-else class="iconfont icon-user-filling headimage" @click="handleUpImg"></icon>
+					<icon v-else class="iconfont icon-user-filling headimage"></icon>
 				</view>
 			</view>
 			<view class="lan border-bottom">
@@ -213,36 +213,6 @@
 				this.index = e.detail.value
 				this.memInfo.grade = this.gradeList[e.target.value].id
 			},
-			handleUpImg() {
-				let that = this
-				uni.chooseImage({
-					count: 1, //默认9
-					sourceType: ['album', 'camera'], //从相册选择
-					success: function(res) {
-						uni.showLoading({
-							title: '识别中...'
-						})
-						uni.uploadFile({
-							header: {
-								'Authorization': "Bearer " + uni.getStorageSync('token'),
-								'X-Authorization': "Bearer " + uni.getStorageSync('refreshtoken'),
-							},
-							url: that.$http.baseUrl + '/api/app/wxopen/uploadimg',
-							filePath: res.tempFilePaths[0],
-							name: 'file',
-							success: (res) => {
-								let attr = JSON.parse(res.data)
-								uni.hideLoading()
-								if (attr.code == 0) {
-									that.headimg = attr.data.url
-								} else {
-									that.$tools.msg("不支持该图像")
-								}
-							}
-						})
-					}
-				})
-			},
 		},
 
 	};

pages/notepad/notepad.vue

@@ -5,7 +5,7 @@
 			<view class="tips" v-for="(ite,ind) in list" :key="ind">
 				<view class="title">{{ite.recordtime}}</view>
 				<uni-swipe-action>
-					<uni-swipe-action-item :right-options="ite.options" @click="handledetail($event, ind)">
+					<uni-swipe-action-item :right-options="ite.options">
 						<view class="list">
 							<icon class="t-icon t-icon-a-ziyuan265"></icon>
 							<view class="info">
@@ -47,64 +47,8 @@
 			let that = this
 			that.page = 1
 			that.list = []
-			that.token = uni.getStorageSync("token")
 		},
-		onReachBottom() {
+		methods: {}
-			let that = this
-			if (!this.lastPage || this.page >= this.lastPage) {
-				uni.showToast({
-					title: '没有更多数据！',
-					icon: 'none'
-				})
-				return
-			}
-			this.page++
-		},
-		methods: {
-			getList(page) {
-				let that = this
-				that.$model.getNotepadList({
-					pageNo: this.page,
-					pageSize: 10,
-					petid: uni.getStorageSync('petid'),
-				}).then((res) => {
-					if (res.code != 0) return
-					this.list = this.list.concat(res.data.rows)
-					this.lastPage = res.data.totalpage
-				})
-			},
-			handledetail(e, index) {
-				let that = this
-				if (e.content.text === "删除") {
-					let id = that.list[index].id
-					uni.showModal({
-						title: '友情提示',
-						content: '确定删除该条记录吗？',
-						success: function(res) {
-							if (res.confirm) {
-								that.$model.getNotepadDelete({
-									id: id
-								}).then(res => {
-									if (res.code != 0) return
-									that.list.splice(index, 1)
-									that.$tools.msg("删除成功！");
-								})
-							} else if (res.cancel) {
-								that.$tools.msg("您已取消删除！");
-							}
-						}
-					});
-					return
-				}
-			},
-
-			handleAdd() {
-				uni.navigateTo({
-					url: "/pages/notepad/addNotepad"
-				})
-			},
-
-		}
 	}
 </script>
 

pages/skiping/skip.vue

@@ -267,12 +267,14 @@
 						}
 					});
 				} else {
+					that.islink = -1
 					that.$tools.msg("请先添加设备！")
-					setTimeout(function() {
+					that.$Bluetooth.stopBluetoothDevicesDiscovery()
-						uni.switchTab({
+					// setTimeout(function() {
-							url: "/pages/business/business"
+					// 	uni.switchTab({
-						})
+					// 		url: "/pages/business/business"
-					}, 500)
+					// 	})
+					// }, 500)
 				}
 			},
 			// 设备排查

store/actions.js

@@ -96,6 +96,19 @@ export default {
 			}
 		})
 	},
+	// 公共
+	getPublicContent({ //报告
+		commit
+	}, account) {
+		return model.getpublicContent(account).then((res) => {
+			console.log("公共报告", res)
+			if (res.code == 0) {
+				commit('changePublicContent', res.data)
+			} else {
+				commit('changePublicContent', null)
+			}
+		})
+	},
 
 	GetBodyTrendList({ //趋势
 		commit
@@ -105,7 +118,6 @@ export default {
 			commit('changeTrend', res.data)
 		})
 	},
-
 	gethistoryList({ // 获取历史记录
 		commit
 	}, account) {

store/index.js

@@ -31,8 +31,10 @@ export default new Vuex.Store({
 		MeasureSkip: null,
 		MeasureResult: null,
 		MeasureLung: null,
+		PublicContent: null,
 		familayList: [],
 		historyList: [],
+		PublicRecord: [],
 		cardList: {
 			user: [],
 			all: []
@@ -49,6 +51,7 @@ export default new Vuex.Store({
 		isBluetoothTyle: false,
 		LungLevel: [], //肺活量标准
 		devicesList: [], //筛选设备列表
+		labelList: [],
 		phoneInfo: {
 			info: {},
 			versionUrl: null,
@@ -90,6 +93,14 @@ export default new Vuex.Store({
 		changeMeasureLung(state, newData) {
 			state.MeasureLung = newData
 		},
+		// 公共
+		changePublicContent(state, newData) {
+			state.PublicContent = newData
+		},
+		// 公共手动记录内容
+		changePublicRecord(state, newData) {
+			state.PublicRecord = newData
+		},
 
 		// 信息弹框
 		changeEdit(state, newData) {
@@ -147,7 +158,12 @@ export default new Vuex.Store({
 		}, //
 		changedevicesList(state, newData) {
 			state.devicesList = newData
+		},
+		// 公共卡片
+		changeLabelList(state, newData) {
+			state.labelList = newData
 		}
+
 	},
 	// 模块化vuex
 	modules: {},

toolJs/https.js

@@ -1,6 +1,7 @@
 import tools from '@/toolJs/tools.js'
 import store from '../store'
-let baseUrl = "http://tc.pcxbc.com"
+// let baseUrl = "http://tc.pcxbc.com"
+let baseUrl = "http://tc.pcxbc.com/testedition"
 const httpRequest = (url, method = "get", data) => {
 	data.token = uni.getStorageSync('token')
 	data.aan_id = uni.getStorageSync('aan_id')

toolJs/model.js

@@ -273,4 +273,54 @@ export default {
 			return res
 		})
 	},
+	// 通用卡片
+	getPublicRecord(param) { //手动记录内容
+		return http.post("/obtain_manual_record_content", param).then(res => {
+			return res
+		})
+	},
+	getpublicmeasure(param) { //手动记录
+		return http.post("/public_data_save", param).then(res => {
+			return res
+		})
+	},
+	getpublicContent(param) { //卡片内容详情
+		return http.post("/get_card_content", param).then(res => {
+			return res
+		})
+	},
+	getLabelList(param) { //卡片内标签项目信息
+		return http.post("/get_label_list", param).then(res => {
+			return res
+		})
+	},
+	getPublicTrendList(param) { //公共曲线
+		return http.post("/card_motion_curve", param).then(res => {
+			return res
+		})
+	},
+	getPublicHistory(param) { //公共历史
+		return http.post("/obtain_history_record", param).then(res => {
+			return res
+		})
+	},
+	getPublicHistoryDel(param) { //公共历史删除
+		return http.post("/history_record_del", param).then(res => {
+			return res
+		})
+	},
+	getPublicResultdiff(param) { //公共对比
+		return http.post("/data_contrast_obtain_data", param).then(res => {
+			if (res.code == 0) {
+				let Dlist = []
+				for (var i = 0; i < res.data.length; i++) {
+					if (!Dlist.includes(res.data[i].r_t)) { //includes 检测数组是否有某个值
+						Dlist.push(res.data[i].r_t);
+					}
+				}
+				res.Dlist = Dlist
+			}
+			return res
+		})
+	},
 }

unpackage/cache/appleConfig.ini

@@ -1,5 +1,5 @@
 [appleAppid]
-appleAppid=api.zztc.pcxbc
+appleAppid=com.pcxbc.tc
 
 [iosStyle]
 iosStyle=

unpackage/cache/certdataios

@@ -1,3 +1,3 @@
-iosProfile=C:/Users/gh/WPS Cloud Files/appuploader_win_latest/ios描述文件.mobileprovision
+iosProfile=F:/证书/发布Development描述文件/Reedaw.mobileprovision
-ioscertFile=C:\Users\gh\WPS Cloud Files\appuploader_win_latest\ios开发证书.p12
+ioscertFile=F:/证书/发布Development证书/证书.p12
-ioscertPassword=e7l98mrpB0Uj4WWFn9y0Mg==
+ioscertPassword=ep/Tdjka4Y7WYqDB6/S7dw==

unpackage/dist/build/app-plus/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__20604F1","name":"Reedaw","version":{"name":"1.2.1","code":121},"description":"面向儿童青少年的健康体质测量APP","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Bluetooth":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#37cc92"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"template":"index.html","compattible":{"ignoreVersion":true},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"androidStyle":"common","android":{"hdpi":"static/logo.png","xhdpi":"static/logo.png","xxhdpi":"static/logo.png"},"useOriginalMsgbox":true},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["arm64-v8a","x86"]},"apple":{"dSYMs":false,"idfa":false,"privacyDescription":{"NSBluetoothAlwaysUsageDescription":"需要蓝牙权限来连接设备","NSBluetoothPeripheralUsageDescription":"使用蓝牙与外设通信"}},"plugins":{"share":{},"ad":{},"geolocation":{"system":{"__platform__":["ios"]}},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"uniStatistics":{"enable":false,"version":"2"},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.24","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#333","fontSize":"13px","selectedColor":"#37cc92","backgroundColor":"#fff","list":[{"pagePath":"pages/home/home","iconPath":"static/shou.png","selectedIconPath":"static/shou2.png","text":"首页"},{"pagePath":"pages/score/score","iconPath":"static/ping.png","selectedIconPath":"static/ping2.png","text":"估分"},{"pagePath":"pages/business/business","iconPath":"static/bei.png","selectedIconPath":"static/bei2.png","text":"设备"},{"pagePath":"pages/my/me","iconPath":"static/wo.png","selectedIconPath":"static/wo2.png","text":"我的"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"},"locale":"zh-Hans"}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__20604F1","name":"Reedaw","version":{"name":"1.2.2","code":122},"description":"面向儿童青少年的健康体质测量APP","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Bluetooth":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#37cc92"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"template":"index.html","compattible":{"ignoreVersion":true},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"androidStyle":"common","android":{"hdpi":"static/logo.png","xhdpi":"static/logo.png","xxhdpi":"static/logo.png"},"useOriginalMsgbox":true},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["arm64-v8a","x86"]},"apple":{"dSYMs":false,"idfa":false,"privacyDescription":{"NSBluetoothAlwaysUsageDescription":"需要蓝牙权限来连接设备","NSBluetoothPeripheralUsageDescription":"使用蓝牙与外设通信"}},"plugins":{"share":{},"ad":{},"geolocation":{"system":{"__platform__":["ios"]}},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"uniStatistics":{"enable":false,"version":"2"},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.24","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#333","fontSize":"13px","selectedColor":"#37cc92","backgroundColor":"#fff","list":[{"pagePath":"pages/home/home","iconPath":"static/shou.png","selectedIconPath":"static/shou2.png","text":"首页"},{"pagePath":"pages/score/score","iconPath":"static/ping.png","selectedIconPath":"static/ping2.png","text":"估分"},{"pagePath":"pages/business/business","iconPath":"static/bei.png","selectedIconPath":"static/bei2.png","text":"设备"},{"pagePath":"pages/my/me","iconPath":"static/wo.png","selectedIconPath":"static/wo2.png","text":"我的"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"},"locale":"zh-Hans"}

unpackage/dist/dev/app-plus/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__20604F1","name":"Reedaw","version":{"name":"1.2.1","code":121},"description":"面向儿童青少年的健康体质测量APP","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Bluetooth":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#37cc92"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"template":"index.html","compattible":{"ignoreVersion":true},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"androidStyle":"common","android":{"hdpi":"static/logo.png","xhdpi":"static/logo.png","xxhdpi":"static/logo.png"},"useOriginalMsgbox":true},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["arm64-v8a","x86"]},"apple":{"dSYMs":false,"idfa":false,"privacyDescription":{"NSBluetoothAlwaysUsageDescription":"需要蓝牙权限来连接设备","NSBluetoothPeripheralUsageDescription":"使用蓝牙与外设通信"}},"plugins":{"share":{},"ad":{},"geolocation":{"system":{"__platform__":["ios"]}},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"uniStatistics":{"enable":false,"version":"2"},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.24","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#333","fontSize":"13px","selectedColor":"#37cc92","backgroundColor":"#fff","list":[{"pagePath":"pages/home/home","iconPath":"static/shou.png","selectedIconPath":"static/shou2.png","text":"首页"},{"pagePath":"pages/score/score","iconPath":"static/ping.png","selectedIconPath":"static/ping2.png","text":"估分"},{"pagePath":"pages/business/business","iconPath":"static/bei.png","selectedIconPath":"static/bei2.png","text":"设备"},{"pagePath":"pages/my/me","iconPath":"static/wo.png","selectedIconPath":"static/wo2.png","text":"我的"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"},"locale":"zh-Hans"}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__20604F1","name":"Reedaw","version":{"name":"1.2.2","code":122},"description":"面向儿童青少年的健康体质测量APP","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Bluetooth":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#37cc92"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"template":"index.html","compattible":{"ignoreVersion":true},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"androidStyle":"common","android":{"hdpi":"static/logo.png","xhdpi":"static/logo.png","xxhdpi":"static/logo.png"},"useOriginalMsgbox":true},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["arm64-v8a","x86"]},"apple":{"dSYMs":false,"idfa":false,"privacyDescription":{"NSBluetoothAlwaysUsageDescription":"需要蓝牙权限来连接设备","NSBluetoothPeripheralUsageDescription":"使用蓝牙与外设通信"}},"plugins":{"share":{},"ad":{},"geolocation":{"system":{"__platform__":["ios"]}},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"uniStatistics":{"enable":false,"version":"2"},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.24","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#333","fontSize":"13px","selectedColor":"#37cc92","backgroundColor":"#fff","list":[{"pagePath":"pages/home/home","iconPath":"static/shou.png","selectedIconPath":"static/shou2.png","text":"首页"},{"pagePath":"pages/score/score","iconPath":"static/ping.png","selectedIconPath":"static/ping2.png","text":"估分"},{"pagePath":"pages/business/business","iconPath":"static/bei.png","selectedIconPath":"static/bei2.png","text":"设备"},{"pagePath":"pages/my/me","iconPath":"static/wo.png","selectedIconPath":"static/wo2.png","text":"我的"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"},"locale":"zh-Hans"}