diff --git a/api/activity.js b/api/activity.js index 3d51e010..935f03ee 100644 --- a/api/activity.js +++ b/api/activity.js @@ -35,6 +35,13 @@ export function postCombinationRemove(data) { return request.post("combination/remove",data); } +/** + * 拼团 更多拼团 + */ +export function getCombinationMore(data) { + return request.get("combination/more",data,{noAuth:true}); +} + /** * 砍价列表 */ @@ -72,7 +79,7 @@ export function getBargainDetail(id) { * 砍价 开启砍价用户信息 */ export function postBargainStartUser(data) { - return request.post("bargain/start/user", data); + return request.get("bargain/start/user", data); } /** @@ -97,24 +104,24 @@ export function postBargainHelpPrice(data) { } /** - * 砍价 砍价帮 + * 砍价 砍价帮 */ -export function postBargainHelpList(data) { - return request.post("bargain/help/list", data); +export function postBargainHelpList(params,data) { + return request.get("bargain/help/list?limit="+params.limit+"&page="+params.page, data,{}); } /** * 砍价 砍价帮总人数、剩余金额、进度条、已经砍掉的价格 */ export function postBargainHelpCount(data) { - return request.post("bargain/help/count", data); + return request.get("bargain/help/count", data,1); } /** * 砍价 观看/分享/参与次数 */ export function postBargainShare(bargainId) { - return request.post("bargain/share", { bargainId: bargainId}); + return request.get("bargain/share/" + bargainId); } /** diff --git a/api/order.js b/api/order.js index 76933ca2..a170677d 100644 --- a/api/order.js +++ b/api/order.js @@ -168,12 +168,14 @@ export function orderRefundVerify(data) { * 订单确认获取订单详细信息 * @param string cartId */ -export function orderConfirm(cartId, isNew, addAgain,secKill) { +export function orderConfirm(cartId, isNew, addAgain,secKill,combination,bargain) { return request.post('order/confirm', { cartIds: cartId, isNew: isNew, addAgain: addAgain, - secKill: secKill + secKill: secKill, + combination:combination, + bargain:bargain }, {}, 1); } diff --git a/components/countDown/index.vue b/components/countDown/index.vue index 6c6e38e9..7d035fea 100644 --- a/components/countDown/index.vue +++ b/components/countDown/index.vue @@ -68,7 +68,7 @@ function runTime() { //时间函数 - let intDiff = that.datatime - Date.parse(new Date()) / 1000; //获取数据中的时间戳的时间差； + let intDiff = that.datatime - Date.parse(new Date())/1000; //获取数据中的时间戳的时间差； let day = 0, hour = 0, minute = 0, diff --git a/components/couponListWindow/备份.vue b/components/couponListWindow/备份.vue index 35d08e35..23359206 100644 --- a/components/couponListWindow/备份.vue +++ b/components/couponListWindow/备份.vue @@ -30,7 +30,7 @@ - + diff --git a/components/easy-upload/easy-upload.vue b/components/easy-upload/easy-upload.vue index 05f9718e..f90721d1 100644 --- a/components/easy-upload/easy-upload.vue +++ b/components/easy-upload/easy-upload.vue @@ -161,7 +161,6 @@ }); }, upload(){ - debugger if(!this.uploadUrl) { uni.showModal({ content: '请填写上传接口' diff --git a/components/emptyPage.vue b/components/emptyPage.vue index 64f1b7b5..17814c3e 100644 --- a/components/emptyPage.vue +++ b/components/emptyPage.vue @@ -1,6 +1,6 @@ diff --git a/components/payment/index.vue b/components/payment/index.vue index 597ac21d..7167e20d 100644 --- a/components/payment/index.vue +++ b/components/payment/index.vue @@ -77,8 +77,12 @@ 'from': 'routine', // #endif // #ifdef H5 || APP-PLUS - 'from': this.$wechat.isWeixin() ? 'weixin' : 'weixinh5', + 'from': this.$wechat.isWeixin() ? 'public' : 'weixinh5' // #endif + // // #ifdef H5 + // quitUrl: location.port ? location.protocol + '//' + location.hostname + ':' + location.port + '/pages/users/order_details/index?order_id=' + this.order_id : location.protocol + '//' + location.hostname + + // '/pages/users/order_details/index?order_id=' + that.order_id + // // #endif }).then(res => { switch (paytype) { case 'weixin': @@ -87,11 +91,11 @@ }); // #ifdef MP || APP-PLUS let jsConfig = res.data.jsConfig; - let packages = 'prepay_id=' + jsConfig.prepayId; + // let packages = 'prepay_id=' + jsConfig.prepayId; uni.requestPayment({ timeStamp: jsConfig.timeStamp.toString(), nonceStr: jsConfig.nonceStr, - package: packages, + package: jsConfig.package, signType: jsConfig.signType, paySign: jsConfig.paySign, success: function(res) { @@ -128,30 +132,18 @@ }); // #endif // #ifdef H5 - let data = res.data; - if (data.status == "WECHAT_H5_PAY") { - uni.hideLoading(); - location.replace(data.result.jsConfig.h5PayUrl); - return that.$util.Tips({ - title: "支付成功", - icon: 'success' - }, () => { - that.$emit('onChangeFun', { - action: 'pay_complete' - }); - }); - } else { - let jsConfig = data.result.jsConfig; - let packages = 'prepay_id=' + jsConfig.prepayId; - let data = { + if (res.data.status === "WECHAT_PAY") { + let jsConfig = res.data.jsConfig; + //let packages = 'prepay_id=' + jsConfig.prepayId; + let datas = { timestamp:jsConfig.timeStamp, nonceStr:jsConfig.nonceStr, - package:packages, + package:jsConfig.package, signType:jsConfig.signType, paySign:jsConfig.paySign }; - that.$wechat.pay(data) - .finally(() => { + that.$wechat.pay(datas) + .then(() => { return that.$util.Tips({ title: "支付成功", icon: 'success' @@ -166,6 +158,17 @@ title: '支付失败' }); }); + } else { + uni.hideLoading(); + location.replace(res.data.jsConfig.h5PayUrl); + return that.$util.Tips({ + title: "支付成功", + icon: 'success' + }, () => { + that.$emit('onChangeFun', { + action: 'pay_complete' + }); + }); } // #endif break; diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue index 2058a7b8..b7abf08c 100644 --- a/components/productWindow/index.vue +++ b/components/productWindow/index.vue @@ -53,7 +53,7 @@ 我要参团 已售罄 确定 - 确定 + 已售罄 diff --git a/components/userEvaluation/index.vue b/components/userEvaluation/index.vue index 95a73840..053e00f1 100644 --- a/components/userEvaluation/index.vue +++ b/components/userEvaluation/index.vue @@ -5,12 +5,16 @@ - - {{ item.nickname }} - + + + {{ item.nickname }} + + + {{ item.createTime }} + + - {{ item.createTime }} {{ item.suk }} {{ item.comment }} @@ -51,75 +55,74 @@ background-color: #fff; padding-bottom: 25rpx; } - + .evaluateWtapper .evaluateItem~.evaluateItem { border-top: 1rpx solid #f5f5f5; } - + .evaluateWtapper .evaluateItem .pic-text { font-size: 26rpx; color: #282828; height: 95rpx; padding: 0 30rpx; } - + .evaluateWtapper .evaluateItem .pic-text .pictrue { width: 56rpx; height: 56rpx; margin-right: 20rpx; } - + .evaluateWtapper .evaluateItem .pic-text .pictrue image { width: 100%; height: 100%; border-radius: 50%; - background: #f4f4f4; } - + .evaluateWtapper .evaluateItem .pic-text .name { max-width: 450rpx; - margin-right: 15rpx; } - + .evaluateWtapper .evaluateItem .time { font-size: 24rpx; color: #82848f; padding: 0 30rpx; } - + .evaluateWtapper .evaluateItem .evaluate-infor { font-size: 28rpx; color: #282828; margin-top: 19rpx; padding: 0 30rpx; } - + .evaluateWtapper .evaluateItem .imgList { padding: 0 30rpx 0 15rpx; margin-top: 25rpx; } - + .evaluateWtapper .evaluateItem .imgList .pictrue { width: 156rpx; height: 156rpx; margin: 0 0 15rpx 15rpx; } - + .evaluateWtapper .evaluateItem .imgList .pictrue image { width: 100%; height: 100%; + background-color: #f7f7f7; } - + .evaluateWtapper .evaluateItem .reply { font-size: 26rpx; color: #454545; background-color: #f7f7f7; border-radius: 5rpx; margin: 20rpx 30rpx 0 30rpx; - padding: 30rpx; + padding: 20rpx; position: relative; } - + .evaluateWtapper .evaluateItem .reply::before { content: ""; width: 0; @@ -128,7 +131,7 @@ border-right: 20rpx solid transparent; border-bottom: 30rpx solid #f7f7f7; position: absolute; - top: -30rpx; + top: -14rpx; left: 40rpx; } diff --git a/config/cache.js b/config/cache.js index b8425e33..660d8980 100644 --- a/config/cache.js +++ b/config/cache.js @@ -1,32 +1,32 @@ module.exports = { - //token - LOGIN_STATUS: 'LOGIN_STATUS_TOKEN', - // uid - UID:'UID', - //�û� - USER_INFO: 'USER_INFO', - //token�����¼� - EXPIRES_TIME: 'EXPIRES_TIME', - //�Ƿ���Ȩ - WX_AUTH: 'WX_AUTH', - //���ں���Ȩcode - STATE_KEY: 'wx_authorize_state', - //�û����� - LOGINTYPE: 'loginType', - //���ں���ת���� - BACK_URL: 'login_back_url', - // С����code - STATE_R_KEY: 'roution_authorize_state', - //��ȨlogoС���� - LOGO_URL: 'LOGO_URL', - //模板缓存 - // SUBSCRIBE_MESSAGE: 'SUBSCRIBE_MESSAGE', + //token + LOGIN_STATUS: 'LOGIN_STATUS_TOKEN', + // uid + UID:'UID', + //用户信息 + USER_INFO: 'USER_INFO', + //token 过期时间 + EXPIRES_TIME: 'EXPIRES_TIME', + //微信授权 + WX_AUTH: 'WX_AUTH', + //微信授权状态 + STATE_KEY: 'wx_authorize_state', + //登录类型 + LOGINTYPE: 'loginType', + //登录回调地址 + BACK_URL: 'login_back_url', + // 小程序授权状态 + STATE_R_KEY: 'roution_authorize_state', + //logo Url + LOGO_URL: 'LOGO_URL', + //模板缓存 + // SUBSCRIBE_MESSAGE: 'SUBSCRIBE_MESSAGE', - TIPS_KEY: 'TIPS_KEY', + TIPS_KEY: 'TIPS_KEY', - SPREAD: 'spread', - //缓存经度 - CACHE_LONGITUDE: 'LONGITUDE', - //缓存纬度 - CACHE_LATITUDE: 'LATITUDE', -} + SPREAD: 'spread', + //缓存经度 + CACHE_LONGITUDE: 'LONGITUDE', + //缓存纬度 + CACHE_LATITUDE: 'LATITUDE', +} \ No newline at end of file diff --git a/pages.json b/pages.json index f5923766..5efad8e9 100644 --- a/pages.json +++ b/pages.json @@ -109,6 +109,14 @@ // #endif } } + ,{ + "path" : "pages/index/components/a_seckill", + "style" : {} + } + ,{ + "path" : "pages/index/components/b_combination", + "style" : {} + } ], "subPackages": [ { diff --git a/pages/activity/goods_bargain/index.vue b/pages/activity/goods_bargain/index.vue index de2af2e0..4fe12efb 100644 --- a/pages/activity/goods_bargain/index.vue +++ b/pages/activity/goods_bargain/index.vue @@ -1,7 +1,7 @@