diff --git a/pages/app/sign.vue b/pages/app/sign.vue
index 6e1c43d2..48ece866 100644
--- a/pages/app/sign.vue
+++ b/pages/app/sign.vue
@@ -1,601 +1,452 @@
-
+
-
-
-
-
-
-
- 签到日历
-
- 已连续签到
- {{ state.continue_days }}
- 天
-
-
-
-
-
-
- 第{{item.day}}天
-
-
-
- +{{ item.point }}
-
-
-
-
-
+
+
+
+
+
+
+
+ 签到日历
+
+ 已连续签到 {{ state.signInfo.continuousDay }} 天
+
+
+
+
+
+
+ 第{{ item.day }}天
+
+
+
+
+ + {{ item.point }}
+
+
+
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+ 签到说明
+ 1、每天签到，可获得积分或经验
+
+ 2、据说连续签到第 {{ state.maxDay }} 天可获得超额积分，一定要坚持签到哦~~~
+
+
+
-
-
-
-
-
-
-
-
- 签到说明
-
- 1、每日签到固定 {{ state.data.rules.everyday }} 积分
-
- ，次日递增奖励 {{ state.data.rules.inc_num }} 积分，直到
- {{ state.data.rules.until_day }} 天之后不再增加
-
-
-
- 2、
- 连续签到 {{ i.full }} 天，奖励 {{ i.value }} 积分；
-
-
-
- {{ state.data.rules.discounts?.length > 0 ? '3' : '2' }}、用户在
- {{ state.data.rules.replenish_limit }} 天内，可补签
- {{ state.data.rules.replenish_days }} 天，每次补签消耗
- {{ state.data.rules.replenish_num }}积分
-
-
-
-
-
-
-
-
-
- {{ state.signin.score }}积分
-
- 已连续打卡{{ state.continue_days }}天
-
-
-
- 签到成功
-
-
-
-
-
-
-
-
-
-
- 消耗{{ state.data?.rules.replenish_num }}积分
-
- 已连续打卡{{ state.continue_days }}天
-
-
-
- 确认补签
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ state.signResult.point }} 积分
+ {{ state.signResult.experience }} 经验
+
+
+ 已连续打卡 {{ state.signResult.day }} 天
+
+
+
+ 签到成功
+
+
+
+
+
+
+
\ No newline at end of file
+ .on {
+ background-color: #999 !important;
+ }
+
diff --git a/sheep/api/activity.js b/sheep/api/activity.js
index 64d65064..09b3f00c 100644
--- a/sheep/api/activity.js
+++ b/sheep/api/activity.js
@@ -18,38 +18,16 @@ export default {
url: 'activity/groupon/' + id,
method: 'GET',
}),
- signList: (params) =>
- request({
- url: 'activity/signin',
- method: 'GET',
- params,
- }),
- signAdd: () =>
- request({
- url: '/app-api/member/sign-in/record/create',
- method: 'POST',
- }),
- configLise: () =>
- request({
- url: '/app-api/member/sign-in/config/list',
- method: 'GET',
- }),
- recordPage: () =>
- request({
- url: '/app-api/member/sign-in/record/page',
- method: 'GET',
- }),
- replenish: (data) =>
- request({
- url: 'activity/signin/replenish',
- method: 'POST',
- data,
- }),
activity: (id) =>
request({
url: 'activity/activity/' + id,
method: 'GET',
}),
+ getSummary: () =>
+ request({
+ url: '/app-api/member/sign-in/record/get-summary',
+ method: 'GET',
+ }),
getBargainRecordSummary: () =>
request({
url: '/app-api/promotion/bargain-record/get-summary',
diff --git a/sheep/api/member/signin.js b/sheep/api/member/signin.js
new file mode 100644
index 00000000..9993e8b5
--- /dev/null
+++ b/sheep/api/member/signin.js
@@ -0,0 +1,37 @@
+import request from '@/sheep/request';
+
+const SignInApi = {
+ // 获得签到规则列表
+ getSignInConfigList: () => {
+ return request({
+ url: '/app-api/member/sign-in/config/list',
+ method: 'GET',
+ });
+ },
+ // 获得个人签到统计
+ getSignInRecordSummary: () => {
+ return request({
+ url: '/app-api/member/sign-in/record/get-summary',
+ method: 'GET',
+ });
+ },
+ // 签到
+ createSignInRecord: () => {
+ return request({
+ url: '/app-api/member/sign-in/record/create',
+ method: 'POST',
+ });
+ },
+ // 获得签到记录分页
+ getSignRecordPage: (params) => {
+ const queryString = Object.keys(params)
+ .map((key) => encodeURIComponent(key) + '=' + params[key])
+ .join('&');
+ return request({
+ url: `/app-api/member/sign-in/record/page?${queryString}`,
+ method: 'GET',
+ });
+ },
+};
+
+export default SignInApi;
\ No newline at end of file