diff --git a/api/help.js b/api/help.js index 6f99c1b..eb1f342 100644 --- a/api/help.js +++ b/api/help.js @@ -3,7 +3,8 @@ import request from '@/utils/request' // api地址 const api = { list: 'help/list', - helpList:'article/helpCenter' + helpList:'article/helpCenter', + addGoodsSource:'user/addGoodsSource' } // 帮助中心列表 @@ -13,4 +14,8 @@ export const list = (param) => { // 帮助中心列表 export const helpList = (param) => { return request.get(api.helpList, param) +} +// 我要找货 +export const addGoodsSource = (param) => { + return request.post(api.addGoodsSource, param) } \ No newline at end of file diff --git a/api/member/index.js b/api/member/index.js new file mode 100644 index 0000000..71be294 --- /dev/null +++ b/api/member/index.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +// api地址 +const api = { + info: 'identity/userPriceList', + submit:'identity/submit', + dealerPriceList:'identity/dealerPriceList', + userOpenCardLog:'identity/userOpenCardLog' +} + +// 会员信息 +export const info = (param) => { + return request.post(api.info, param) +} +// 分销会员信息 +export const dealerPriceList = (param) => { + return request.post(api.dealerPriceList, param) +} +// 会员信息 +export const submit = (param) => { + return request.post(api.submit, param) +} + +// +export const userOpenCardLog = (param) => { + return request.post(api.userOpenCardLog, param) +} \ No newline at end of file diff --git a/pages/login/components/mp-weixin-mobile.vue b/pages/login/components/mp-weixin-mobile.vue index 3897b90..ff47ce8 100644 --- a/pages/login/components/mp-weixin-mobile.vue +++ b/pages/login/components/mp-weixin-mobile.vue @@ -15,23 +15,18 @@ import { isEmpty, inArray } from '@/utils/util' export default { - props: { - // 是否存在第三方用户信息 - isParty: { - type: Boolean, - default: () => false - }, - // 第三方用户信息数据 - partyData: { - type: Object - } - }, + data() { return { // 微信小程序登录凭证 (code) // 提交到后端，用于换取openid - code: '' + code: '', + userInfo:{}, + partyData:{ + // oauth:'MP-WEIXIN' + }, + isParty:true, } }, @@ -59,7 +54,7 @@ encryptedData: detail.encryptedData, iv: detail.iv, isParty: app.isParty, - partyData: app.partyData, + partyData: app.userInfo, refereeId: store.getters.refereeId }) .then(result => { @@ -88,11 +83,24 @@ // 获取微信登录的code // https://developers.weixin.qq.com/miniprogram/dev/api/open-api/login/wx.login.html getCode() { + const that = this return new Promise((resolve, reject) => { uni.login({ provider: 'weixin', success: res => { console.log('code', res.code) + uni.getUserInfo({ + provider: 'weixin', + success: function(info) { + console.log(info,'用户信息') + that.userInfo.nickName = info.userInfo.nickName + that.userInfo.gender = info.userInfo.gender + that.userInfo.avatarUrl = info.userInfo.avatarUrl + // if(info.userInfo){ + // that.isParty = true + // } + } + }) resolve(res.code) }, fail: reject diff --git a/pages/login/index.vue b/pages/login/index.vue index 491d99e..f791be1 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -10,9 +10,8 @@ +86 - - 获取验证码 + + 获取验证码 {{countdown}} @@ -20,14 +19,23 @@ 登录 + + + @@ -252,6 +334,7 @@ height: 114rpx; margin-right: 30rpx; margin-top: 12rpx; + border-radius: 50%; } .meInfo { @@ -295,7 +378,8 @@ } } - .buyInfo{ + + .buyInfo { // width: 112rpx; height: 40rpx; font-size: 28rpx; @@ -303,11 +387,13 @@ font-weight: 400; color: #785B45; line-height: 40rpx; - margin-left: 86rpx; + // margin-left: 86rpx; } } .notVip { + padding-bottom: 200rpx; + .openVip { height: 44rpx; font-size: 32rpx; @@ -334,6 +420,7 @@ flex-direction: column; align-items: center; margin-right: 6rpx; + margin-bottom: 8rpx; .itemImg { width: 88rpx; @@ -392,6 +479,7 @@ border-radius: 0rpx 0rpx 0rpx 0rpx; opacity: 1; margin: 0 0 20rpx 32rpx; + text-align: center; } .timeLong { @@ -414,7 +502,7 @@ width: 100%; text-align: center; height: 72rpx; - font-size: 52rpx; + font-size: 36rpx; font-family: PingFang SC, PingFang SC; font-weight: 600; color: #F34A40; @@ -475,6 +563,7 @@ } } } + .footer { position: fixed; bottom: 0rpx; @@ -483,6 +572,8 @@ display: flex; justify-content: space-between; align-items: center; + z-index: 99; + background-color: #fff; .fLeft { margin: 24rpx 0 0 74rpx; diff --git a/pages/memberInfo/index.vue b/pages/memberInfo/index.vue index dc84a4c..f14abc1 100644 --- a/pages/memberInfo/index.vue +++ b/pages/memberInfo/index.vue @@ -65,7 +65,8 @@ diff --git a/pages/news1/help.vue b/pages/news1/help.vue index 9b88040..27bc1e9 100644 --- a/pages/news1/help.vue +++ b/pages/news1/help.vue @@ -5,7 +5,7 @@ - + {{item.name}} @@ -30,62 +30,7 @@ export default { data() { return { - itemList: [{ - title: '物流问题', - icon: '/static/news1/n1.png', - children: ['发货失效', '发货时间', '催促物流', '修改收货地址'] - }, - { - title: '', - icon: '', - children: ['延迟发货', '物流状态不更新', '商品验货与签收', '配送快递'] - }, - { - title: '售后问题', - icon: '/static/news1/n2.png', - children: ['如何申请退货', '如何申请换货', '退换货运费政策', '退换货何时退款'] - }, - { - title: '', - icon: '', - children: ['退换货政策', '极速售后服务', '维修政策', '退换货地址如何查看'] - }, - { - title: '订单问题', - icon: '/static/news1/n3.png', - children: ['修改订单', '取消订单', '价格保护', '发票服务'] - }, - { - title: '', - icon: '', - children: ['商城理的商品1234567', '商城实物与图片3456768', '违规订单处理123456', '话费充值说明'] - }, - { - title: '活动问题', - icon: '/static/news1/n4.png', - children: ['余额', '秒杀说明', '预售说明', '积分规则'] - }, - { - title: '', - icon: '', - children: ['红包说明', 'plus会员', '分销员', '团购说明'] - }, - { - title: '风控规则', - icon: '/static/news1/n5.png', - children: ['风控规则', '', '', ''] - }, - { - title: '服务政策', - icon: '/static/news1/n6.png', - children: ['隐私政策', '商务合作', '会员协议', '分销协议'] - }, - { - title: '', - icon: '', - children: ['常见问题', '', '退换货细则', '争议处理判定标准'] - }, - ], + itemList: [], } }, diff --git a/pages/news1/huoyuan.vue b/pages/news1/huoyuan.vue index 1fbae25..8029c32 100644 --- a/pages/news1/huoyuan.vue +++ b/pages/news1/huoyuan.vue @@ -1,111 +1,118 @@ \ No newline at end of file diff --git a/pages/user/index.vue b/pages/user/index.vue index 0d0971c..f8ed790 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -1,7 +1,7 @@