From 82101db8a78db9b9ae91aa676edd22af45ef4757 Mon Sep 17 00:00:00 2001 From: initwithout Date: Tue, 18 Apr 2023 14:37:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BB=A5=E5=8F=8A=E5=AF=B9=E6=8E=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/orderDetailsBg.png | Bin 0 -> 15810 bytes pages/address/upaddress.js | 2 - pages/cart/cart.js | 137 ++++++++++-------- pages/cart/cart.wxml | 186 ++++++++++++------------ pages/cart/cart.wxss | 22 ++- pages/login/register.wxml | 7 +- pages/login/register.wxss | 21 +++ pages/logistics/logistics.js | 5 + pages/logistics/logistics.wxml | 1 - pages/order/detail.js | 221 +++++++++++++++-------------- pages/order/detail.wxml | 249 ++++++++++++++++----------------- pages/order/detail.wxss | 127 ++++++++++++++--- pages/order/pay.js | 67 +++++---- pages/order/payment.wxml | 10 +- pages/order/payment.wxss | 31 ++++ pages/product/detail.js | 7 +- pages/user/user.wxss | 10 +- utils/server.js | 36 +++-- 18 files changed, 668 insertions(+), 471 deletions(-) create mode 100644 images/orderDetailsBg.png diff --git a/images/orderDetailsBg.png b/images/orderDetailsBg.png new file mode 100644 index 0000000000000000000000000000000000000000..35a7b575e6f1f8c9daa9a8d3b36a1ab62869bd91 GIT binary patch literal 15810 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 1) { num--; } - if (num < 1) { wx.showToast({ title: '数量不能小于1!', @@ -41,10 +42,14 @@ Page({ duration: 2000 }); } else { - WXAPI.productUpcart({ - user_id: that.data.user_id, - num: num, - cart_id: cart_id + //编辑商品信息 + var productArr = [{num: num,cart_id: cart_id}] + let jsonstr = JSON.stringify(productArr) + WXAPI.productUpNum({ + accessId: app.globalData.accessId, + storeId: 239, + storeType: 1, + goods: jsonstr }).then(res => { if (res.code == 200) { // util.getUesrBgplus(that, app, false) @@ -80,6 +85,9 @@ Page({ success: function (res) { if (res.confirm) { WXAPI.productDelAllCart({ + accessId: app.globalData.accessId, + storeId: 239, + storeType: 1, user_id: that.data.user_id, }).then(res => { if (res.code == 200) { @@ -126,48 +134,47 @@ Page({ //删除 delarr: function () { var that = this; - - // 初始化toastStr字符串 - var toastStr = ''; + var selectArr = [] // 遍历取出已勾选的cid for (var i = 0; i < this.data.carts.length; i++) { if (this.data.carts[i].selected) { - toastStr += this.data.carts[i].id; - toastStr += ','; + selectArr.push(this.data.carts[i].id) } } - if (toastStr == '') { + if (selectArr.length == 0) { wx.showToast({ title: '请选择要删除的商品!', duration: 2000 }); return false; } - that.removeShopCard(toastStr); + var selectStr = selectArr.join(','); //将数组转换成string串 + that.removeShopCard(selectStr); }, //移至收藏 shouc: function () { var that = this; - // 初始化toastStr字符串 - var toastStr = ''; + var selectArr = [] // 遍历取出已勾选的cid for (var i = 0; i < this.data.carts.length; i++) { if (this.data.carts[i].selected) { - toastStr += this.data.carts[i].id; - toastStr += ','; + selectArr.push(this.data.carts[i].id) } } - if (toastStr == '') { + if (selectArr.length == 0) { wx.showToast({ title: '请选择要收藏的商品!', duration: 2000 }); return false; } + var selectStr = selectArr.join(','); //将数组转换成string串 WXAPI.productToCollection({ - user_id: that.data.user_id, - carts: toastStr, + accessId: app.globalData.accessId, + storeId: 239, + storeType: 1, + carts: selectStr, }).then(res => { // util.getUesrBgplus(that, app, false) if (res.code == 200) { @@ -191,14 +198,18 @@ Page({ var num = that.data.carts[index].num; // 自增 num++; - var pnum = that.data.carts[index].pnum; + var stock = that.data.carts[index].stock; var cart_id = e.currentTarget.dataset.cartid; - console.log(pnum) - if (pnum > num) { - WXAPI.productUpcart({ - user_id: that.data.user_id, - num: num, - cart_id: cart_id + + //编辑商品信息 + var productArr = [{num: num,cart_id: cart_id}] + let jsonstr = JSON.stringify(productArr) + if (stock > num) { + WXAPI.productUpNum({ + accessId: app.globalData.accessId, + storeId: 239, + storeType: 1, + goods: jsonstr }).then(res => { if (res.code == 200) { // util.getUesrBgplus(that, app, false) @@ -224,7 +235,6 @@ Page({ duration: 2000 }); } - }, bindCheckbox: function (e) { @@ -262,25 +272,24 @@ Page({ }, bindCheckout: function () { - // 初始化toastStr字符串 - var toastStr = ''; + var selectArr = [] // 遍历取出已勾选的cid for (var i = 0; i < this.data.carts.length; i++) { if (this.data.carts[i].selected) { - toastStr += this.data.carts[i].id; - toastStr += ','; + selectArr.push(this.data.carts[i].id) } } - if (toastStr == '') { + if (selectArr.length == 0) { wx.showToast({ title: '请选择要结算的商品!', duration: 2000 }); return false; } + var selectStr = selectArr.join(','); //将数组转换成string串 //存回data wx.navigateTo({ - url: '../order/pay?cartId=' + toastStr, + url: '../order/pay?cartId=' + selectStr + '&product=', }) }, @@ -321,35 +330,36 @@ Page({ }, onLoad: function (options) { - this.setData({ - bgcolor: app.d.bgcolor, - user_id: app.globalData.userInfo.openid - }); - this.loadProductData(); - this.sum(); + // this.loadProductData(); + // this.sum(); }, onShow: function () { - var cont = this.data.cont; - var carts = this.data.carts; - var purchase = app.d.purchase; - var that = this; - if (cont > 1 && purchase == 1) { - that.loadProductData(); - } else { - that.setData({ - carts: carts, - cont: cont + 1 - }); - } + this.loadProductData(); + this.sum(); + // var cont = this.data.cont; + // var carts = this.data.carts; + // var purchase = app.d.purchase; + // var that = this; + // if (cont > 1 && purchase == 1) { + // that.loadProductData(); + // } else { + // that.setData({ + // carts: carts, + // cont: cont + 1 + // }); + // } }, removeShopCard: function (carts) { var that = this; wx.showModal({ title: '提示', - content: '你确认移除吗', + content: '你确认要删除选中的商品吗', success: function (res) { res.confirm && WXAPI.productDelcart({ - carts: carts, + accessId: app.globalData.accessId, + storeId: 239, + storeType: 1, + cart_id: carts, }).then(res => { // util.getUesrBgplus(that, app, false) if (res.code == 200) { @@ -387,7 +397,8 @@ Page({ carts: data.data, selectedAllStatus: false, total: '¥0.00', - remind: '' + remind: '', + shop: data.mch_list[0] }); } else { wx.showToast({ @@ -405,14 +416,18 @@ Page({ var index = parseInt(e.currentTarget.dataset.index); var cat_num = that.data.carts[index].num; var cart_id = e.currentTarget.dataset.cartid; - var pnum = that.data.carts[index].pnum; - console.log(num, cat_num, pnum) + var stock = that.data.carts[index].stock; + // console.log(num, cat_num, stock) if (Number(num) > 0) { - if (Number(num) <= Number(pnum)) { - WXAPI.productUpcart({ - user_id: that.data.user_id, - num: num, - cart_id: carid + if (Number(num) <= Number(stock)) { + //编辑商品信息 + var productArr = [{num: num,cart_id: cart_id}] + let jsonstr = JSON.stringify(productArr) + WXAPI.productUpNum({ + accessId: app.globalData.accessId, + storeId: 239, + storeType: 1, + goods: jsonstr }).then(res => { if (res.code == 200) { // 只有大于一件的时候,才能normal状态,否则disable状态 diff --git a/pages/cart/cart.wxml b/pages/cart/cart.wxml index 8188616..aad1aad 100644 --- a/pages/cart/cart.wxml +++ b/pages/cart/cart.wxml @@ -1,105 +1,111 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - 编辑商品 - 完成 - 快速清理 + + + 编辑商品 + 完成 + 快速清理 + + + + + + + + {{item.ProductName}} + + 数量:×{{item.BuyCount}} + ¥:{{item.Price}} + + 下单 + - - - - - - {{item.ProductName}} - - 数量:×{{item.BuyCount}} - ¥:{{item.Price}} - - 下单 - - - - - - - - 购物车空空如也 - 去逛逛 - + + + + + + 购物车空空如也 + 去逛逛 - + + + + {{shop.name}} + + + - - - - - - - - - - - + + + + + + + + + + + + {{item.pro_name}} - [{{item.size}}] - - - - ¥ {{item.price}} - - - - - - - - + - + [{{item.skuBeanList[0].name}}] + + + + ¥ {{item.price}} + + + - + + + + + + - + + + + + + + + 全选 + {{total}} - - - - - - 全选 - {{total}} - - - 移至收藏 - 删除 - - 立即结算 - + + 删除 - - + 立即结算 + + + + \ No newline at end of file diff --git a/pages/cart/cart.wxss b/pages/cart/cart.wxss index 8b603be..5a808f5 100644 --- a/pages/cart/cart.wxss +++ b/pages/cart/cart.wxss @@ -165,7 +165,7 @@ page{ .carts-title { margin-top: 1px; margin-bottom: 10rpx; - font-size: 28rpx; + font-size: 30rpx; line-height:34rpx; overflow: hidden; text-overflow: ellipsis; @@ -362,4 +362,24 @@ padding-right:16px; margin-left: 5px; color:#fff; padding:0 18px; +} +.shopView { + display:flex; + align-items: center; + height: 85rpx; +} +.shopView image { + width: 40rpx; + height: 40rpx; + margin-left: 25rpx; +} +.shopView text{ + margin-left: 12rpx; + font-size: 32rpx; + color: #333333; +} +.shopView .jiantou-img { + width: 25rpx; + height: 25rpx; + margin-left: 20rpx; } \ No newline at end of file diff --git a/pages/login/register.wxml b/pages/login/register.wxml index 2ab0815..1cd6fc3 100644 --- a/pages/login/register.wxml +++ b/pages/login/register.wxml @@ -1,5 +1,8 @@ - 请添加上方二维码联系客服注册账号 - + 请添加上方二维码或下方按钮联系客服注册账号 + + 联系客服 + + \ No newline at end of file diff --git a/pages/login/register.wxss b/pages/login/register.wxss index 6c92690..7235c61 100644 --- a/pages/login/register.wxss +++ b/pages/login/register.wxss @@ -16,4 +16,25 @@ page{ margin-top: 30rpx; height: 60rpx; line-height: 60rpx; +} +.serviceView{ + padding-top: 25rpx; + height: 100rpx; + width: 100%; + background-color: #F6F6FB; +} +.serviceView .serviceBtn{ + margin-top: 25rpx; + margin-left: 60rpx; + display: flex; + align-items: center; + justify-content: center; + height: 70rpx; + width: 630rpx; + text-align: center; + line-height: 70rpx; + font-size: 28rpx; + color: white; + background-color: #F53C45; + border-radius: 35rpx; } \ No newline at end of file diff --git a/pages/logistics/logistics.js b/pages/logistics/logistics.js index 99e5f18..d8601e3 100644 --- a/pages/logistics/logistics.js +++ b/pages/logistics/logistics.js @@ -101,6 +101,11 @@ Page({ onReachBottom: function () { }, + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + } }) \ No newline at end of file diff --git a/pages/logistics/logistics.wxml b/pages/logistics/logistics.wxml index 2e0a3b6..983ee84 100644 --- a/pages/logistics/logistics.wxml +++ b/pages/logistics/logistics.wxml @@ -43,7 +43,6 @@ - {{item.context}} {{item.time}} diff --git a/pages/order/detail.js b/pages/order/detail.js index 30c0b55..89fcccb 100644 --- a/pages/order/detail.js +++ b/pages/order/detail.js @@ -295,8 +295,7 @@ Page({ }, onLoad: function (options) { - console.log(options) - this.get_plug(); + // this.get_plug(); this.loadProductDetail(options); }, onReady: function () { @@ -349,9 +348,9 @@ Page({ }) }, // 订单详情 - loadProductDetail: function () { + loadProductDetail: function (options) { var that = this; - var orderId = options.orderId; + var orderId = options.id; WXAPI.orderDetails({ accessId: app.globalData.accessId, storeId: 239, @@ -360,16 +359,40 @@ Page({ }).then(res => { if (res.code == 200) { var data = res.data; - // var address = data.adds; - // that.numbers = data.adds; - // if (address == '') { - // var address = [] - // } + var list = data.list; + var z_price = Number(data.z_price).toFixed(2); + var pro_price = 0; + var freight = data.z_freight ? data.z_freight : 0; + var red_packet = data.red_packet; + for (var i = 0; i < list.length; i++) { + pro_price = (Number(pro_price) + Number(list[i].p_price) * Number(list[i].num)).toFixed(2); + } that.setData({ - wuliu: data.res_1.data, - // address: address, - // selectedAllStatus: false - }) + orderData: data, + pro_price: pro_price, + freight: freight, + id: data.id, + sNo: data.sNo, + z_price: Number(z_price).toFixed(2), + add_time: data.add_time, + rstatus: data.status, + list: data.list, + address: data.address, + mobile: data.mobile, + name: data.name, + dr: data.dr, + title: data.title, + p_id: data.p_id, + coupon_money: data.coupon_price, + consumer_money: data.consumer_money, + user_money: data.user_money, + status_pid: data.pid, + ptcode: data.ptcode, + man_num: data.man_num, + groupid: data.pid, + payment: z_price, + order_failure: data.order_failure, + }); } }); // var type1 = that.data.type1; @@ -458,95 +481,106 @@ Page({ // promise.then(() => countdown(this)); }, // 取消订单 - removeOrder: function (e) { + removeOrder: function(e) { var that = this; - var orderId = e.currentTarget.dataset.orderId; + var info = e.currentTarget.dataset.info wx.showModal({ title: '提示', content: '你确定要取消订单吗?', success: function (res) { - res.confirm && wx.request({ - url: app.d.ceshiUrl + '&action=order&m=removeOrder', - method: 'post', - data: { - openid: app.globalData.userInfo.openid, - id: orderId, - }, - header: { - 'Content-Type': 'application/x-www-form-urlencoded' - }, - success: function (res) { - var status = res.data.status; - if (status == 1) { - wx.showToast({ - title: res.data.err, - success: 2000 - }); - wx.navigateBack({ - delta: 2 - }) - } else { - wx.showToast({ - title: res.data.err, - duration: 2000 - }); - } - }, - fail: function () { - wx.showToast({ - title: '网络异常!', - duration: 2000 - }); + WXAPI.removeOrder({ + accessId: app.globalData.accessId, + storeId: 239, + storeType: 1, + order_id: info.id, + }).then(res => { + if (res.code == 200) { + that.reloadData(); } - }); + }) } }); }, + //立即支付 + payNow: function(e) { + var data = e.currentTarget.dataset.info + wx.navigateTo({ + url: "/pages/order/payment?orderId="+data.sNo+"&price="+data.z_price, + }) + }, + //提醒发货 + orderRemind: function(e) { + var that = this; + var info = e.currentTarget.dataset.info + WXAPI.orderRemind({ + accessId: app.globalData.accessId, + storeId: 239, + storeType: 1, + order_id: info.id, + }).then(res => { + if (res.code == 200) { + that.reloadData(); + } + }) + }, // 确认收货 - recOrder: function (e) { + confirmOrder: function(e) { var that = this; - var orderId = e.currentTarget.dataset.orderId; + var info = e.currentTarget.dataset.info wx.showModal({ title: '提示', - content: '你确定已收到宝贝吗?', + content: '请确认你已收到货物', success: function (res) { - res.confirm && wx.request({ - url: app.d.ceshiUrl + '&action=order&m=recOrder', - method: 'post', - data: { - id: orderId, - }, - header: { - 'Content-Type': 'application/x-www-form-urlencoded' - }, - success: function (res) { - //--init data - var status = res.data.status; - if (status == 1) { - wx.showToast({ - title: '操作成功!', - duration: 2000 - }); - that.loadProductDetail(); - } else { - wx.showToast({ - title: res.data.err, - duration: 2000 - }); - } - }, - fail: function () { - // fail - wx.showToast({ - title: '网络异常!', - duration: 2000 - }); + WXAPI.confirmOrder({ + accessId: app.globalData.accessId, + storeId: 239, + storeType: 1, + order_id: info.id, + }).then(res => { + if (res.code == 200) { + that.reloadData(); } - }); + }) } }); }, - + //删除订单 + deleteOrder: function(e) { + var that = this; + var info = e.currentTarget.dataset.info + wx.showModal({ + title: '提示', + content: '确定要删除订单吗', + success: function (res) { + WXAPI.deleteOrder({ + accessId: app.globalData.accessId, + storeId: 239, + storeType: 1, + order_id: info.id, + }).then(res => { + if (res.code == 200) { + that.reloadData(); + } + }) + } + }); + }, + //查看物流 + orderLogistics: function(e) { + var info = e.currentTarget.dataset.info + wx.navigateTo({ + url:"/pages/logistics/logistics?orderId="+info.sNo + }) + }, + //去评价 + evaluateOrder: function(e) { + var that = this; + var info = e.currentTarget.dataset.info + wx.navigateTo({ + url:"/pages/order/detail?id="+info.id + }) + }, + //触发支付 payOrder: function (e) { @@ -897,24 +931,7 @@ Page({ } }) }, - add_fromid: function (e) { - var that = this; - var formId = e.detail.formId; - if (formId != 'the formId is a mock one') { - var page = 'pages/product/detail' - app.request.wxRequest({ - url: '&action=product&m=save_formid', - data: { from_id: formId, userid: app.globalData.userInfo.openid }, - method: 'post', - success: function (res) { - console.log(res) - } - }) - } - wx.switchTab({ - url: '../index/index' - }) - }, + //跳转index t_index: function () { wx.switchTab({ diff --git a/pages/order/detail.wxml b/pages/order/detail.wxml index 6e7d785..7418052 100644 --- a/pages/order/detail.wxml +++ b/pages/order/detail.wxml @@ -1,6 +1,6 @@ - + @@ -24,14 +24,33 @@ - - - 支付关闭: {{clock}} - {{micro_second}} - - - - + + + + + 待付款 + + + + 已付款 + 等待发货 + + + 已发货 + 商家已发货,请及时关注物流信息 + + + 交易成功 + 您的商品已发送给你了,下次再来哦~ + + + + + + {{name}} {{mobile}} 地址:{{address}} @@ -39,143 +58,123 @@ - - + + + {{list[0].shop_name}} + + + + - - - - - {{item.p_name}} - [{{item.size}}] - - - - - ¥ {{item.p_price}} + + + + {{item.p_name}} + [{{item.size}}] + ¥ {{item.p_price}} + x{{item.num}} - - - - 查看物流 - 申请售后 - - - - - - - - - - - - - 订单号: - {{sNo}} - + + + + + 订单号: + {{sNo}} + - - 时间: - {{add_time}} - + + 下单时间: + {{add_time}} + - - 商品总价: - ¥{{pro_price}} - + + 商品总价: + ¥{{pro_price}} + - - 优惠券: - -¥{{coupon_money}} - + + 优惠券: + -¥{{coupon_money}} + - - 运费: - ¥{{freight}} - + + 运费: + ¥{{freight}} + - - 订单总价: - ¥{{z_price}} + + 订单总价: + ¥{{z_price}} + - - - - - 实付款¥{{z_price}} + + + 实付款¥{{z_price}} + - - - 选择支付方式 - - - - - - - - - - - -
- -
- - - - - 取消订单 - - -
-
- - - -
- -
- - -
+ + + + 取消订单 + 立即付款 + + + 提醒发货 + 提醒发货 + + + 查看物流 + 确认收货 + + + 删除订单 + 查看物流 + 立即评价 + - - -
- + - - - - 拼单详情 - - - 分享好友 - - - + - \ No newline at end of file diff --git a/pages/order/detail.wxss b/pages/order/detail.wxss index 7aa24da..8fa8211 100644 --- a/pages/order/detail.wxss +++ b/pages/order/detail.wxss @@ -6,20 +6,50 @@ page{ width:95%; margin:0 auto; } +.status-view{ + width: 100%; + position: relative; +} +.status-view image{ + width: 100%; + height: 200rpx; +} +.statusLabel{ + position: absolute; + margin-top: 50rpx; + margin-left: 40rpx; + color: white; + font-size: 40rpx; + font-weight: bold; +} +.statusDesc{ + position: absolute; + margin-top: 120rpx; + margin-left: 40rpx; + color: white; + font-size: 28rpx; +} .pay_foot{ margin:12px; background:#fff; border-radius:30px; } .pay_bottom{ - height:60px; + position: fixed; + display: flex; + align-items: center; + bottom: 0; + height:70rpx; width:100%; background:#fff; + padding-bottom: env(safe-area-inset-bottom); } .sqsh{ color: #333; } -.pay_bottom .pay_foot{margin:15px 12px 0 0;} +/* .pay_bottom .pay_foot{ + margin:15px 12px 0 0; +} */ .swiper-tab{ width: 100%; @@ -60,35 +90,42 @@ page{ .shop{ background: #fff; padding:4% 4% 4% 10px; - border-bottom: 1px solid #eee; + border-bottom: 2rpx solid #F4F5F6; } .shop checkbox{ margin-top: 27px; } .sh_slt{ - width: 65px; - height: 65px; + width: 150rpx; + height: 150rpx; overflow: hidden; margin-right: 4%; float: left; } .sp_text{ display:flex; - line-height: 20px; + align-items: center; width: 100%; text-align: left; flex-wrap: wrap; } .sp_tit{ width: 100%; + height: 60rpx; overflow: hidden; - font-size: 12px; + font-size: 15px; -webkit-line-clamp:2; } +.price{ + font-size:16px; + color:#fc0628; +} .guige{ - font-size:12px; - color:#808080; - text-align:right; + position:absolute; + right: 35rpx; + font-size:12px; + color:#999; + text-align:right; } .sp_neb{ width: 100%; @@ -96,12 +133,6 @@ page{ font-size: 12px; color: #999; } -.sp_jg{ - width: 30%; - font-size: 13px; - color: #fc0628; - height:120rpx; -} .dle{ color: #999; font-size: 12px; @@ -184,11 +215,13 @@ page{ /* border-top: 1px solid #eee; */ } .top{ - padding: 15px 4% 15px 10px; + /* margin-top:20rpx; */ + padding: 15px 10px 5px 10px; font-size:12px; display: flex; justify-content:space-between; border-bottom: 1px solid #eee; + height: 60rpx; } .btn { width: 50%; @@ -511,9 +544,11 @@ width:100%; color: #808080; } .ddlb_v{ + font-size: 28rpx; color: #000; display: flex; justify-content: space-between; + height: 60rpx; } .anniu{ @@ -556,6 +591,58 @@ button{ font-size: 10px; } .ddlb_v-lift { - width: 130rpx; - text-align: end; -} \ No newline at end of file + width: 160rpx; +} +.shopView { + display:flex; + align-items: center; + height: 85rpx; +} +.shopView image { + width: 40rpx; + height: 40rpx; + margin-left: 25rpx; +} +.shopView text{ + margin-left: 12rpx; + font-size: 32rpx; + color: #333333; +} +.shopView .jiantou-img { + width: 25rpx; + height: 25rpx; + margin-left: 20rpx; +} +.normalBtn{ + position: absolute; + right: 225rpx; + padding: 5rpx 22rpx; + font-size: 28rpx; + color: #999999; + border: 1px solid #FA5151; + height: 50rpx; + line-height: 50rpx; + border-radius: 50rpx; +} +.confirmBtn{ + position: absolute; + right: 45rpx; + padding: 5rpx 22rpx; + font-size: 28rpx; + color: #FA5151; + border: 1px solid #FA5151; + height: 50rpx; + line-height: 50rpx; + border-radius: 50rpx; +} +.deleteBtn{ + position: absolute; + right: 410rpx; + padding: 5rpx 22rpx; + font-size: 28rpx; + color: #999999; + border: 1px solid #FA5151; + height: 50rpx; + line-height: 50rpx; + border-radius: 50rpx; +} diff --git a/pages/order/pay.js b/pages/order/pay.js index d6dbde4..9a02826 100644 --- a/pages/order/pay.js +++ b/pages/order/pay.js @@ -73,10 +73,9 @@ Page({ }, onLoad: function (options) { - console.log(app.globalData) console.log(options) var that = this; - that.get_plug(); + // that.get_plug(); var uid = app.globalData.userInfo.openid; // 微信id var plug_ins = app.globalData.userInfo.plug_ins; // 插件 @@ -104,38 +103,38 @@ Page({ // util.getUesrBgplus(that, app, false) //刷新显示购物车数量 var cartid = that.data.cartId var type = that.data.type - if (type == 1) { //直接结算离开页面清除购物车数量 - wx.request({ - url: app.d.ceshiUrl + '&action=product&m=delcart', - method: 'post', - data: { - carts: that.data.cartId, // 购物车id - }, - header: { - 'Content-Type': 'application/x-www-form-urlencoded' - }, - success: function (res) { - var status = res.data.status; - if (status == 1) { - that.setData({ - remind: false - }); - } else { - that.setData({ - remind: true - }); + // if (type == 1) { //直接结算离开页面清除购物车数量 + // wx.request({ + // url: app.d.ceshiUrl + '&action=product&m=delcart', + // method: 'post', + // data: { + // carts: that.data.cartId, // 购物车id + // }, + // header: { + // 'Content-Type': 'application/x-www-form-urlencoded' + // }, + // success: function (res) { + // var status = res.data.status; + // if (status == 1) { + // that.setData({ + // remind: false + // }); + // } else { + // that.setData({ + // remind: true + // }); - } - }, - error: function (e) { - wx.showToast({ - title: '网络异常!', - duration: 2000 - }); - } - }); - } + // } + // }, + // error: function (e) { + // wx.showToast({ + // title: '网络异常!', + // duration: 2000 + // }); + // } + // }); + // } }, onShow: function () { @@ -164,7 +163,7 @@ Page({ WXAPI.settlement({ accessId: app.globalData.accessId, storeId: 239, - cart_id: '', + cart_id: that.data.cartId, coupon_id: 0, vipSource: 0, canshu: true, @@ -526,7 +525,7 @@ Page({ accessId: app.globalData.accessId, storeId: 239, storeType: 1, - cart_id: '', + cart_id: that.data.cartId, address_id: that.data.addrId, coupon_id: 0, remarks: '', diff --git a/pages/order/payment.wxml b/pages/order/payment.wxml index 32656b9..e87d0ca 100644 --- a/pages/order/payment.wxml +++ b/pages/order/payment.wxml @@ -1,5 +1,5 @@ - + 订单编号: {{orderId}} @@ -35,5 +35,9 @@ 如有其他问题,请联系客服 - - + + + 联系客服 + + + \ No newline at end of file diff --git a/pages/order/payment.wxss b/pages/order/payment.wxss index d8eda3b..b97c167 100644 --- a/pages/order/payment.wxss +++ b/pages/order/payment.wxss @@ -113,4 +113,35 @@ page { margin-top: 30rpx; width: 320rpx; height: 320rpx; +} +.serviceView{ + padding-top: 25rpx; + height: 100rpx; + width: 100%; + background-color: #F6F6FB; + position:relative; +} +.service{ + opacity:0; + margin-top: 25rpx; + margin-left: 60rpx; + position:absolute; + height: 70rpx; + width: 630rpx; +} +.serviceView .serviceBtn{ + position:absolute; + margin-top: 25rpx; + margin-left: 60rpx; + display: flex; + align-items: center; + justify-content: center; + height: 70rpx; + width: 630rpx; + text-align: center; + line-height: 70rpx; + font-size: 28rpx; + color: white; + background-color: #F53C45; + border-radius: 35rpx; } \ No newline at end of file diff --git a/pages/product/detail.js b/pages/product/detail.js index 8ab2eaf..ef82d01 100644 --- a/pages/product/detail.js +++ b/pages/product/detail.js @@ -152,10 +152,6 @@ Page({ var that = this; var choujiangid = that.data.choujiangid; var openid = app.globalData.userInfo.openid; - // console.log(app.globalData.userInfo, 'openid') - // if (openid) { - var bgcolor = app.d.bgcolor; - WXAPI.productIndex({ accessId: app.globalData.accessId, storeId: 239, @@ -168,7 +164,6 @@ Page({ var content = pro.content; WxParse.wxParse('content', 'html', content, that, 5); that.setData({ - bgcolor: bgcolor, itemData: pro, kucun: pro.num, bannerItem: pro.img_arr, @@ -578,7 +573,7 @@ Page({ // productArr.push({}) let jsonstr = JSON.stringify(productArr) wx.navigateTo({ - url: '../order/pay?product=' + jsonstr + '&cart_id=' + that.data.cart_id, + url: '../order/pay?product=' + jsonstr + '&cartId=', }); }, bindChange: function (e) {//滑动切换tab diff --git a/pages/user/user.wxss b/pages/user/user.wxss index 936c75d..775f5e0 100644 --- a/pages/user/user.wxss +++ b/pages/user/user.wxss @@ -130,13 +130,13 @@ border-radius:5px; color:#fff; background:red; border-radius:50%; - right:6px; - top:6px; + right:15px; + top:8px; font-size:12px; - width:40rpx; - height:40rpx; + width:38rpx; + height:38rpx; text-align:center; - line-height:40rpx; + line-height:38rpx; opacity:0.8; } .function_left{ diff --git a/utils/server.js b/utils/server.js index 255599b..fbcf7ab 100644 --- a/utils/server.js +++ b/utils/server.js @@ -82,6 +82,18 @@ module.exports = { cartIndex: (data) => { //购物车 return requestServer('&action=cart&app=index', 'post', data) }, + productAddCart: (data) => { //加入购物车 + return requestServer('&action=product&app=add_cart', 'post', data) + }, + productUpNum: (data) => { //购物车商品添加数量 + return requestServer('&action=cart&app=up_cart', 'post', data) + }, + productDelcart: (data) => { //删除购物车 + return requestServer('&action=cart&app=delcart', 'post', data) + }, + productDelAllCart: (data) => { //清空购物车 + return requestServer('&action=cart&app=delAll_cart', 'post', data) + }, /* 我的 */ userIndex: (data) => { //个人中心 return requestServer('&action=user&app=index', 'post', data) @@ -99,11 +111,7 @@ module.exports = { settlement: (data) => { //确认订单信息 return requestServer('&action=order&app=Settlement', 'post', data) }, - productAddCart: (data) => { //加入购物车 - return requestServer('&action=product&app=add_cart', 'post', data) - }, - //确认订单 payment - orderPayment: (data) => { + orderPayment: (data) => { //确认订单 payment return requestServer('&action=order&app=payment', 'post', data) }, leaveSettlement: (data) => { @@ -124,8 +132,7 @@ module.exports = { getLocation: (data) => { //获取地址信息 return requestServer('&action=index&app=get_location', 'post', data) }, - //确认订单 payment - orderList: (data) => { + orderList: (data) => { //订单列表 return requestServer('&action=order&app=index', 'post', data) }, orderDetails: (data) => { //订单详情 @@ -162,21 +169,12 @@ module.exports = { return requestServer('&action=product&m=to_Collection', 'post', data) }, - productUpcart: (data) => { - return requestServer('&action=product&m=up_cart', 'post', data) - }, - productDelAllCart: (data) => { //清空 - return requestServer('&action=product&m=delAll_cart', 'post', data) - }, + + // productShopping: (data) => { // return requestServer('&action=product&m=Shopping', 'post', data) // }, - productDelcart: (data) => { //删除 - return requestServer('&action=product&m=delcart', 'post', data) - }, - addressManagement: (data) => { //添加地址 - return requestServer('&action=user&app=AddressManagement', 'post', data) - }, + preservation: (data) => { return requestServer('&action=user&m=Preservation', 'post', data) },