diff --git a/components/area-product-list/index.vue b/components/area-product-list/index.vue index 111092c..4965140 100644 --- a/components/area-product-list/index.vue +++ b/components/area-product-list/index.vue @@ -39,7 +39,7 @@ {{ item.waresName }} - {{ formatPrice(item.waresPrice) }} + {{ formatCurrency(item.waresPrice) }} import { numberToCurrencyNo, isLocal, isLocaled } from '@/util/numberToCurrency' import { addShopping } from '@/config/goods' +import { formatCurrency } from '@/util/index.js' export default { props: { title: { @@ -75,8 +76,7 @@ export default { }, list: { type: Array, - default: () => [ - ], + default: () => [], }, specialAreaId: { type: [Number, String], @@ -85,7 +85,7 @@ export default { size: { type: String, default: 'normal', // 'normal' or 'small' - validator: (value) => ['normal', 'small'].includes(value), + validator: value => ['normal', 'small'].includes(value), }, }, computed: { @@ -95,6 +95,7 @@ export default { }, methods: { isLocaled, + formatCurrency, formatPrice(price) { // 使用numberToCurrencyNo和isLocal函数来格式化价格 return isLocal(numberToCurrencyNo(price)) @@ -125,7 +126,7 @@ export default { icon: 'success', mask: true, }) - this.$store.dispatch("getCarLength"); + this.$store.dispatch('getCarLength') } }) }, @@ -157,10 +158,10 @@ export default { } .header-bg { - left: -16rpx; - right: -16rpx; - border-top-left-radius: 6px; - border-top-right-radius: 6px; + left: -16rpx; + right: -16rpx; + border-top-left-radius: 6px; + border-top-right-radius: 6px; } .area-title { @@ -188,7 +189,7 @@ export default { } .product-item { - padding: 0 8rpx; + padding: 0 8rpx; } .product-image { diff --git a/config/login.js b/config/login.js index e082941..3597429 100644 --- a/config/login.js +++ b/config/login.js @@ -1,118 +1,150 @@ - const http = uni.$u.http // 验证码 -export const captchaImage = (params) => http.get('/code', { params }) +export const captchaImage = params => http.get('/code', { params }) // 登录 -export const login = (params) => http.post('/member/auth/api/login', params) +export const login = params => http.post('/member/auth/api/login', params) //用户信息 -export const getInfo = (params) => http.get('/member/api/member/get-info', { params }) +export const getInfo = params => + http.get('/member/api/member/get-info', { params }) //获取个人资料 -export const getData = (params) => http.get('/member/api/member/get-data', { params }) +export const getData = params => + http.get('/member/api/member/get-data', { params }) //获取会员卡信息 -export const getCard = (params) => http.get('/member/api/member/get-card', { params }) +export const getCard = params => + http.get('/member/api/member/get-card', { params }) //获取验证码 -export const verification = (params) => http.get('/member/api/sms/self-verification', { params }) +export const verification = params => + http.get('/member/api/sms/self-verification', { params }) //忘记密码获取验证码 -export const forgetVerification = (params) => http.get('/member/api/sms/forget-verification', { params }) +export const forgetVerification = params => + http.get('/member/api/sms/forget-verification', { params }) //保存地址 -export const saveAddress = (data) => http.post('/member/api/member-address/save', data) +export const saveAddress = data => + http.post('/member/api/member-address/save', data) //更新密码 -export const updatePassword = (data) => http.put('/member/api/member/update-password', data) +export const updatePassword = data => + http.put('/member/api/member/update-password', data) //忘记密码更新 -export const forgetPassword = (data) => http.put('/member/api/member/forget-password', data) +export const forgetPassword = data => + http.put('/member/api/member/forget-password', data) //获取地址详情 -export const getAddress = (params) => http.get('/member/api/member-address/detail/' + params) +export const getAddress = params => + http.get('/member/api/member-address/detail/' + params) //获取菜单权限 -export const menuList = (data) => http.get('/system/api/menu/list', data) +export const menuList = data => http.get('/system/api/menu/list', data) //更新个人资料 -export const updateData = (data) => http.put('/member/api/member/update-data', data) +export const updateData = data => + http.put('/member/api/member/update-data', data) //奖金来源 -export const queryBonusDetail = (data, data1) => http.post('/bonus/api/bonus/query-bonus-detail/' + data1, data) +export const queryBonusDetail = (data, data1) => + http.post('/bonus/api/bonus/query-bonus-detail/' + data1, data) //首购收益 -export const queryBonusFirst = (data, data1) => http.post('/bonus/api/bonus/query-bonus-first/' + data1, data) +export const queryBonusFirst = (data, data1) => + http.post('/bonus/api/bonus/query-bonus-first/' + data1, data) //复购收益 -export const queryBonusRepurchase = (data, data1) => http.post('/bonus/api/bonus/query-bonus-repurchase/' + data1, data) +export const queryBonusRepurchase = (data, data1) => + http.post('/bonus/api/bonus/query-bonus-repurchase/' + data1, data) //嗨粉收益 -export const queryBonusHiFun = (data, data1) => http.post('/bonus/api/bonus/query-bonus-hi-fun' + data1, data) +export const queryBonusHiFun = (data, data1) => + http.post('/bonus/api/bonus/query-bonus-hi-fun' + data1, data) //云代收益 -export const queryBonusCloud = (data, data1) => http.post('/bonus/api/bonus/query-bonus-cloud/' + data1, data) +export const queryBonusCloud = (data, data1) => + http.post('/bonus/api/bonus/query-bonus-cloud/' + data1, data) //复购券收益 -export const queryBonusCoupon = (data, data1) => http.post('/bonus/api/bonus/query-bonus-coupon/' + data1, data) +export const queryBonusCoupon = (data, data1) => + http.post('/bonus/api/bonus/query-bonus-coupon/' + data1, data) //创客空间收益 -export const queryBonusMaker = (data, data1) => http.post('/bonus/api/bonus/query-bonus-maker/' + data1, data) +export const queryBonusMaker = (data, data1) => + http.post('/bonus/api/bonus/query-bonus-maker/' + data1, data) //海粉收益 -export const queryBonusHaiFun = (data, data1) => http.post('/bonus/api/bonus/query-bonus-hai-fun/' + data1, data) +export const queryBonusHaiFun = (data, data1) => + http.post('/bonus/api/bonus/query-bonus-hai-fun/' + data1, data) //获取奖金收益类型 -export const getBonusType = (params) => http.get('/system/api/bd-bonus-items/list', { params }) +export const getBonusType = params => + http.get('/system/api/bd-bonus-items/list', { params }) //获取语言下拉 - //上传图片 -export const updateFile = (params) => http.post('/system/upload', params) +export const updateFile = params => http.post('/system/upload', params) // 退出方法 export const logout = () => http.delete('/member/auth/api/logout') //订单数量 -export const orderNum = (params) => http.get('/sale/api/my-order/num', { params }) +export const orderNum = params => http.get('/sale/api/my-order/num', { params }) //获取用户是否显示弹窗 -export const indexPopScreen = (params) => http.get('/system/api/notice/index-pop-screen', { params }) +export const indexPopScreen = params => + http.get('/system/api/notice/index-pop-screen', { params }) //菜单权限 -export const getMenuList = (params) => http.get('/system/api/menu/list', { params }) +export const getMenuList = params => + http.get('/system/api/menu/list', { params }) //海粉默认登录(H5扫码使用) -export const autoLogin = (params) => http.post('/member/auth/api/auto-login', params) +export const autoLogin = params => + http.post('/member/auth/api/auto-login', params) //海粉商品 -export const queryWares = (params) => http.post('/sale/api/wares/query-spe-wares-copy', params) +export const queryWares = params => + http.post('/sale/api/wares/query-spe-wares-copy', params) //保存礼品地址 -export const saveGiftAddress = (params) => http.post('/member/api/member-gift/update-gift', params) +export const saveGiftAddress = params => + http.post('/member/api/member-gift/update-gift', params) //获取会员真实奖衔 -export const getUserAwards = (params) => http.get('/member/api/member/index-member-awards', { params }) +export const getUserAwards = params => + http.get('/member/api/member/index-member-awards', { params }) //获取安置人编号 -export const fansConvertCode = (params) => http.get('/member/api/member/fans-convert-code/'+params ) +export const fansConvertCode = params => + http.get('/member/api/member/fans-convert-code/' + params) //获取荣誉奖衔 -export const getIndexAwards = (params) => http.get('/member/api/member/index-awards', { params }) +export const getIndexAwards = params => + http.get('/member/api/member/index-awards', { params }) //当前用户短信验证码 -export const selfVerification = (params) => http.get('/member/api/sms/self-verification', { params }) +export const selfVerification = params => + http.get('/member/api/sms/self-verification', { params }) // 重置支付密码获取验证码 -export const resetPayPasswordVerification = (params) => http.get('/member/api/sms/reset-verification', { params }) +export const resetPayPasswordVerification = params => + http.get('/member/api/sms/reset-verification', { params }) //更新支付密码 -export const forgetPayPassword = (data) => http.put('/member/api/member/forget-pay-password', data) +export const forgetPayPassword = data => + http.put('/member/api/member/forget-pay-password', data) // 站内信弹窗 -export const getIndexPopmail = (params) => http.get('/system/api/notice/index-pop-mail', { params }) +export const getIndexPopmail = params => + http.get('/system/api/notice/index-pop-mail', { params }) //站内信弹窗已读 -export const getNoticeDetail = (params) => http.get('/system/api/notice/index-detail', { params }) +export const getNoticeDetail = params => + http.get('/system/api/notice/index-detail', { params }) //校验服务有效期 -export const agreement_expire = (params) => http.get('/member/api/member/agreement_expire', { params }) +export const agreement_expire = params => + http.get('/member/api/member/agreement_expire', { params }) //创客空间收益 -export const markBonus = (params) => http.post('/bonus/api/bonus/query-mark-bonus-detail', params) +export const markBonus = params => + http.post('/bonus/api/bonus/query-mark-bonus-detail', params) diff --git a/config/request.js b/config/request.js index 7a85d8a..87a834b 100644 --- a/config/request.js +++ b/config/request.js @@ -5,7 +5,14 @@ * @Date: 2022-05-24 14:43:45 */ import { getToken, removeToken } from '@/config/auth.js' + module.exports = vm => { + // 检查uni.$u.http是否可用 + if (!uni || !uni.$u || !uni.$u.http) { + console.warn('uni.$u.http is not available, request configuration skipped') + return + } + // 初始化请求配置 uni.$u.http.setConfig(config => { // config.baseURL = 'https://p1.hzs413.com/inter-api'; @@ -13,7 +20,7 @@ module.exports = vm => { //#ifdef DEV_SERVER console.log('DEV_SERVER') - config.baseURL = 'http://localhost:8080' + config.baseURL = '/prod-api' //#endif //#ifdef QA_SERVER diff --git a/pages/index/index.vue b/pages/index/index.vue index ad19c89..6063eea 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,24 +1,10 @@ -