diff --git a/api/model/order.js b/api/model/order.js index c07fd82..577ea14 100644 --- a/api/model/order.js +++ b/api/model/order.js @@ -32,6 +32,11 @@ const api = { url: '/order_common/signIn', method: 'POST', }, + // 创建订单 + createOrder: { + url: '/order_common/createOrder', + method: 'POST', + }, } export default api \ No newline at end of file diff --git a/config.js b/config.js index 313873b..e5f5c44 100644 --- a/config.js +++ b/config.js @@ -29,17 +29,17 @@ const config = { const defaultConfig = { mapKey : 'XMBBZ-BCPCV-SXPPQ-5Y7MY-PHZXK-YFFVU', aliOss : { - url : 'https://tennis-oss.xzaiyp.top/', + url : 'https://image.hhlm1688.com/', config : { //桶的地址 - region: 'oss-cn-guangzhou', + region: 'oss-cn-shenzhen', //id - accessKeyId:'LTAI5tNycA46YTwm383dRvMV', + accessKeyId:'LTAI5tQSs47izVy8DLVdwUU9', //密钥 - accessKeySecret:'tAdbYQCmdur6jbZ8hjvgB7T1Z52mIG', + accessKeySecret:'qHI7C3PaXYZySr84HTToviC71AYlFq', //桶的名字 - bucket: 'zhuoqiu-image', - endpoint:'oss-cn-guangzhou.aliyuncs.com', + bucket: 'hanhaiimage', + endpoint:'oss-cn-shenzhen.aliyuncs.com', } }, } diff --git a/pages_order/huodong-detail.vue b/pages_order/huodong-detail.vue index dfd77e2..b2c22de 100644 --- a/pages_order/huodong-detail.vue +++ b/pages_order/huodong-detail.vue @@ -5,7 +5,7 @@ - + {{activityDetails.title}} 开始时间:{{activityDetails.startTime}} @@ -123,6 +123,11 @@ ] } }, + computed:{ + imageArr() { + return this.activityDetails.image.split(',') + } + }, onPageScroll(e) { if(e.scrollTop > 50) { this.bgColor = '#49070c' @@ -148,7 +153,20 @@ this.chooseIndex = i }, confirmClick() { - + this.$api('createOrder',{id:this.activityDetails.id},res=>{ + if(res.code === 200) { + uni.requestPaymentWxPay(res) + .then(res => { + uni.showToast({ + title: '下单成功', + icon: 'none' + }) + + }).catch(n => { + + }) + } + }) } } } @@ -176,6 +194,7 @@ .image-box { width: 100%; height: 546rpx; + border-radius: 12rpx; } .msg-box { background: #1B1713;