From 3c0b73f1005ff7940ccf3964b98e773d8591a035 Mon Sep 17 00:00:00 2001 From: stivepeim Date: Wed, 23 Dec 2020 15:56:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A3=E8=AF=9E=E5=BF=AB=E4=B9=90=20#=20v1.3?= =?UTF-8?q?=20=E6=9B=B4=E6=96=B0=E5=88=97=E8=A1=A8=20=20=20=20=201.=20?= =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E7=A0=8D=E4=BB=B7=20=092.?= =?UTF-8?q?=20=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E6=8B=BC=E5=9B=A2=20=09?= =?UTF-8?q?3.=20=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E9=80=9A=20=094.=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E5=95=86=E5=93=81sku=20=E7=BC=96=E8=BE=91=E6=97=B6=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E5=95=86=E5=93=81=E5=B1=9E=E6=80=A7=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=20=095.=20?= =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E5=95=86=E5=93=81=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E6=B5=B7=E6=8A=A5=E7=94=9F=E6=88=90=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=87=BA=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=90=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E4=B8=AD=E3=80=91=20=096.=20=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97=E5=8F=B7?= =?UTF-8?q?=E5=92=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=A4=B4=E5=83=8F=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=097.=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=97=B6=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=87=BA?= =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=20=098.=20=E3=80=90?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=91pc=E7=AE=A1=E7=90=86=E7=AB=AF?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AE=BF=E9=97=AE=E9=87=8F=20=099.=20?= =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E5=BE=AE=E4=BF=A1=E9=80=80?= =?UTF-8?q?=E6=AC=BE=20=0910.=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=20=0911.=20=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91WEB=E7=AE=A1=E7=90=86=E7=AB=AF-=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E8=89=B2=E8=B0=83=EF=BC=8C=E7=9F=AD=E4=BF=A1API?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=8C=E9=A6=96=E9=A1=B5=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E9=87=8F=EF=BC=8C=E7=B3=BB=E7=BB=9F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AEtab=E6=98=AF=E8=87=AA=E5=8A=A8=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E5=8F=8A=E8=A1=A8=E5=8D=95=20=0912.=20?= =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E7=B3=BB=E7=BB=9F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=87=BA=E7=8E=B0=E6=9B=B4=E6=96=B0=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/activity.js | 19 +- api/order.js | 6 +- components/countDown/index.vue | 2 +- components/couponListWindow/备份.vue | 2 +- components/easy-upload/easy-upload.vue | 1 - components/emptyPage.vue | 2 +- components/payment/index.vue | 47 +- components/productWindow/index.vue | 2 +- components/userEvaluation/index.vue | 43 +- config/cache.js | 58 +- pages.json | 8 + pages/activity/goods_bargain/index.vue | 30 +- .../activity/goods_bargain_details/index.vue | 179 +- pages/activity/goods_combination/index.vue | 28 +- .../goods_combination_details/index.vue | 475 ++++-- .../goods_combination_status/index.vue | 1520 ++++++++--------- pages/activity/goods_seckill/index.vue | 2 +- .../activity/goods_seckill_details/index.vue | 76 +- pages/activity/poster-poster/index.vue | 190 ++- .../columnGoods/static}/group02.gif | Bin pages/goods_cate/goods_cate.vue | 45 +- pages/goods_details/index.vue | 112 +- pages/index/components/a_seckill.vue | 239 +++ pages/index/components/b_combination.vue | 182 ++ pages/index/components/c_bargain.vue | 174 ++ pages/index/index.vue | 89 +- pages/news_list/index.vue | 7 +- pages/order_addcart/order_addcart11.vue | 2 +- pages/order_details/index.vue | 3 +- pages/order_pay_status/index.vue | 19 +- pages/retrieve_password/index.vue | 2 +- pages/users/commission_rank/index.vue | 19 +- pages/users/goods_comment_list/index.vue | 4 +- pages/users/goods_return/index.vue | 17 +- pages/users/login/index.vue | 4 +- pages/users/login/index2.vue | 2 +- pages/users/order_confirm/index.vue | 27 +- pages/users/retrievePassword/index.vue | 2 +- .../users/static}/noCollection.png | Bin .../users/static}/noEvaluate.png | Bin pages/users/user_address_list/index.vue | 10 +- pages/users/user_coupon/index.vue | 6 +- pages/users/user_goods_collection/index.vue | 2 +- pages/users/user_integral/index.vue | 2 +- pages/users/user_money/index.vue | 22 +- pages/users/user_spread_code/index.vue | 146 +- pages/users/user_spread_money/index.vue | 14 +- pages/users/user_vip/index.vue | 4 +- pages/users/user_vip/index01.vue | 2 +- static/images/aa.jpg | Bin 129708 -> 0 bytes static/images/canbj.png | Bin 0 -> 28524 bytes static/images/light.png | Bin 42803 -> 0 bytes static/images/orderIndex.png | Bin 26152 -> 0 bytes static/images/seckillTitle.png | Bin 0 -> 2709 bytes static/images/sign02.png | Bin 0 -> 1505 bytes static/images/sign03.png | Bin 0 -> 1547 bytes utils/SubscribeMessage.js | 46 +- utils/base64src.js | 23 + utils/util.js | 3 + 59 files changed, 2527 insertions(+), 1392 deletions(-) rename {static/images => pages/columnGoods/static}/group02.gif (100%) create mode 100644 pages/index/components/a_seckill.vue create mode 100644 pages/index/components/b_combination.vue create mode 100644 pages/index/components/c_bargain.vue rename {static/images => pages/users/static}/noCollection.png (100%) rename {static/images => pages/users/static}/noEvaluate.png (100%) delete mode 100644 static/images/aa.jpg create mode 100644 static/images/canbj.png delete mode 100644 static/images/light.png delete mode 100644 static/images/orderIndex.png create mode 100644 static/images/seckillTitle.png create mode 100644 static/images/sign02.png create mode 100644 static/images/sign03.png create mode 100644 utils/base64src.js 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 @@