diff --git a/api/model/info.js b/api/model/info.js index a695abd..3ca16fe 100644 --- a/api/model/info.js +++ b/api/model/info.js @@ -1,115 +1,107 @@ // 个人相关接口 const api = { - // 充值 - recharge: { - url: '/info_common/withdraw', - method: 'GET', - auth: true, - limit: 1000, - showLoading: true, - }, - // 提现 - withdraw: { - url: '/info_common/withdraw', - method: 'GET', - auth: true, - limit: 1000, - showLoading: true, - }, - // 获取地址列表带分页 - getAddressPageList: { - url: '/info_common/getAddressPageList', - method: 'GET', - auth: true, - }, - // 增加或修改地址信息 - addOrUpdateAddress: { - url: '/info_common/addOrUpdateAddress', - method: 'POST', - limit: 500, - auth: true, - showLoading: true, - }, - // 删除地址 - deleteAddress: { - url: '/info_common/deleteAddress', - method: 'GET', - limit: 500, - auth: true, - showLoading: true, - }, - // 修改默认地址 - updateDefaultAddress: { - url: '/info_common/updateDefaultAddress', - method: 'GET', - auth: true, - limit: 1000, - }, - // 获取粉丝列表带分页 - getFansPageList: { - url: '/info_common/getFansPageList', - method: 'GET', - auth: true, - }, - // 获取相关介绍 - getInfoIntroduce: { - url: '/info_common/getInfoIntroduce', - method: 'GET', - auth: true, - }, - // 获取个人邀请码 - getInviteCode: { - url: '/info_common/getInviteCode', - method: 'GET', - auth: true, - }, - // 获取订单列表带分页 - getOrderPageList: { - url: '/info_common/getOrderPageList', - method: 'GET', - auth: true, - }, - // 获取订单详情 - getOrderDetail: { - url: '/info_common/getOrderDetail', - method: 'GET', - auth: true, - }, - // 获取流水记录带分页 - getWaterPageList: { - url: '/info_common/getWaterPageList', - method: 'GET', - auth: true, - }, - // 获取相关介绍 - getInfoIntroduce: { - url: '/info_common/getInfoIntroduce', - method: 'GET', - }, - // 获取相关介绍详情 - getInfoIntroduceDetail: { - url: '/info_common/getRiceNewsDetail', - method: 'GET', - }, - // 查询个人信息相关 - getRiceInfo: { - url: '/info_common/getRiceInfo', - method: 'GET', - limit: 500, - }, - // 获取购物车信息列表带分页 - getCartPageList: { - url: '/info_common/getCartPageList', - method: 'GET', - }, - // 领取新人优惠券 - getRiceCoupon: { - url: '/info_common/getRiceCoupon', - method: 'GET', - limit: 500, - auth: true, - }, + // // 充值 + // recharge: { + // url: '/recycle-admin/applet/money/withdraw', + // method: 'GET', + // auth: true, + // limit: 1000, + // showLoading: true, + // }, + // // 获取地址列表带分页 + // getAddressPageList: { + // url: '/info_common/getAddressPageList', + // method: 'GET', + // auth: true, + // }, + // // 增加或修改地址信息 + // addOrUpdateAddress: { + // url: '/info_common/addOrUpdateAddress', + // method: 'POST', + // limit: 500, + // auth: true, + // showLoading: true, + // }, + // // 删除地址 + // deleteAddress: { + // url: '/info_common/deleteAddress', + // method: 'GET', + // limit: 500, + // auth: true, + // showLoading: true, + // }, + // // 修改默认地址 + // updateDefaultAddress: { + // url: '/info_common/updateDefaultAddress', + // method: 'GET', + // auth: true, + // limit: 1000, + // }, + // // 获取粉丝列表带分页 + // getFansPageList: { + // url: '/info_common/getFansPageList', + // method: 'GET', + // auth: true, + // }, + // // 获取相关介绍 + // getInfoIntroduce: { + // url: '/info_common/getInfoIntroduce', + // method: 'GET', + // auth: true, + // }, + // // 获取个人邀请码 + // getInviteCode: { + // url: '/info_common/getInviteCode', + // method: 'GET', + // auth: true, + // }, + // // 获取订单列表带分页 + // getOrderPageList: { + // url: '/info_common/getOrderPageList', + // method: 'GET', + // auth: true, + // }, + // // 获取订单详情 + // getOrderDetail: { + // url: '/info_common/getOrderDetail', + // method: 'GET', + // auth: true, + // }, + // // 获取流水记录带分页 + // getWaterPageList: { + // url: '/info_common/getWaterPageList', + // method: 'GET', + // auth: true, + // }, + // // 获取相关介绍 + // getInfoIntroduce: { + // url: '/info_common/getInfoIntroduce', + // method: 'GET', + // }, + // // 获取相关介绍详情 + // getInfoIntroduceDetail: { + // url: '/info_common/getRiceNewsDetail', + // method: 'GET', + // }, + // // 查询个人信息相关 + // getRiceInfo: { + // url: '/info_common/getRiceInfo', + // method: 'GET', + // limit: 500, + // }, + // // 获取购物车信息列表带分页 + // getCartPageList: { + // url: '/info_common/getCartPageList', + // method: 'GET', + // }, + // // 领取新人优惠券 + // getRiceCoupon: { + // url: '/info_common/getRiceCoupon', + // method: 'GET', + // limit: 500, + // auth: true, + // }, } export default api \ No newline at end of file diff --git a/api/model/recyclingDestination.js b/api/model/recyclingDestination.js index 1a7c362..5e139a0 100644 --- a/api/model/recyclingDestination.js +++ b/api/model/recyclingDestination.js @@ -18,13 +18,20 @@ const api = { method: 'GET', auth : false, }, - // 联系客服问题相关详情 + // 提现 withdraw: { url: '/recycle-admin/applet/money/withdraw', method: 'POST', auth : true, + limit: 2000, + showLoading: true, + }, + // 提现领取成功 + withdrawSUccess: { + url: '/recycle-admin/applet/money/withdrawSUccess', + method: 'POST', + auth : true, }, - } export default api \ No newline at end of file diff --git a/config.js b/config.js index b78c2f0..d166eb8 100644 --- a/config.js +++ b/config.js @@ -24,7 +24,8 @@ const defaultConfig = { bucket: 'ossddmhs', endpoint: 'oss-cn-hangzhou.aliyuncs.com', } - } + }, + mchId: '1701841654', } import utils from './utils/utils.js' diff --git a/manifest.json b/manifest.json index cba5c08..db6f562 100644 --- a/manifest.json +++ b/manifest.json @@ -55,9 +55,7 @@ "urlCheck" : false }, "usingComponents" : true, - "requiredPrivateInfos" : [ - "chooseLocation" - ], + "requiredPrivateInfos" : [ "chooseLocation" ], "permission" : { "scope.userLocation" : { "desc" : "您的位置信息将用于选择寄件地址" diff --git a/pages/subcomponent/promotion-withdraw-record.vue b/pages/subcomponent/promotion-withdraw-record.vue index 4bf6c94..784cbf3 100644 --- a/pages/subcomponent/promotion-withdraw-record.vue +++ b/pages/subcomponent/promotion-withdraw-record.vue @@ -1,46 +1,253 @@ \ No newline at end of file + \ No newline at end of file