diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 582561b..db6692c 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -4,7 +4,7 @@ "configurations": [{ "app-plus" : { - "launchtype" : "local" + "launchtype" : "remote" }, "default" : { diff --git a/apis/interfaces/account.js b/apis/interfaces/account.js index 9ee7762..ebf0494 100644 --- a/apis/interfaces/account.js +++ b/apis/interfaces/account.js @@ -24,7 +24,17 @@ const recharge = (data) => { }) } +// 订单信息 +const payment = (data) => { + return request({ + url: "user/transaction/recharge/payment", + method: "POST", + data + }) +} + export { dt, - recharge + recharge, + payment } diff --git a/apis/interfaces/store.js b/apis/interfaces/store.js index c7714b0..904e7f0 100644 --- a/apis/interfaces/store.js +++ b/apis/interfaces/store.js @@ -39,11 +39,12 @@ const shopsDetail = (shopId) => { } // 店铺商品 -const shopsGoods = (shop_id) => { +const shopsGoods = (shop_id, category_id) => { return request({ url: 'mall/goods', data: { - shop_id + shop_id, + category_id } }) } diff --git a/apis/interfaces/vip.js b/apis/interfaces/vip.js index 63f6d37..2f39123 100644 --- a/apis/interfaces/vip.js +++ b/apis/interfaces/vip.js @@ -18,14 +18,14 @@ const vip = () =>{ // 开通会员 const vipPay = () => { return request({ - url: '' + url: 'user/identities/buyvip' }) } // 获取支付信息 -const payInfo = () => { +const payInfo = (orderId) => { return request({ - url: '' + url: 'user/identities/pay/' + orderId + '/wechat' }) } diff --git a/manifest.json b/manifest.json index 5d7a044..29f3a55 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { - "name" : "ZH-HEALTH", + "name" : "共力生态", "appid" : "__UNI__DE7B0E6", - "description" : "ZH-HEALTH,您手上的健康管理专家", + "description" : "共力生态", "versionName" : "1.0.22", "versionCode" : 100, "transformPx" : false, @@ -78,7 +78,7 @@ "payment" : { "weixin" : { "__platform__" : [ "android" ], - "appid" : "wx74b2fcb478707364", + "appid" : "wxcb85e48d044bc5ee", "UniversalLinks" : "" }, "alipay" : { @@ -87,14 +87,12 @@ }, "share" : { "weixin" : { - "appid" : "wx74b2fcb478707364", + "appid" : "wxcb85e48d044bc5ee", "UniversalLinks" : "" } }, "ad" : {}, - "push" : { - "unipush" : {} - }, + "push" : {}, "geolocation" : { "system" : { "__platform__" : [ "android" ] diff --git a/pages/account/recharge.vue b/pages/account/recharge.vue index eefb7b5..384231d 100644 --- a/pages/account/recharge.vue +++ b/pages/account/recharge.vue @@ -15,25 +15,25 @@ - 50 - 50DT积分 - - 100 100DT积分 - + 200 200DT积分 - + 500 500DT积分 - + 1000 1000DT积分 + + 3000 + 3000DT积分 + 5000 5000DT积分 @@ -48,7 +48,7 @@