diff --git a/uni-app/src/app/api/auth.ts b/uni-app/src/app/api/auth.ts index 699d65c93..f20c79155 100644 --- a/uni-app/src/app/api/auth.ts +++ b/uni-app/src/app/api/auth.ts @@ -50,6 +50,20 @@ export function mobileRegister(data : AnyObject) { return request.post(url, data, { showErrorMessage: true }) } +/** + * 微信公众号授权信息 + */ +export function wechatUser(data : AnyObject) { + return request.get('wechat/user', data, { showErrorMessage: false }) +} + +/** + * 微信公众号授权信息登录（openid） + */ +export function wechatUserLogin(data : AnyObject) { + return request.post('wechat/userlogin', data, { showErrorMessage: true }) +} + /** * 微信公众号授权登录 */ @@ -58,7 +72,7 @@ export function wechatLogin(data : AnyObject) { } /** - * 微信公众号授权登录 + * 微信小程序授权登录 */ export function weappLogin(data : AnyObject) { return request.post('weapp/login', data, { showErrorMessage: false }) diff --git a/uni-app/src/app/api/diy.ts b/uni-app/src/app/api/diy.ts index cc4cb302a..e3f971f18 100644 --- a/uni-app/src/app/api/diy.ts +++ b/uni-app/src/app/api/diy.ts @@ -3,20 +3,27 @@ import request from '@/utils/request' /** * 获取自定义页面信息 */ -export function getDiyInfo(params : Record) { - return request.get('diy/diy', params) +export function getDiyInfo(params: Record) { + return request.get('diy/diy', params) } /** * 获取底部导航信息 */ -export function getTabbarInfo(params : Record) { - return request.get('diy/tabbar', params) +export function getTabbarInfo(params: Record) { + return request.get('diy/tabbar', params) +} + +/** + * 获取底部导航列表 + */ +export function getTabbarList(params: Record) { + return request.get('diy/tabbar/list', params) } /** * 获取页面分享信息 */ -export function getShareInfo(params : Record) { - return request.get('diy/share', params) +export function getShareInfo(params: Record) { + return request.get('diy/share', params) } \ No newline at end of file diff --git a/uni-app/src/app/api/member.ts b/uni-app/src/app/api/member.ts index 9c1b8852f..b6a6a3a8e 100644 --- a/uni-app/src/app/api/member.ts +++ b/uni-app/src/app/api/member.ts @@ -17,6 +17,12 @@ export function getPointList(data : AnyObject) { export function getBalanceList(data : AnyObject) { return request.get('member/account/balance', data) } +/** + * 获取余额流水,条件获取 + */ +export function getBalanceListAll(data : AnyObject) { + return request.get('member/account/balance_list', data) +} /** * 获取可提现余额流水 @@ -116,6 +122,12 @@ export function deleteCashoutAccount(accountId: number) { return request.delete(`member/cashout_account/${accountId}`, { showSuccessMessage: true, showErrorMessage: true }) } +/** + * 佣金账户流水 + */ +export function getMemberCommission(data : AnyObject) { + return request.get(`member/account/commission`,data) +} /** * 佣金列表 */ @@ -123,13 +135,20 @@ export function getCommissionList(data : AnyObject) { return request.get(`member/account/commission`, data) } +/** + * 获取账号变动类型 + */ +export function getAccountType(params: Record) { + return request.get(`member/account/fromtype/${params.account_type}`) +} + /** * 获取会员收货地址列表 * @param params * @returns */ export function getAddressList(params: Record) { - return request.get(`member/address`, {params}) + return request.get(`member/address`, params) } /** @@ -204,9 +223,22 @@ export function getSignConfig() { /** * 点击签到 - * @param params * @returns */ export function setSign() { return request.post('member/sign') +} + +/** + * 获取个人积分 + */ +export function getMemberAccountPointcount() { + return request.get(`member/account/pointcount`) +} + +/** + * 获取积分任务 + */ +export function getTaskPoint() { + return request.get(`task/point`) } \ No newline at end of file diff --git a/uni-app/src/app/api/system.ts b/uni-app/src/app/api/system.ts index 53663f656..462f82c10 100644 --- a/uni-app/src/app/api/system.ts +++ b/uni-app/src/app/api/system.ts @@ -113,7 +113,7 @@ export function getAreaByCode(code: number | string) { * @param params */ export function getAddressByLatlng(params: Record) { - return request.get(`area/address_by_latlng`, params) + return request.get(`area/address_by_latlng`, params, {showErrorMessage: true}) } /** diff --git a/uni-app/src/app/api/verify.ts b/uni-app/src/app/api/verify.ts index 06c077e10..d45dccc05 100644 --- a/uni-app/src/app/api/verify.ts +++ b/uni-app/src/app/api/verify.ts @@ -11,7 +11,7 @@ export function getVerifyCode(type: string ,params: AnyObject) { * 获取核销记录 */ export function getVerifyRecords(params: Record) { - return request.get('verify_records', {params}) + return request.get('verify_records', params) } /** diff --git a/uni-app/src/app/components/diy/active-cube/index.vue b/uni-app/src/app/components/diy/active-cube/index.vue index 34ad95440..fa50e3660 100644 --- a/uni-app/src/app/components/diy/active-cube/index.vue +++ b/uni-app/src/app/components/diy/active-cube/index.vue @@ -4,32 +4,32 @@ - {{ diyComponent.text }} - {{ diyComponent.subTitle.text }} + {{ diyComponent.text }} + {{ diyComponent.subTitle.text }} - {{ diyComponent.text }} - {{ diyComponent.subTitle.text }} + {{ diyComponent.text }} + {{ diyComponent.subTitle.text }} - {{ diyComponent.text }} - + {{ diyComponent.text }} + {{ diyComponent.subTitle.text }} - {{ diyComponent.text }} - + {{ diyComponent.text }} + {{ diyComponent.subTitle.text }} - +