From b84a171bdf611650d374d82c74fcc6d810d790fe Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 2 Sep 2022 11:21:43 +0800
Subject: [PATCH] OA测试返回4个的优化

---
 packageA/pages/checkin/checkin.js   | 22 +++++++++++++++++-----
 packageA/pages/checkin/checkin.wxml | 16 ++++++++++++++++
 packageA/pages/checkin/checkin.wxss | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/packageA/pages/checkin/checkin.js b/packageA/pages/checkin/checkin.js
index 421c6cf..f910db6 100644
--- a/packageA/pages/checkin/checkin.js
+++ b/packageA/pages/checkin/checkin.js
@@ -33,6 +33,8 @@ Page({
 		
 		flag: true,
 		isLogin: false,
+		imgUrl: app.globalData.setting.imghost,
+		show_no_integral:false
 		
 	},
 	
@@ -46,11 +48,16 @@ Page({
 					});
 					self.loadCheckedRecord();
 				}else{
-					wx.showToast({
-					  title: "网络繁忙，请重试",
-					  icon: 'none',
-					  duration: 2000
-					})
+					if(res.data.msg.indexOf('未开启签到')!=-1){
+						self.setData({ show_no_integral: true });
+					}else{
+						wx.showToast({
+							title: res.data.msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+
 				}
 		  },
 		});
@@ -390,5 +397,10 @@ Page({
 		if(url){
 			getApp().goto(url);
 		}
+	},
+
+	back_to(){
+		wx.navigateBack();
 	}
+
 })
diff --git a/packageA/pages/checkin/checkin.wxml b/packageA/pages/checkin/checkin.wxml
index 4f8bb65..14445d3 100644
--- a/packageA/pages/checkin/checkin.wxml
+++ b/packageA/pages/checkin/checkin.wxml
@@ -139,4 +139,20 @@
 		</view>
 	</view>
 
+	<view bindtap="back_to" wx:if="{{show_no_integral}}">
+       <view class="cover-layer"></view>
+	   <view class="pop_up_no">
+            <view class="title" style="position:relative">
+				提示
+				<image class="close_img" src="{{imgUrl}}/miniapp/images/close.png"></image>
+			</view>
+            <view class="content">
+                 <image style="width:270rpx; height:270rpx; margin:20rpx 0"
+						src="{{imgUrl}}/miniapp/images/fenxiao.png"></image>
+				 <view style="margin-top:10rpx">商家暂时未开启积分签到，敬请期待哦！ </view>
+			</view>
+	   </view>
+	</view>
+
+
 </view>
\ No newline at end of file
diff --git a/packageA/pages/checkin/checkin.wxss b/packageA/pages/checkin/checkin.wxss
index f524734..ab477ff 100644
--- a/packageA/pages/checkin/checkin.wxss
+++ b/packageA/pages/checkin/checkin.wxss
@@ -354,3 +354,44 @@ page,
 	flex-wrap: wrap;
 	text-align:center;
 }
+
+.cover-layer {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 1000;
+	background: rgba(0,0,0,0.4);
+	width: 100%;
+	height: 100%;
+}
+
+.pop_up_no{
+	z-index: 2000;
+	position: fixed;
+	width:80%;
+	height:500rpx;
+	left: 50%;
+	top:50%;
+	transform:translate(-50%,-50%);
+	background-color: #fff;
+	font-size: 28rpx;
+	border-radius: 20rpx;
+}
+
+.pop_up_no .title{
+	height: 90rpx;
+	background-color: #ffd601;
+	text-align: center;
+	line-height: 90rpx;
+	border-top-right-radius: 20rpx;
+	border-top-left-radius: 20rpx;
+}
+
+.pop_up_no .content{
+	text-align: center;
+}
+.pop_up_no .close_img{
+	width:60rpx; height:60rpx;position:absolute; right:-15px; top:-15rpx;
+ }
\ No newline at end of file
--
libgit2 0.21.4