2 次代碼提交 505ac580aa ... 6c5fd8e59c

作者 SHA1 備註 提交日期
  tanxue 6c5fd8e59c 打包配置 3 天之前
  tanxue 45a449e65a H5改为app 4 天之前
共有 3 個文件被更改,包括 26 次插入88 次删除
  1. 15 0
      androidPrivacy.json
  2. 9 87
      common/styles/global/pages.scss
  3. 2 1
      manifest.json

+ 15 - 0
androidPrivacy.json

@@ -0,0 +1,15 @@
+{
+    "version" : "1",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "  请你务必审慎阅读、充分理解 “服务协议” 和 “隐私政策” 各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>  进入应用前,你需先同意<a href=\"https://goosechampion.com/a/yhxy\">《服务协议》</a>和<a href=\"https://goosechampion.com/a/yszc\">
+《隐私政策》</a>,否则将退出应用。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "styles" : {
+        "borderRadius" : "5px",
+        "buttonRefuse" : {
+            "color" : "#999999"
+        }
+    }
+}

+ 9 - 87
common/styles/global/pages.scss

@@ -126,23 +126,18 @@
 }
 .admin-shouye-page{
 	width: 100%;background-color: #f8f9fd;box-sizing: border-box;padding-bottom: 120rpx;overflow: auto;
+	height: 100vh;
 	/*  #ifdef  H5  */
-	height: calc(100vh - 180rpx);
+	// height: calc(100vh - 180rpx);
 	/*  #endif  */
 	/*  #ifdef  APP-PLUS  */
-	height: 100vh;
+	
 	/*  #endif  */
 	.shouye-head-box{
 		width: 100%;height: 376rpx;text-align: center;font-size: 34rpx;color: #fff;
 		box-sizing: border-box;font-weight: 600;
 		background-image: url("@/static/images/index/index-head-bj.png");@include ezy-no-repeat-cover(bottom);
-		/*  #ifdef  H5  */
-		height: 300rpx;padding-top: 36rpx;
-		/*  #endif  */
-		
-		/*  #ifdef  APP-PLUS  */
 		height: 376rpx;padding-top: 100rpx;
-		/*  #endif  */
 	}
 	
 	// banner
@@ -218,23 +213,12 @@
 	// 只有tabbar的
 	.phone-scroll-view {height: calc(100vh - 182rpx - var(--status-bar-height));}
 	
-	/*  #ifdef  APP-PLUS  */
 	// 带筛选的
 	.phone-scroll-saixuan-view {height: calc(100vh - 270rpx - var(--status-bar-height));}
 	// 带搜索的
 	.admin-phone-scroll-view{height: calc(100vh - 312rpx - var(--status-bar-height));}
 	// 只有tabbar
 	.admin-phone-tabbar-view {height: calc(100vh - 200rpx - var(--status-bar-height));}
-	/*  #endif  */
-	
-	/*  #ifdef  H5  */
-	// 带筛选的
-	.phone-scroll-saixuan-view {height: calc(100vh - 350rpx);}
-	// 带搜索的
-	.admin-phone-scroll-view{height: calc(100vh - 392rpx);}
-	// 只有tabbar
-	.admin-phone-tabbar-view {height: calc(100vh - 280rpx);}
-	/*  #endif  */
 
 
 	// 带上边线的
@@ -544,13 +528,7 @@
 		width: 100%;text-align: center;font-size: 34rpx;color: #fff;
 		box-sizing: border-box;font-weight: 600;@include ezy-no-repeat-cover(bottom);
 		background-image: url("@/static/images/my/admin-my-bj.png");
-		/*  #ifdef  H5  */
-		height: 300rpx;padding-top: 36rpx;
-		/*  #endif  */
-				
-		/*  #ifdef  APP-PLUS  */
 		height: 376rpx;padding-top: 100rpx;
-		/*  #endif  */
 	}
 	
 	// num
@@ -614,19 +592,8 @@
 }
 /*** 家政人员列表 ***/
 .admin-jiazheng-list{
-	width: 100%;position: relative;
-		/*  #ifdef  H5  */
-		height: calc(100vh - 180rpx);
-		/*  #endif  */
-		/*  #ifdef  APP-PLUS  */
-		height: 100vh;
-		/*  #endif  */
-	/*  #ifdef  APP-PLUS  */
+	width: 100%;height: 100vh;position: relative;
 	.jz-scroll-view{height: calc(100vh - 380rpx - var(--status-bar-height));}
-	/*  #endif  */
-	/*  #ifdef  H5  */
-	.jz-scroll-view{height: calc(100vh - 460rpx);}
-	/*  #endif  */
 	.all-type-box{
 		position: absolute;top: 80rpx;left: 0;right: 0;bottom: 0;
 		z-index: 2;background-color: rgba(0,0,0,0.3);
@@ -710,13 +677,7 @@
 }	
 /*** 家政人员管理 ***/
 .admin-jiazheng-page{
-	background-color: #f8f9fd;display: flex;flex-direction: column;
-	/*  #ifdef  H5  */
-	height: calc(100vh - 80rpx);
-	/*  #endif  */
-	/*  #ifdef  APP-PLUS  */
-	height: 100vh;
-	/*  #endif  */
+	height: 100vh;background-color: #f8f9fd;display: flex;flex-direction: column;
 	.jz-content-box{flex: 1;overflow: auto;display: flex;flex-direction: column;}
 	.mask-view{position: relative;}
 	.mask-view::before{content: '';z-index: 9;position: absolute;top: 0;left: 0;right: 0;bottom: 0;}
@@ -963,13 +924,7 @@
 	.radio-name-box{display: flex;align-items: center;}
 	.filter-radio-group{border-bottom:1rpx solid #f5f5f5;}
 	.filter-btn-box{display: flex;background-color: #fff;box-sizing: border-box;
-	    border-top: 1rpx solid #f5f5f5;justify-content: center;
-		/*  #ifdef  H5  */
-		padding: 32rpx 42rpx 100rpx;
-		/*  #endif  */
-		/*  #ifdef  APP-PLUS  */
-		padding: 32rpx 42rpx;
-		/*  #endif  */
+	    border-top: 1rpx solid #f5f5f5;justify-content: center;padding: 32rpx 42rpx;
 		}
 	.filter-btn{font-size: 26rpx;width: 200rpx;margin: 0;}	
 	.filter-btn + .filter-btn{margin-left: 60rpx;}
@@ -978,12 +933,7 @@
 /*** 家政人员简历 ***/
 .phone-jianli-page{
 	width: 100%;background-color: #f8f9fd;display: flex;flex-direction: column;
-	/*  #ifdef  H5  */
-	height: calc(100vh - 80rpx);
-	/*  #endif  */
-	/*  #ifdef  APP-PLUS  */
 	height: 100vh;
-	/*  #endif  */
 	.right-icon-delete-btn{
 		width: 35rpx;height: 35rpx;@include ezy-no-repeat-cover();margin-right: 10rpx;
 		background-image: url("@/static/images/common/clear-icon.svg");
@@ -1058,9 +1008,6 @@
 /*** 分享 ***/
 .share-haibao-box{
 	width: 100%;padding: 42rpx 32rpx;box-sizing: border-box;background: #fff;
-	/*  #ifdef  H5  */
-	position: fixed;bottom: 60rpx;left: 0;
-	/*  #endif  */
 	.share-list-box{padding: 42rpx 0;box-sizing: border-box;}
 	.share-item-box{
 		width: 20%;display: flex;flex-direction: column;align-items: center;font-size: 24rpx;color: #666;
@@ -1075,14 +1022,9 @@
 
 /*** 课程绑定 ***/
 .kc-bind-page{
-	/*  #ifdef  APP-PLUS  */
-	.kc-bind-scroll-view{height: calc(100vh - 256rpx - var(--status-bar-height));overflow-y: auto;}
-	.kc-notbind-scroll-view{height: calc(100vh - 156rpx - var(--status-bar-height));overflow-y: auto;}
-	/*  #endif  */
-	/*  #ifdef  H5  */
-	.kc-bind-scroll-view{height: calc(100vh - 336rpx);overflow-y: auto;}
-	.kc-notbind-scroll-view{height: calc(100vh - 236rpx - var(--status-bar-height));overflow-y: auto;}
-	/*  #endif  */
+	
+	.kc-bind-scroll-view{height: calc(100vh - 240rpx - var(--status-bar-height));overflow-y: auto;}
+	.kc-notbind-scroll-view{height: calc(100vh - 158rpx - var(--status-bar-height));overflow-y: auto;}
 	.admin-list-box{
 		.kecheng-list-card{
 			.item-card-row {display: flex;flex-direction: column;justify-content: space-between;box-sizing: border-box;padding: 12rpx 0;}
@@ -1095,12 +1037,7 @@
 
 /*** 子账号***/
 .phone-zzh-page{
-	/*  #ifdef  APP-PLUS  */
 	.zzh-saixuan-view{height: calc(100vh - 300rpx - var(--status-bar-height));}
-	/*  #endif  */
-	/*  #ifdef  H5  */
-	.zzh-saixuan-view{height: calc(100vh - 380rpx);}
-	/*  #endif  */
 	.zzh-new-btn-box{
 		padding: 20rpx 24rpx 20rpx;background-color: #f4f6fa;box-sizing: border-box;
 		.phone-green-btn{font-size: 28rpx;}
@@ -1123,12 +1060,7 @@
 
 /*** 已售课程***/
 .phone-yishou-page{
-	/*  #ifdef  APP-PLUS  */
 	.ys-kc-saixuan-view{height: calc(100vh - 302rpx - var(--status-bar-height));}
-	/*  #endif  */
-	/*  #ifdef  H5  */
-	.ys-kc-saixuan-view{height: calc(100vh - 382rpx);}
-	/*  #endif  */
 	.yishou-item-card-row{
 		display: flex;display: flex;flex-direction: column;justify-content: space-between;
 		box-sizing: border-box;padding: 10rpx 0 16rpx;
@@ -1143,12 +1075,7 @@
 /*** 子家政公司 ***/
 .phone-zjzgs-page{
 	background-color: #f8f9fd;display: flex;flex-direction: column;
-	/*  #ifdef  H5  */
-	height: calc(100vh - 80rpx);
-	/*  #endif  */
-	/*  #ifdef  APP-PLUS  */
 	height: 100vh;
-	/*  #endif  */
 	.zjzgs-body-box{flex: 1;overflow-y: auto;}
 	.zjzgs-num-box{
 		border:1rpx solid #3fd2a1;
@@ -1177,12 +1104,7 @@
 /* 职业等级选择页 */
 .phone-zydj-popup{
 	display: flex;flex-direction: column;
-	/*  #ifdef  H5  */
-	height: calc(100vh - 80rpx);
-	/*  #endif  */
-	/*  #ifdef  APP-PLUS  */
 	height: 100vh;
-	/*  #endif  */
 	.phone-select-group{
 		display: flex;flex-wrap: wrap;align-content: flex-start;flex: 1;
 		overflow: auto;box-sizing: border-box;padding:16rpx;}

+ 2 - 1
manifest.json

@@ -89,7 +89,8 @@
             },
             "splashscreen" : {
                 "androidStyle" : "common",
-                "iosStyle" : "common"
+                "iosStyle" : "common",
+                "useOriginalMsgbox" : true
             },
             "icons" : {
                 "android" : {