diff --git a/apis/interfaces/account.js b/apis/interfaces/account.js index 84c778a..9ee7762 100644 --- a/apis/interfaces/account.js +++ b/apis/interfaces/account.js @@ -9,12 +9,22 @@ import { request } from '../index' // dt账户 -const dt = (data) =>{ +const dt = () =>{ return request({ url: "user/account/dt_logs" }) } -export { - dt +// 充值 +const recharge = (data) => { + return request({ + url: "user/transaction/recharge", + method: "POST", + data + }) +} + +export { + dt, + recharge } diff --git a/apis/interfaces/life.js b/apis/interfaces/life.js new file mode 100644 index 0000000..04fe420 --- /dev/null +++ b/apis/interfaces/life.js @@ -0,0 +1,21 @@ + +/** + * Web唐明明 + * 匆匆数载恍如梦，岁月迢迢华发增。 + * 碌碌无为枉半生，一朝惊醒万事空。 + * moduleName: 共力人生 + */ + +import { request } from '../index' + +// 共力人生 +const life = () =>{ + return request({ + url: "user/life" + }) +} + + +export { + life +} diff --git a/apis/interfaces/vip.js b/apis/interfaces/vip.js new file mode 100644 index 0000000..63f6d37 --- /dev/null +++ b/apis/interfaces/vip.js @@ -0,0 +1,36 @@ + +/** + * Web唐明明 + * 匆匆数载恍如梦，岁月迢迢华发增。 + * 碌碌无为枉半生，一朝惊醒万事空。 + * moduleName: 会员 + */ + +import { request } from '../index' + +// 会员信息 +const vip = () =>{ + return request({ + url: "user/identities" + }) +} + +// 开通会员 +const vipPay = () => { + return request({ + url: '' + }) +} + +// 获取支付信息 +const payInfo = () => { + return request({ + url: '' + }) +} + +export { + vip, + vipPay, + payInfo +} diff --git a/manifest.json b/manifest.json index 709623e..5d7a044 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "ZH-HEALTH", - "appid" : "__UNI__C29473D", + "appid" : "__UNI__DE7B0E6", "description" : "ZH-HEALTH，您手上的健康管理专家", "versionName" : "1.0.22", "versionCode" : 100, @@ -23,7 +23,6 @@ }, /* 模块配置 */ "modules" : { - "OAuth" : {}, "Payment" : {}, "Share" : {}, "SQLite" : {}, @@ -75,9 +74,7 @@ }, /* SDK配置 */ "sdkConfigs" : { - "oauth" : { - "univerify" : {} - }, + "oauth" : {}, "payment" : { "weixin" : { "__platform__" : [ "android" ], diff --git a/pages.json b/pages.json index b5f2ecd..add0912 100644 --- a/pages.json +++ b/pages.json @@ -178,7 +178,7 @@ "name": "AccountDt", "style": { "navigationBarTitleText": "DT积分", - "navigationBarBackgroundColor": "#34CE98", + "navigationBarBackgroundColor": "#34CE98", "backgroundColorTop": "#34CE98", "navigationBarTextStyle": "white", "app-plus": { @@ -186,8 +186,7 @@ "buttons": [{ "text": "充值", "width": "60", - "fontSize": "14", - "fontWeight": "bold" + "fontSize": "14" }] } } @@ -197,7 +196,16 @@ "name": "AccountRecharge", "style": { "navigationBarTitleText": "DT积分充值", - "navigationBarBackgroundColor": "#FFFFFF" + "navigationBarBackgroundColor": "#FFFFFF", + "app-plus": { + "titleNView": { + "buttons": [{ + "text": "充值记录", + "width": "80", + "fontSize": "14" + }] + } + } } }, { "path": "pages/vip/vip", @@ -214,6 +222,14 @@ "navigationBarTitleText": "共力会员协议" } + }, { + "path": "pages/team/index", + "name": "Team", + "style": { + "navigationBarTitleText": "共力团队", + "enablePullDownRefresh": false + } + } ], "tabBar": { diff --git a/pages/account/recharge.vue b/pages/account/recharge.vue index feaf04d..274fb04 100644 --- a/pages/account/recharge.vue +++ b/pages/account/recharge.vue @@ -1,19 +1,195 @@ diff --git a/pages/life/life.vue b/pages/life/life.vue index 7662350..557697a 100644 --- a/pages/life/life.vue +++ b/pages/life/life.vue @@ -3,71 +3,56 @@ - 共力值：0.00 - 余额：0.00 + 0.00共力值 - + - 唐明明 + {{nickname || '-'}} - + - - - - 共力健康 - - - - 共力文娱 - - - - 共力发展 - - - + - 共力生活 + DT商城 共力共慧
健康生活馆 - + - DTS - 数字化产权交易 + 共力文娱 + 文娱短视频近期开放 - + 共力团队 - 近期3人加入家族
- 近期3人加入部落 + 近期{{children.indirect}}人成为伙伴
+ 近期{{children.recommend}}人加入家族 - + 消息中心 - 1条消息 + {{message > 0 ? message + '条未读消息': '暂无消息'}} @@ -75,18 +60,18 @@ 邀请朋友 - 2个邀请码可使用 + 加速共力值增长 - + 我的订单 - 暂无订单 + {{order.all || '暂无订单'}} - + 共力好友 @@ -99,25 +84,79 @@ - diff --git a/pages/vip/vip.vue b/pages/vip/vip.vue index 2902674..8c4901e 100644 --- a/pages/vip/vip.vue +++ b/pages/vip/vip.vue @@ -1,33 +1,37 @@