From 4b3d83007be6df747ea7b4a21dfa41c17080208c Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Thu, 11 Aug 2022 15:48:33 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=88=B6Vip=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/index.js | 4 +- apis/interfaces/store.js | 10 +- apis/interfaces/user.js | 13 +- apis/interfaces/vip.js | 27 +- components/pin-goods-item/index.vue | 31 +- components/readme.md | 75 - components/vip-goods-item/index.vue | 157 + manifest.json | 3 + pages.json | 37 + pages/group-book/index.vue | 2 +- pages/rank/index.vue | 16 +- pages/store/buy.vue | 746 +++-- pages/store/goods.vue | 365 ++- pages/store/index.vue | 892 +++--- pages/store/shop/shopDetail.vue | 741 ++--- pages/store/vip-list/vip-list.vue | 126 + pages/store/vip/index/index.vue | 317 ++ pages/store/vip/success/success.vue | 164 + pages/user/index.vue | 21 +- pages/user/my-card/my-card.vue | 164 + pages/vip/vip.vue | 8 +- static/.DS_Store | Bin 0 -> 6148 bytes static/book/wen.png | Bin 0 -> 4470 bytes static/store/30-day.png | Bin 0 -> 4874 bytes static/store/store-vip-bg.png | Bin 0 -> 145894 bytes static/store/store-vip-bg的副本.png | Bin 0 -> 24721 bytes static/store/type_1.png | Bin 0 -> 3605 bytes static/store/vip-left-bottom.png | Bin 0 -> 150 bytes static/store/vip-left-top.png | Bin 0 -> 143 bytes static/store/vip-right-bottom.png | Bin 0 -> 146 bytes static/store/vip-right-top.png | Bin 0 -> 147 bytes .../dist/dev/app-plus/app-config-service.js | 4 +- unpackage/dist/dev/app-plus/app-service.js | 2710 +++++++++++++---- unpackage/dist/dev/app-plus/app-view.js | 2613 +++++++++++++--- unpackage/dist/dev/app-plus/manifest.json | 2 +- 35 files changed, 6869 insertions(+), 2379 deletions(-) delete mode 100644 components/readme.md create mode 100644 components/vip-goods-item/index.vue create mode 100644 pages/store/vip-list/vip-list.vue create mode 100644 pages/store/vip/index/index.vue create mode 100644 pages/store/vip/success/success.vue create mode 100644 pages/user/my-card/my-card.vue create mode 100644 static/.DS_Store create mode 100644 static/book/wen.png create mode 100644 static/store/30-day.png create mode 100644 static/store/store-vip-bg.png create mode 100644 static/store/store-vip-bg的副本.png create mode 100644 static/store/type_1.png create mode 100644 static/store/vip-left-bottom.png create mode 100644 static/store/vip-left-top.png create mode 100644 static/store/vip-right-bottom.png create mode 100644 static/store/vip-right-top.png diff --git a/apis/index.js b/apis/index.js index 7a3e1e6..1482555 100644 --- a/apis/index.js +++ b/apis/index.js @@ -10,8 +10,8 @@ import router from '../router' // 基础配置 const config = { - // apiUrl : 'https://api.gongli.vip/api/', // 正式环境 - apiUrl : 'http://api.gl.shangkelian.cn/api/', // 测试 + apiUrl : 'https://api.gongli.vip/api/', // 正式环境 + // apiUrl : 'http://api.gl.shangkelian.cn/api/', // 测试 timeout : 60000 } diff --git a/apis/interfaces/store.js b/apis/interfaces/store.js index 17aec21..ecbdcdc 100644 --- a/apis/interfaces/store.js +++ b/apis/interfaces/store.js @@ -34,20 +34,18 @@ const shops = (categoryId,page) => { // 店铺详情 const shopsDetail = (shopId) => { + console.log(shopId,'shopId.....') return request({ url: 'mall/shops/' + shopId, }) } // 店铺商品 -const shopsGoods = (shopId, categoryId,page) => { +const shopsGoods = (data) => { + console.log(data,'shopsGoods.....') return request({ url: 'mall/goods', - data: { - shop_id:shopId, - category_id:categoryId, - page:page, - } + data: data }) } diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js index c5e2a65..4450865 100644 --- a/apis/interfaces/user.js +++ b/apis/interfaces/user.js @@ -51,10 +51,21 @@ const relationsVerify = (invite) => { }) } +// 我的卡券 +const myCard = (data) => { + data.receive = 'desc' + return request({ + url: 'mall/shops/users', + data:data + }) +} + + export { info, chainSeed, invitationCode, relationsBind, - relationsVerify + relationsVerify, + myCard } diff --git a/apis/interfaces/vip.js b/apis/interfaces/vip.js index ecf1911..e360612 100644 --- a/apis/interfaces/vip.js +++ b/apis/interfaces/vip.js @@ -22,7 +22,7 @@ const vipPay = () => { }) } -// 获取支付信息 +// 获取支付信息 const payInfo = (orderId) => { return request({ url: 'user/identities/pay/' + orderId + '/wechat' @@ -36,6 +36,28 @@ const agreement = (id) => { }) } +// 店铺会员 +const shopVipInfo = (id) => { + return request({ + url: 'mall/shops/'+id+'/identities' + }) +} + +//开通店铺会员 +const shopVipCreate = (id,identity) => { + return request({ + url: 'mall/shops/'+id+'/identities/'+identity, + method:'POST' + }) +} + +// 开通店铺会员微信支付 +const shopVipWeChat = (id) => { + return request({ + url: 'mall/shops/identities/wechat/'+id, + method:'POST' + }) +} export { @@ -43,4 +65,7 @@ export { vipPay, payInfo, agreement, + shopVipInfo, + shopVipCreate, + shopVipWeChat } diff --git a/components/pin-goods-item/index.vue b/components/pin-goods-item/index.vue index 0f99d71..726e315 100644 --- a/components/pin-goods-item/index.vue +++ b/components/pin-goods-item/index.vue @@ -1,20 +1,16 @@ -