From 2b47c913138c5e1015230d2440bf2b869ff7f73c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Sat, 11 Jun 2022 11:01:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E5=8A=9B=E4=BA=BA=E7=94=9F=E9=A6=96?=
=?UTF-8?q?=E9=A1=B5=E7=AD=BE=E5=88=B0=E5=8A=9F=E8=83=BD=EF=BC=8CGLF?=
=?UTF-8?q?=E6=94=B6=E7=9B=8A=E7=8E=87=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apis/interfaces/life.js | 20 +-
pages.json | 7 +-
pages/life/capacity.vue | 98 +-
pages/life/life.vue | 175 +-
pages/order/index.vue | 2 +-
router/index.js | 10 -
static/icon/sign_btn.png | Bin 0 -> 16408 bytes
.../RongCloud-CallWrapper/changelog.md | 12 -
.../RongCloud-CallWrapper/lib/index.d.ts | 377 ----
.../RongCloud-CallWrapper/lib/index.esm.js | 286 ---
.../RongCloud-CallWrapper/lib/index.js | 333 ----
.../RongCloud-CallWrapper/package.json | 80 -
uni_modules/RongCloud-CallWrapper/readme.md | 1 -
uni_modules/RongCloud-IMWrapper/changelog.md | 4 -
.../RongCloud-IMWrapper/js_sdk/index.d.ts | 1719 -----------------
.../RongCloud-IMWrapper/js_sdk/index.esm.js | 1372 -------------
.../RongCloud-IMWrapper/js_sdk/index.js | 1465 --------------
uni_modules/RongCloud-IMWrapper/package.json | 80 -
uni_modules/RongCloud-IMWrapper/readme.md | 1 -
.../dist/dev/app-plus/app-config-service.js | 4 +-
unpackage/dist/dev/app-plus/app-service.js | 621 ++++--
unpackage/dist/dev/app-plus/app-view.js | 770 +++++---
unpackage/dist/dev/app-plus/manifest.json | 2 +-
.../dev/app-plus/static/icon/sign_btn.png | Bin 0 -> 16408 bytes
unpackage/dist/dev/app-plus/view.umd.min.js | 2 +-
25 files changed, 1114 insertions(+), 6327 deletions(-)
create mode 100644 static/icon/sign_btn.png
delete mode 100644 uni_modules/RongCloud-CallWrapper/changelog.md
delete mode 100644 uni_modules/RongCloud-CallWrapper/lib/index.d.ts
delete mode 100644 uni_modules/RongCloud-CallWrapper/lib/index.esm.js
delete mode 100644 uni_modules/RongCloud-CallWrapper/lib/index.js
delete mode 100644 uni_modules/RongCloud-CallWrapper/package.json
delete mode 100644 uni_modules/RongCloud-CallWrapper/readme.md
delete mode 100644 uni_modules/RongCloud-IMWrapper/changelog.md
delete mode 100644 uni_modules/RongCloud-IMWrapper/js_sdk/index.d.ts
delete mode 100644 uni_modules/RongCloud-IMWrapper/js_sdk/index.esm.js
delete mode 100644 uni_modules/RongCloud-IMWrapper/js_sdk/index.js
delete mode 100644 uni_modules/RongCloud-IMWrapper/package.json
delete mode 100644 uni_modules/RongCloud-IMWrapper/readme.md
create mode 100644 unpackage/dist/dev/app-plus/static/icon/sign_btn.png
diff --git a/apis/interfaces/life.js b/apis/interfaces/life.js
index fc532ae..eff9eaf 100644
--- a/apis/interfaces/life.js
+++ b/apis/interfaces/life.js
@@ -15,6 +15,22 @@ const life = () =>{
})
}
-export {
- life
+// 共分首页
+const glz = () => {
+ return request({
+ url: 'user/glz/index'
+ })
+}
+
+// 签到
+const sign = () => {
+ return request({
+ url: 'user/glz/sign'
+ })
+}
+
+export {
+ life,
+ glz,
+ sign
}
diff --git a/pages.json b/pages.json
index 31c209e..b4e93f5 100644
--- a/pages.json
+++ b/pages.json
@@ -29,7 +29,12 @@
"name": "Life",
"style": {
"navigationBarTitleText": "共力人生",
- "navigationStyle": "custom"
+ "navigationStyle": "custom",
+ "app-plus": {
+ "titleNView": {
+ "type": "transparent"
+ }
+ }
}
},
{
diff --git a/pages/life/capacity.vue b/pages/life/capacity.vue
index 6e9e7c1..f3bd43f 100644
--- a/pages/life/capacity.vue
+++ b/pages/life/capacity.vue
@@ -1,14 +1,17 @@
- 共力分总产率/小时0.04GLF/h
+ 共力分总产率/小时{{baseHour}}GLF/h
总产率=角色产率+团队产率+共建产率+共力值产率
- 我的角色
- 普通用户:0.04GLF/h
+
+ 我的角色
+ {{nickname}}
+
+ {{identityText}}:{{base}}GLF/h
- 成员产率0GLF/h
+ 成员产率({{group.effect}}/{{group.count}}){{group.capacity}}GLF/h
邀请更多好友
@@ -16,12 +19,12 @@
家族成员产率
- 0人在线(会员)
- -
+ {{recommend.vip}}人在线(会员)
+ {{recommend.vip_text}}
- 0人在线(会员)
- -
+ {{recommend.novip}}人在线(普通用户)
+ {{recommend.novip_text}}
@@ -29,39 +32,90 @@
伙伴成员
- 0人在线(会员)
- -
+ {{partner.vip}}人在线(会员)
+ {{partner.vip_text}}
- 0人在线(会员)
- -
+ {{partner.novip}}人在线(会员)
+ {{partner.novip_text}}
共建产率0GLF/h
- 0/1200
+ -/-
- 产品当日设置的
+ 产品当前设置共建者每日可以通过看广告获得共建值(暂未开放,敬请期待)
共力值产率0GLF/h
- 0/1200
+ -/-
- 产品当日设置的
+ 根据正常用户的使用在平台的使用习惯,购物等行为产生对应共力值(暂未开放,敬请期待)
+
+
+ PS产品设置每100个共力值或共建值可以加速5%的角色产率;
+
+