Browse Source

Signed-off-by: zhaobao <528046418@qq.com>

zhaobao 1 year ago
parent
commit
f8159189b1
52 changed files with 1165 additions and 56 deletions
  1. 30 1
      App.vue
  2. 52 12
      components/getPhone.vue
  3. 10 1
      pages.json
  4. 2 2
      pages/history/history.vue
  5. 22 2
      pages/index/index.vue
  6. 1 1
      pages/myCenter/myCenter.vue
  7. 75 0
      pages/service_agreement/service_agreement.vue
  8. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  9. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/getPhone.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/history/detail/detail.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/history/history.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/myCenter.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/personalData/personalData.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/updatePassword/updatePassword.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/service_agreement/service_agreement.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-card/components/uni-card/uni-card.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  29. 2 1
      unpackage/dist/dev/mp-weixin/app.json
  30. 31 2
      unpackage/dist/dev/mp-weixin/common/main.js
  31. 7 7
      unpackage/dist/dev/mp-weixin/common/vendor.js
  32. 38 10
      unpackage/dist/dev/mp-weixin/components/getPhone.js
  33. 0 1
      unpackage/dist/dev/mp-weixin/components/getPhone.wxml
  34. 10 0
      unpackage/dist/dev/mp-weixin/components/getPhone.wxss
  35. 2 2
      unpackage/dist/dev/mp-weixin/pages/history/history.js
  36. 22 2
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  37. 38 10
      unpackage/dist/dev/mp-weixin/pages/login/index.js
  38. 10 0
      unpackage/dist/dev/mp-weixin/pages/login/index.wxss
  39. 1 1
      unpackage/dist/dev/mp-weixin/pages/myCenter/myCenter.js
  40. 200 0
      unpackage/dist/dev/mp-weixin/pages/service_agreement/service_agreement.js
  41. 5 0
      unpackage/dist/dev/mp-weixin/pages/service_agreement/service_agreement.json
  42. 3 0
      unpackage/dist/dev/mp-weixin/pages/service_agreement/service_agreement.wxml
  43. 26 0
      unpackage/dist/dev/mp-weixin/pages/service_agreement/service_agreement.wxss
  44. 2 1
      unpackage/dist/dev/mp-weixin/project.config.json
  45. 1 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js
  46. 6 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.json
  47. 0 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.wxml
  48. 264 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.wxss
  49. 1 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js
  50. 4 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.json
  51. 1 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.wxml
  52. 299 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.wxss

+ 30 - 1
App.vue

@@ -5,10 +5,39 @@
 			console.log('App Launch')
 		},
 		onShow: function() {
-			console.log('App Show')
+			this.updateApp()
 		},
 		onHide: function() {
 			console.log('App Hide')
+		},
+		methods:{
+			updateApp(){
+				try{
+					const updateManager = uni.getUpdateManager();
+					updateManager.onCheckForUpdate(function (res) {
+					  // 请求完新版本信息的回调
+					  console.log(res.hasUpdate);
+					});
+					updateManager.onUpdateReady(function (res) {
+					  uni.showModal({
+						title: '更新提示',
+						content: '新版本已经准备好,是否重启应用?',
+						success(res) {
+						  if (res.confirm) {
+							// 新的版本已经下载好,调用 applyUpdate 应用新版本并重启
+							updateManager.applyUpdate();
+						  }
+						}
+					  });
+					});
+					updateManager.onUpdateFailed(function (res) {
+					  // 新的版本下载失败
+					});					
+				}catch(err){
+					console.log(err)
+				}
+
+			}
 		}
 	}
 </script>

+ 52 - 12
components/getPhone.vue

@@ -8,9 +8,21 @@
 					<image class="userAvatar" src="/static/components/avatar.png"></image>
 					<view class="title">使用该功能,需要申请获取以下权限</view>
 					<view class="tip">申请获取你微信绑定的手机号</view>
+					<view class="service_agreement">
+						<checkbox-group @change="changeStatus">
+							<label>
+								<checkbox :checked="service_agreement_status" style="transform:scale(0.7)"  />
+								<text>我同意<text class="title">GOOMove</text>使用我授权的电话号码作为我的登录账号,查看</text>															
+							</label>
+						</checkbox-group>
+						<text class="link" @click="linkTo">《用户服务协议》</text>
+						<text>及</text>
+						<text class="link" @click="linkTo">《个人信息保护政策》</text>
+					</view>
 					<view class="card-actions">
 						<button @click="cancel" size="mini" class="bt">拒绝</button>
-						<button class="confirm bt" size="mini" open-type="getPhoneNumber" @getphonenumber="getphonenumber">允许</button>
+						<button class="confirm bt" size="mini"  @click="confirm" v-if="!service_agreement_status">允许</button>
+						<button class="confirm bt" size="mini" open-type="getPhoneNumber" @getphonenumber="getphonenumber" v-else >允许</button>
 					</view>				
 					<!-- #endif -->		
 					<!-- #ifndef MP-WEIXIN -->
@@ -50,18 +62,23 @@
 		data(){
 			return{
 				isAuthorize:false,
-				phoneNumber:""
+				phoneNumber:"",
+				service_agreement_status:false
 			}
 		},
 		methods:{
 			cancel(){
 				this.$emit('cancel')
-				uni.showToast({
-					icon:'none',
-					title:"拒绝将无法使用"
-				})
+				this.isAuthorize=true
 			},
 			confirm(){
+				if(!this.service_agreement_status){
+					uni.showToast({
+						icon:'none',
+						title:"请先阅读服务协议"
+					})		
+					return					
+				}
 				var reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;    //11位手机号码正则
 				if(!reg_tel.test(this.phoneNumber)){
 					uni.showToast({
@@ -83,14 +100,16 @@
 				}).catch((res)=>{})
 			},
 			getphonenumber(e){
-				const {code,encryptedData,iv}=e.detail
-				if(!code){
-					this.$emit('cancel')
+				if(!this.service_agreement_status){
 					uni.showToast({
 						icon:'none',
-						title:"拒绝将无法使用",
-						duration:3000
-					})				
+						title:"请先阅读服务协议"
+					})		
+					return					
+				}
+				const {code,encryptedData,iv}=e.detail
+				if(!code){
+					this.$emit('cancel')			
 				}else{
 					getPhoneNumberApi({code}).then((res)=>{
 						const accountName=res.data.phone_info.purePhoneNumber
@@ -135,6 +154,15 @@
 						})
 					}
 				})
+			},
+			linkTo(){
+				uni.navigateTo({
+					url:'/pages/service_agreement/service_agreement'
+				})
+			},
+			changeStatus(){
+				this.service_agreement_status=!this.service_agreement_status
+				console.log(this.service_agreement_status)
 			}
 		}
 	}
@@ -205,5 +233,17 @@
 				}						
 			}		
 		}
+		.service_agreement{
+			checkbox-group{
+				display: inline-block;
+			}
+			.title{
+				font-weight: 600;
+				padding: 0 2rpx;
+			}
+			.link{
+				color: #409eff;
+			}
+		}
 	}
 </style>

+ 10 - 1
pages.json

@@ -60,7 +60,16 @@
                 "enablePullDownRefresh": false
             }
             
-        }		
+        }
+		,{
+		    "path" : "pages/service_agreement/service_agreement",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "服务协议",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

+ 2 - 2
pages/history/history.vue

@@ -60,7 +60,7 @@
 				total:0,
 				items:[],
 				sportVedioPath:"",
-				isLogin:false
+				isLogin:true
 			}
 		},
 		components:{
@@ -109,7 +109,7 @@
 				this.total=0
 				this.limit=15
 				this.page=1
-				this.initPhoneModal()
+				// this.initPhoneModal()
 			},
 			onClick(item){
 				let gradeId=item.gradeId

+ 22 - 2
pages/index/index.vue

@@ -63,7 +63,7 @@
 				iscollapse:false,
 				gradeId:undefined,
 				result:{sportGrade:undefined},
-				isLogin:false,
+				isLogin:true,
 				sportType:undefined,
 				motionType:[
 					{ 
@@ -121,7 +121,7 @@
 			getPhone
 		},
 		onShow() {
-			this.initPhoneModal()			
+			// this.initPhoneModal()			
 		},
 		destroyed() {
 			this.status=0;
@@ -143,6 +143,14 @@
 			},			
 			upload(){
 				const sportType=this.sportType
+				const accountName=uni.getStorageSync('phone')
+				if(!accountName){
+					this.isLogin=false
+					this.$nextTick(()=>{
+						this.$refs['getPhone'].isAuthorize=false
+					})
+					return
+				}
 				if(!sportType){
 						uni.showToast({
 							icon:'error',
@@ -243,6 +251,18 @@
 				}
 				return true
 			}
+		},
+		onShareAppMessage() {
+			return {
+			  title: 'GOOMove',
+			  path: '/pages/index/index'
+			}			
+		},
+		onShareTimeline() {
+			return {
+			  title: 'GOOMove',
+			  path: '/pages/index/index'
+			}			
 		}
 	}
 </script>

+ 1 - 1
pages/myCenter/myCenter.vue

@@ -55,7 +55,7 @@
 				school:"--",
 				faceSrc:"",
 				cameraModel:false,
-				isLogin:false
+				isLogin:true
 			}
 		},
 		components:{

+ 75 - 0
pages/service_agreement/service_agreement.vue

@@ -0,0 +1,75 @@
+<template>
+	<view class="service_agreement_page">
+	<h2>《服务协议》</h2>
+	<p>用户隐私协议</p>
+	<p>尊敬的用户,欢迎阅读本协议:</p>
+	<p>您的隐私对我们(“我们”或“我们的”)很重要。并且我们致力于保护您的隐私。因此,我们制定了隐私政策。本隐私政策(“隐私政策”)解释了当您使用软件和服务时,我们如何处理您的信息并保护您的隐私,以及与您的信息有关的可用权利和选项。我们认为,您有权了解我们在使用软件和服务(“软件和服务”)时可能收集和使用的信息的做法。如果您不同意此处设定的条款和条件,请不要使用该软件和服务。</p>
+	<p>1.我们处理的信息以及处理您的信息的目的
+	我们将处理两大类信息。我们的使命是不断改进我们的软件和服务,并为您提供新的或更好的体验。作为此任务的一部分,我们将您的信息用于以下目的。如果出现用于处理您的个人数据的任何新目的,我们将通过对本隐私政策进行相应的更改,在开始处理有关该新目的的信息之前通知您。</p>
+	<h3>2.保护个人信息</h3>
+	<p>1.1您授权的信息</p>
+	<p>授权的手机号码,仅仅作为登录账号使用,用于方便您查看自己的使用记录,我们既不会单独存储也不会与任何第三方共享。此信息对于您与我们之间的合同的适当履行是必要的。</p>
+	<h3>2.保护个人信息</h3>
+	<p>我们采取预防措施,包括行政,技术和物理措施,以保护您的个人信息免遭丢失,盗窃和滥用以及未经授权的访问,披露,更改和破坏。确保您的个人信息安全;我们会向所有员工传达我们的隐私和安全准则,并严格执行公司内部的隐私保护措施
+	不幸的是,互联网上的传输方法或电子存储方法都不是100%安全的。我们尽力保护您的个人信息,但是,我们不能保证其绝对安全。如果您的个人信息因安全受到破坏而被盗用,我们将立即按照适用法律通知您。
+	如果您对我们的软件和服务的安全性有任何疑问,可以通过下面显示的电子邮件与我们联系。。</p>
+	<h3>3.与第三方共享信息</h3>
+	<p>除以下事件外,我们不会共享我们从您那里收集的任何个人识别信息:
+	<p>3.1如果法律要求我们披露您的信息,我们可能会视需要与执法机构或其他主管当局和任何第三方共享您的信息(例如,检测,预防或以其他方式解决欺诈,安全或技术问题) ;回应要求或满足任何法律程序,传票或政府要求;或保护小组用户,合作伙伴或公众的权利,财产或人身安全);</p>
+	<p>3.2如果团队经历了业务过渡,例如另一家公司的合并或收购,合并,控制权变更,重组或出售其全部或部分资产,则您的信息将包含在转让的资产中。</p>
+	<h3>4.第三方内容</h3>
+	<p>某些软件和服务可能包括和/或使您能够向其中添加内容。内容的形式可以是按钮,小工具,指向第三方广告,网站,产品和服务(包括搜索服务)的链接,以及第三方提供给您的其他方式(统称为“第三方内容和服务” ”)。此类第三方内容和服务的使用受其隐私政策的约束。您应了解,使用第三方内容和服务可能使这些第三方能够访问,收集,存储和/或共享您的信息,包括您的PII和非个人身份信息。为澄清起见,我们不对此类第三方内容和服务进行审查,批准,监控,认可,保证或作出任何陈述,并且您访问任何第三方内容和服务的风险由您自行承担。对于这些第三方内容和服务的实践,您的使用或无法使用或无法使用这些信息,我们不承担任何责任。您明确免除我们因使用此类第三方内容和服务而引起的任何责任。我们建议您在使用或访问任何第三方内容和服务之前,请阅读其条款,条件和隐私策。</p>
+	<h3>5.将数据传输到您的区域之外</h3>
+	<p>我们在国际空间工作,并向世界各地的用户提供我们的软件和服务。我们和为软件和服务提供自动数据处理技术的第三方组织可能会将跨边界的自动处理的信息从您所在的国家或地区转移到世界其他国家或地区。
+	根据法律要求,在此您位于EEA的任何地方,在此明确表示同意您在使用软件和服务后将您的数据传输到EEA以外的地方。您可以随时通过以下电子邮件与我们联系,以撤回您的同意。</p>
+	<h3>6.我们将如何保留您的个人数据</h3>
+	<p>我们通常会保留您的个人信息,直到您与我们之间履行合同并遵守我们的法律义务。如果您不再希望我们使用我们实际访问和存储的信息,则可以要求我们擦除您的个人信息并关闭您的帐户。
+	特别的,在本产品中的面部数据,仅用于功能使用过程中的识别、提取、操作,不做任何存储。
+	但是,如果为了遵守法律义务(征税,会计,审计)或为了维护安全和数据备份设置,防止欺诈或其他恶意行为而需要信息,某些数据可能仍会存储一段时间。</p>
+	<h3>7.您的数据权利</h3>
+	<p>您有权访问,修改,更正或删除我们可能收集的任何个人数据。为了行使这项权利,请通过电子邮件qzz1977@163.com与我们联系。如果您在欧洲经济区,则您有权(除少数例外情况):(i)请求访问和更正或删除您的个人信息; (ii)获得处理限制或反对处理您的个人信息; (iii)要求以数字格式提供您的个人信息的副本。您也有权向EEA的本地数据保护机构投诉有关处理您的个人信息的投诉。要行使这些权利,请通过电子邮件qzz1977@163.com与我们联系。</p>
+	<h3>8.更改隐私政策</h3>
+	<p>本隐私政策可能会不时更改。任何更改都将在软件界面上发布。您持续使用软件和服务将被视为您接受此类更新。</p>
+	<h3>9.隐私问题</h3>
+	<p>	在本协议中未声明的其他一切权利,仍归本公司所有。本公司保留对本协议的最终解释权利。	
+	如果您还有其他问题和建议,可以通过电子邮件qzz1977@163.com联系我们。</p>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.service_agreement_page{
+		padding: 20rpx;
+		h2{
+			font-size: 40rpx;
+			color: #000;
+			font-weight: 800;	
+			text-align: center;
+			line-height: 1.5;
+		}
+		h3{
+			font-size: 30rpx;
+			color: #424242;
+			font-weight: 800;
+			line-height: 1.5;
+		}
+		p{
+			font-size: 28rpx;
+			color: #666;
+			text-indent: 56rpx;
+			line-height: 1.8;
+		}
+	}
+</style>

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/getPhone.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/history/detail/detail.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/history/history.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/myCenter.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/personalData/personalData.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/updatePassword/updatePassword.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/service_agreement/service_agreement.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-card/components/uni-card/uni-card.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


+ 2 - 1
unpackage/dist/dev/mp-weixin/app.json

@@ -6,7 +6,8 @@
     "pages/history/detail/detail",
     "pages/login/index",
     "pages/myCenter/personalData/personalData",
-    "pages/myCenter/updatePassword/updatePassword"
+    "pages/myCenter/updatePassword/updatePassword",
+    "pages/service_agreement/service_agreement"
   ],
   "subPackages": [],
   "window": {

+ 31 - 2
unpackage/dist/dev/mp-weixin/common/main.js

@@ -91,7 +91,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
+/* WEBPACK VAR INJECTION */(function(uni) {
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -103,13 +103,42 @@ var _default = {
     console.log('App Launch');
   },
   onShow: function onShow() {
-    console.log('App Show');
+    this.updateApp();
   },
   onHide: function onHide() {
     console.log('App Hide');
+  },
+  methods: {
+    updateApp: function updateApp() {
+      try {
+        var updateManager = uni.getUpdateManager();
+        updateManager.onCheckForUpdate(function (res) {
+          // 请求完新版本信息的回调
+          console.log(res.hasUpdate);
+        });
+        updateManager.onUpdateReady(function (res) {
+          uni.showModal({
+            title: '更新提示',
+            content: '新版本已经准备好,是否重启应用?',
+            success: function success(res) {
+              if (res.confirm) {
+                // 新的版本已经下载好,调用 applyUpdate 应用新版本并重启
+                updateManager.applyUpdate();
+              }
+            }
+          });
+        });
+        updateManager.onUpdateFailed(function (res) {
+          // 新的版本下载失败
+        });
+      } catch (err) {
+        console.log(err);
+      }
+    }
   }
 };
 exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
 

+ 7 - 7
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -779,8 +779,8 @@ function populateParameters(result) {
     appVersion: "1.0.0",
     appVersionCode: "100",
     appLanguage: getAppLanguage(hostLanguage),
-    uniCompileVersion: "3.7.9",
-    uniRuntimeVersion: "3.7.9",
+    uniCompileVersion: "3.7.11",
+    uniRuntimeVersion: "3.7.11",
     uniPlatform: undefined || "mp-weixin",
     deviceBrand: deviceBrand,
     deviceModel: model,
@@ -1556,7 +1556,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"motor-scores-app","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"motor-scores-app","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败,请尽量确保 data 函数中不访问 vm 对象,否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8913,7 +8913,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"motor-scores-app","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"motor-scores-app","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8934,14 +8934,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"motor-scores-app","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"motor-scores-app","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"motor-scores-app","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"motor-scores-app","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9037,7 +9037,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"motor-scores-app","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"motor-scores-app","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));

+ 38 - 10
unpackage/dist/dev/mp-weixin/components/getPhone.js

@@ -187,6 +187,18 @@ var _user = __webpack_require__(/*! @/api/user.js */ 42);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   props: {
     showByPlatform: {
@@ -197,19 +209,24 @@ var _default = {
   data: function data() {
     return {
       isAuthorize: false,
-      phoneNumber: ""
+      phoneNumber: "",
+      service_agreement_status: false
     };
   },
   methods: {
     cancel: function cancel() {
       this.$emit('cancel');
-      uni.showToast({
-        icon: 'none',
-        title: "拒绝将无法使用"
-      });
+      this.isAuthorize = true;
     },
     confirm: function confirm() {
       var _this = this;
+      if (!this.service_agreement_status) {
+        uni.showToast({
+          icon: 'none',
+          title: "请先阅读服务协议"
+        });
+        return;
+      }
       var reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/; //11位手机号码正则
       if (!reg_tel.test(this.phoneNumber)) {
         uni.showToast({
@@ -232,17 +249,19 @@ var _default = {
     },
     getphonenumber: function getphonenumber(e) {
       var _this2 = this;
+      if (!this.service_agreement_status) {
+        uni.showToast({
+          icon: 'none',
+          title: "请先阅读服务协议"
+        });
+        return;
+      }
       var _e$detail = e.detail,
         code = _e$detail.code,
         encryptedData = _e$detail.encryptedData,
         iv = _e$detail.iv;
       if (!code) {
         this.$emit('cancel');
-        uni.showToast({
-          icon: 'none',
-          title: "拒绝将无法使用",
-          duration: 3000
-        });
       } else {
         (0, _user.getPhoneNumberApi)({
           code: code
@@ -289,6 +308,15 @@ var _default = {
           });
         }
       });
+    },
+    linkTo: function linkTo() {
+      uni.navigateTo({
+        url: '/pages/service_agreement/service_agreement'
+      });
+    },
+    changeStatus: function changeStatus() {
+      this.service_agreement_status = !this.service_agreement_status;
+      console.log(this.service_agreement_status);
     }
   }
 };

File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/mp-weixin/components/getPhone.wxml


+ 10 - 0
unpackage/dist/dev/mp-weixin/components/getPhone.wxss

@@ -65,4 +65,14 @@
   border-color: #409eff;
   margin-left: 10rpx;
 }
+.phone-wrap .service_agreement checkbox-group.data-v-62293bf3 {
+  display: inline-block;
+}
+.phone-wrap .service_agreement .title.data-v-62293bf3 {
+  font-weight: 600;
+  padding: 0 2rpx;
+}
+.phone-wrap .service_agreement .link.data-v-62293bf3 {
+  color: #409eff;
+}
 

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/history/history.js

@@ -257,7 +257,7 @@ var _default = {
       total: 0,
       items: [],
       sportVedioPath: "",
-      isLogin: false
+      isLogin: true
     };
   },
   components: {
@@ -309,7 +309,7 @@ var _default = {
       this.total = 0;
       this.limit = 15;
       this.page = 1;
-      this.initPhoneModal();
+      // this.initPhoneModal()
     },
     onClick: function onClick(item) {
       var gradeId = item.gradeId;

+ 22 - 2
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -252,7 +252,7 @@ var _default = {
       result: {
         sportGrade: undefined
       },
-      isLogin: false,
+      isLogin: true,
       sportType: undefined,
       motionType: [{
         value: "0000",
@@ -301,7 +301,7 @@ var _default = {
     getPhone: getPhone
   },
   onShow: function onShow() {
-    this.initPhoneModal();
+    // this.initPhoneModal()			
   },
   destroyed: function destroyed() {
     this.status = 0;
@@ -325,6 +325,14 @@ var _default = {
     upload: function upload() {
       var _this2 = this;
       var sportType = this.sportType;
+      var accountName = uni.getStorageSync('phone');
+      if (!accountName) {
+        this.isLogin = false;
+        this.$nextTick(function () {
+          _this2.$refs['getPhone'].isAuthorize = false;
+        });
+        return;
+      }
       if (!sportType) {
         uni.showToast({
           icon: 'error',
@@ -432,6 +440,18 @@ var _default = {
       }
       return true;
     }
+  },
+  onShareAppMessage: function onShareAppMessage() {
+    return {
+      title: 'GOOMove',
+      path: '/pages/index/index'
+    };
+  },
+  onShareTimeline: function onShareTimeline() {
+    return {
+      title: 'GOOMove',
+      path: '/pages/index/index'
+    };
   }
 };
 exports.default = _default;

+ 38 - 10
unpackage/dist/dev/mp-weixin/pages/login/index.js

@@ -423,6 +423,18 @@ var _user = __webpack_require__(/*! @/api/user.js */ 42);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   props: {
     showByPlatform: {
@@ -433,19 +445,24 @@ var _default = {
   data: function data() {
     return {
       isAuthorize: false,
-      phoneNumber: ""
+      phoneNumber: "",
+      service_agreement_status: false
     };
   },
   methods: {
     cancel: function cancel() {
       this.$emit('cancel');
-      uni.showToast({
-        icon: 'none',
-        title: "拒绝将无法使用"
-      });
+      this.isAuthorize = true;
     },
     confirm: function confirm() {
       var _this = this;
+      if (!this.service_agreement_status) {
+        uni.showToast({
+          icon: 'none',
+          title: "请先阅读服务协议"
+        });
+        return;
+      }
       var reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/; //11位手机号码正则
       if (!reg_tel.test(this.phoneNumber)) {
         uni.showToast({
@@ -468,17 +485,19 @@ var _default = {
     },
     getphonenumber: function getphonenumber(e) {
       var _this2 = this;
+      if (!this.service_agreement_status) {
+        uni.showToast({
+          icon: 'none',
+          title: "请先阅读服务协议"
+        });
+        return;
+      }
       var _e$detail = e.detail,
         code = _e$detail.code,
         encryptedData = _e$detail.encryptedData,
         iv = _e$detail.iv;
       if (!code) {
         this.$emit('cancel');
-        uni.showToast({
-          icon: 'none',
-          title: "拒绝将无法使用",
-          duration: 3000
-        });
       } else {
         (0, _user.getPhoneNumberApi)({
           code: code
@@ -525,6 +544,15 @@ var _default = {
           });
         }
       });
+    },
+    linkTo: function linkTo() {
+      uni.navigateTo({
+        url: '/pages/service_agreement/service_agreement'
+      });
+    },
+    changeStatus: function changeStatus() {
+      this.service_agreement_status = !this.service_agreement_status;
+      console.log(this.service_agreement_status);
     }
   }
 };

+ 10 - 0
unpackage/dist/dev/mp-weixin/pages/login/index.wxss

@@ -65,6 +65,16 @@
   border-color: #409eff;
   margin-left: 10rpx;
 }
+.phone-wrap .service_agreement checkbox-group.data-v-62293bf3 {
+  display: inline-block;
+}
+.phone-wrap .service_agreement .title.data-v-62293bf3 {
+  font-weight: 600;
+  padding: 0 2rpx;
+}
+.phone-wrap .service_agreement .link.data-v-62293bf3 {
+  color: #409eff;
+}
 
 @charset "UTF-8";
 /* 水平间距 */

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/myCenter/myCenter.js

@@ -232,7 +232,7 @@ var _default = {
       school: "--",
       faceSrc: "",
       cameraModel: false,
-      isLogin: false
+      isLogin: true
     };
   },
   components: {

File diff suppressed because it is too large
+ 200 - 0
unpackage/dist/dev/mp-weixin/pages/service_agreement/service_agreement.js


+ 5 - 0
unpackage/dist/dev/mp-weixin/pages/service_agreement/service_agreement.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "服务协议",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

File diff suppressed because it is too large
+ 3 - 0
unpackage/dist/dev/mp-weixin/pages/service_agreement/service_agreement.wxml


+ 26 - 0
unpackage/dist/dev/mp-weixin/pages/service_agreement/service_agreement.wxss

@@ -0,0 +1,26 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.service_agreement_page {
+  padding: 20rpx;
+}
+.service_agreement_page ._h2 {
+  font-size: 40rpx;
+  color: #000;
+  font-weight: 800;
+  text-align: center;
+  line-height: 1.5;
+}
+.service_agreement_page ._h3 {
+  font-size: 30rpx;
+  color: #424242;
+  font-weight: 800;
+  line-height: 1.5;
+}
+.service_agreement_page ._p {
+  font-size: 28rpx;
+  color: #666;
+  text-indent: 56rpx;
+  line-height: 1.8;
+}
+

+ 2 - 1
unpackage/dist/dev/mp-weixin/project.config.json

@@ -15,7 +15,8 @@
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
-    }
+    },
+    "ignoreUploadUnusedFiles": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.30.3",

+ 1 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js

@@ -0,0 +1 @@
+Component({})

+ 6 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more"
+  },
+  "component": true
+}

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.wxml


+ 264 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.wxss

@@ -0,0 +1,264 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.uni-data-loading {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  height: 36px;
+  padding-left: 10px;
+  color: #999;
+}
+.uni-data-checklist {
+  position: relative;
+  z-index: 0;
+  flex: 1;
+}
+.uni-data-checklist .checklist-group {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+}
+.uni-data-checklist .checklist-group.is-list {
+  flex-direction: column;
+}
+.uni-data-checklist .checklist-group .checklist-box {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  position: relative;
+  margin: 5px 0;
+  margin-right: 25px;
+}
+.uni-data-checklist .checklist-group .checklist-box .hidden {
+  position: absolute;
+  opacity: 0;
+}
+.uni-data-checklist .checklist-group .checklist-box .checklist-content {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+}
+.uni-data-checklist .checklist-group .checklist-box .checklist-content .checklist-text {
+  font-size: 14px;
+  color: #666;
+  margin-left: 5px;
+  line-height: 14px;
+}
+.uni-data-checklist .checklist-group .checklist-box .checklist-content .checkobx__list {
+  border-right-width: 1px;
+  border-right-color: #007aff;
+  border-right-style: solid;
+  border-bottom-width: 1px;
+  border-bottom-color: #007aff;
+  border-bottom-style: solid;
+  height: 12px;
+  width: 6px;
+  left: -5px;
+  -webkit-transform-origin: center;
+          transform-origin: center;
+  -webkit-transform: rotate(45deg);
+          transform: rotate(45deg);
+  opacity: 0;
+}
+.uni-data-checklist .checklist-group .checklist-box .checkbox__inner {
+  flex-shrink: 0;
+  box-sizing: border-box;
+  position: relative;
+  width: 16px;
+  height: 16px;
+  border: 1px solid #DCDFE6;
+  border-radius: 4px;
+  background-color: #fff;
+  z-index: 1;
+}
+.uni-data-checklist .checklist-group .checklist-box .checkbox__inner .checkbox__inner-icon {
+  position: absolute;
+  top: 1px;
+  left: 5px;
+  height: 8px;
+  width: 4px;
+  border-right-width: 1px;
+  border-right-color: #fff;
+  border-right-style: solid;
+  border-bottom-width: 1px;
+  border-bottom-color: #fff;
+  border-bottom-style: solid;
+  opacity: 0;
+  -webkit-transform-origin: center;
+          transform-origin: center;
+  -webkit-transform: rotate(40deg);
+          transform: rotate(40deg);
+}
+.uni-data-checklist .checklist-group .checklist-box .radio__inner {
+  display: flex;
+  flex-shrink: 0;
+  box-sizing: border-box;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  width: 16px;
+  height: 16px;
+  border: 1px solid #DCDFE6;
+  border-radius: 16px;
+  background-color: #fff;
+  z-index: 1;
+}
+.uni-data-checklist .checklist-group .checklist-box .radio__inner .radio__inner-icon {
+  width: 8px;
+  height: 8px;
+  border-radius: 10px;
+  opacity: 0;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--default.is-disable .checkbox__inner {
+  background-color: #F2F6FC;
+  border-color: #DCDFE6;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--default.is-disable .radio__inner {
+  background-color: #F2F6FC;
+  border-color: #DCDFE6;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--default.is-disable .checklist-text {
+  color: #999;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--default.is-checked .checkbox__inner {
+  border-color: #2979ff;
+  background-color: #2979ff;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--default.is-checked .checkbox__inner .checkbox__inner-icon {
+  opacity: 1;
+  -webkit-transform: rotate(45deg);
+          transform: rotate(45deg);
+}
+.uni-data-checklist .checklist-group .checklist-box.is--default.is-checked .radio__inner {
+  border-color: #2979ff;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--default.is-checked .radio__inner .radio__inner-icon {
+  opacity: 1;
+  background-color: #2979ff;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--default.is-checked .checklist-text {
+  color: #2979ff;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--default.is-checked.is-disable .checkbox__inner {
+  opacity: 0.4;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--default.is-checked.is-disable .checklist-text {
+  opacity: 0.4;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--default.is-checked.is-disable .radio__inner {
+  opacity: 0.4;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--button {
+  margin-right: 10px;
+  padding: 5px 10px;
+  border: 1px #DCDFE6 solid;
+  border-radius: 3px;
+  transition: border-color 0.2s;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--button.is-disable {
+  border: 1px #eee solid;
+  opacity: 0.4;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--button.is-disable .checkbox__inner {
+  background-color: #F2F6FC;
+  border-color: #DCDFE6;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--button.is-disable .radio__inner {
+  background-color: #F2F6FC;
+  border-color: #DCDFE6;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--button.is-disable .checklist-text {
+  color: #999;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--button.is-checked {
+  border-color: #2979ff;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--button.is-checked .checkbox__inner {
+  border-color: #2979ff;
+  background-color: #2979ff;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--button.is-checked .checkbox__inner .checkbox__inner-icon {
+  opacity: 1;
+  -webkit-transform: rotate(45deg);
+          transform: rotate(45deg);
+}
+.uni-data-checklist .checklist-group .checklist-box.is--button.is-checked .radio__inner {
+  border-color: #2979ff;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--button.is-checked .radio__inner .radio__inner-icon {
+  opacity: 1;
+  background-color: #2979ff;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--button.is-checked .checklist-text {
+  color: #2979ff;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--button.is-checked.is-disable {
+  opacity: 0.4;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--tag {
+  margin-right: 10px;
+  padding: 5px 10px;
+  border: 1px #DCDFE6 solid;
+  border-radius: 3px;
+  background-color: #f5f5f5;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--tag .checklist-text {
+  margin: 0;
+  color: #666;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--tag.is-disable {
+  opacity: 0.4;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--tag.is-checked {
+  background-color: #2979ff;
+  border-color: #2979ff;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--tag.is-checked .checklist-text {
+  color: #fff;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--list {
+  display: flex;
+  padding: 10px 15px;
+  padding-left: 0;
+  margin: 0;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--list.is-list-border {
+  border-top: 1px #eee solid;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--list.is-disable .checkbox__inner {
+  background-color: #F2F6FC;
+  border-color: #DCDFE6;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--list.is-disable .checklist-text {
+  color: #999;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--list.is-checked .checkbox__inner {
+  border-color: #2979ff;
+  background-color: #2979ff;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--list.is-checked .checkbox__inner .checkbox__inner-icon {
+  opacity: 1;
+  -webkit-transform: rotate(45deg);
+          transform: rotate(45deg);
+}
+.uni-data-checklist .checklist-group .checklist-box.is--list.is-checked .radio__inner .radio__inner-icon {
+  opacity: 1;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--list.is-checked .checklist-text {
+  color: #2979ff;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--list.is-checked .checklist-content .checkobx__list {
+  opacity: 1;
+  border-color: #2979ff;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--list.is-checked.is-disable .checkbox__inner {
+  opacity: 0.4;
+}
+.uni-data-checklist .checklist-group .checklist-box.is--list.is-checked.is-disable .checklist-text {
+  opacity: 0.4;
+}
+

+ 1 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js

@@ -0,0 +1 @@
+Component({})

+ 4 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.wxml

@@ -0,0 +1 @@
+<view data-event-opts="{{[['tap',[['onClick',['$event']]]]]}}" class="uni-load-more" bindtap="__e"><block wx:if="{{!webviewHide&&(iconType==='circle'||iconType==='auto'&&platform==='android')&&status==='loading'&&showIcon}}"><view class="uni-load-more__img uni-load-more__img--android-MP" style="{{'width:'+(iconSize+'px')+';'+('height:'+(iconSize+'px')+';')}}"><view class="uni-load-more__img-icon" style="{{'border-top-color:'+(color)+';'+('border-top-width:'+(iconSize/12)+';')}}"></view><view class="uni-load-more__img-icon" style="{{'border-top-color:'+(color)+';'+('border-top-width:'+(iconSize/12)+';')}}"></view><view class="uni-load-more__img-icon" style="{{'border-top-color:'+(color)+';'+('border-top-width:'+(iconSize/12)+';')}}"></view></view></block><block wx:else><block wx:if="{{!webviewHide&&status==='loading'&&showIcon}}"><view class="uni-load-more__img uni-load-more__img--ios-H5" style="{{'width:'+(iconSize+'px')+';'+('height:'+(iconSize+'px')+';')}}"><image src="{{imgBase64}}" mode="widthFix"></image></view></block></block><block wx:if="{{showText}}"><text class="uni-load-more__text" style="{{'color:'+(color)+';'}}">{{status==='more'?contentdownText:status==='loading'?contentrefreshText:contentnomoreText}}</text></block></view>

+ 299 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.wxss

@@ -0,0 +1,299 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.uni-load-more {
+  display: flex;
+  flex-direction: row;
+  height: 40px;
+  align-items: center;
+  justify-content: center;
+}
+.uni-load-more__text {
+  font-size: 14px;
+  margin-left: 8px;
+}
+.uni-load-more__img {
+  width: 24px;
+  height: 24px;
+}
+.uni-load-more__img--nvue {
+  color: #666666;
+}
+.uni-load-more__img--android,
+.uni-load-more__img--ios {
+  width: 24px;
+  height: 24px;
+  -webkit-transform: rotate(0deg);
+          transform: rotate(0deg);
+}
+.uni-load-more__img--android {
+  -webkit-animation: loading-ios 1s 0s linear infinite;
+          animation: loading-ios 1s 0s linear infinite;
+}
+@-webkit-keyframes loading-android {
+0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+@keyframes loading-android {
+0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+.uni-load-more__img--ios-H5 {
+  position: relative;
+  -webkit-animation: loading-ios-H5 1s 0s step-end infinite;
+          animation: loading-ios-H5 1s 0s step-end infinite;
+}
+.uni-load-more__img--ios-H5 image {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+}
+@-webkit-keyframes loading-ios-H5 {
+0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+8% {
+    -webkit-transform: rotate(30deg);
+            transform: rotate(30deg);
+}
+16% {
+    -webkit-transform: rotate(60deg);
+            transform: rotate(60deg);
+}
+24% {
+    -webkit-transform: rotate(90deg);
+            transform: rotate(90deg);
+}
+32% {
+    -webkit-transform: rotate(120deg);
+            transform: rotate(120deg);
+}
+40% {
+    -webkit-transform: rotate(150deg);
+            transform: rotate(150deg);
+}
+48% {
+    -webkit-transform: rotate(180deg);
+            transform: rotate(180deg);
+}
+56% {
+    -webkit-transform: rotate(210deg);
+            transform: rotate(210deg);
+}
+64% {
+    -webkit-transform: rotate(240deg);
+            transform: rotate(240deg);
+}
+73% {
+    -webkit-transform: rotate(270deg);
+            transform: rotate(270deg);
+}
+82% {
+    -webkit-transform: rotate(300deg);
+            transform: rotate(300deg);
+}
+91% {
+    -webkit-transform: rotate(330deg);
+            transform: rotate(330deg);
+}
+100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+@keyframes loading-ios-H5 {
+0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+8% {
+    -webkit-transform: rotate(30deg);
+            transform: rotate(30deg);
+}
+16% {
+    -webkit-transform: rotate(60deg);
+            transform: rotate(60deg);
+}
+24% {
+    -webkit-transform: rotate(90deg);
+            transform: rotate(90deg);
+}
+32% {
+    -webkit-transform: rotate(120deg);
+            transform: rotate(120deg);
+}
+40% {
+    -webkit-transform: rotate(150deg);
+            transform: rotate(150deg);
+}
+48% {
+    -webkit-transform: rotate(180deg);
+            transform: rotate(180deg);
+}
+56% {
+    -webkit-transform: rotate(210deg);
+            transform: rotate(210deg);
+}
+64% {
+    -webkit-transform: rotate(240deg);
+            transform: rotate(240deg);
+}
+73% {
+    -webkit-transform: rotate(270deg);
+            transform: rotate(270deg);
+}
+82% {
+    -webkit-transform: rotate(300deg);
+            transform: rotate(300deg);
+}
+91% {
+    -webkit-transform: rotate(330deg);
+            transform: rotate(330deg);
+}
+100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+.uni-load-more__img--android-MP {
+  position: relative;
+  width: 24px;
+  height: 24px;
+  -webkit-transform: rotate(0deg);
+          transform: rotate(0deg);
+  -webkit-animation: loading-ios 1s 0s ease infinite;
+          animation: loading-ios 1s 0s ease infinite;
+}
+.uni-load-more__img--android-MP .uni-load-more__img-icon {
+  position: absolute;
+  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  border: solid 2px transparent;
+  border-top: solid 2px #777777;
+  -webkit-transform-origin: center;
+          transform-origin: center;
+}
+.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(1) {
+  -webkit-animation: loading-android-MP-1 1s 0s linear infinite;
+          animation: loading-android-MP-1 1s 0s linear infinite;
+}
+.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(2) {
+  -webkit-animation: loading-android-MP-2 1s 0s linear infinite;
+          animation: loading-android-MP-2 1s 0s linear infinite;
+}
+.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(3) {
+  -webkit-animation: loading-android-MP-3 1s 0s linear infinite;
+          animation: loading-android-MP-3 1s 0s linear infinite;
+}
+@keyframes loading-android {
+0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+@-webkit-keyframes loading-android-MP-1 {
+0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+50% {
+    -webkit-transform: rotate(90deg);
+            transform: rotate(90deg);
+}
+100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+@keyframes loading-android-MP-1 {
+0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+50% {
+    -webkit-transform: rotate(90deg);
+            transform: rotate(90deg);
+}
+100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+@-webkit-keyframes loading-android-MP-2 {
+0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+50% {
+    -webkit-transform: rotate(180deg);
+            transform: rotate(180deg);
+}
+100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+@keyframes loading-android-MP-2 {
+0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+50% {
+    -webkit-transform: rotate(180deg);
+            transform: rotate(180deg);
+}
+100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+@-webkit-keyframes loading-android-MP-3 {
+0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+50% {
+    -webkit-transform: rotate(270deg);
+            transform: rotate(270deg);
+}
+100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+@keyframes loading-android-MP-3 {
+0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+50% {
+    -webkit-transform: rotate(270deg);
+            transform: rotate(270deg);
+}
+100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+

Some files were not shown because too many files changed in this diff