From 1e32e7430f52f299bc0500d9b1f604fb973033e5 Mon Sep 17 00:00:00 2001 From: taiwan Date: Sat, 22 Jan 2022 18:00:23 +0800 Subject: [PATCH] app.json修改 --- app.json | 81 ++++++++++++++++++++++++++++++++++++++++++--------------------------------------- packageB/pages/boxes-details/boxes-details.js | 504 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageB/pages/boxes-details/boxes-details.json | 8 ++++++++ packageB/pages/boxes-details/boxes-details.wxml | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageB/pages/boxes-details/boxes-details.wxss | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageB/pages/boxes-list/boxes-list.js | 330 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageB/pages/boxes-list/boxes-list.json | 7 +++++++ packageB/pages/boxes-list/boxes-list.wxml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageB/pages/boxes-list/boxes-list.wxss | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 1402 insertions(+), 39 deletions(-) create mode 100644 packageB/pages/boxes-details/boxes-details.js create mode 100644 packageB/pages/boxes-details/boxes-details.json create mode 100644 packageB/pages/boxes-details/boxes-details.wxml create mode 100644 packageB/pages/boxes-details/boxes-details.wxss create mode 100644 packageB/pages/boxes-list/boxes-list.js create mode 100644 packageB/pages/boxes-list/boxes-list.json create mode 100644 packageB/pages/boxes-list/boxes-list.wxml create mode 100644 packageB/pages/boxes-list/boxes-list.wxss diff --git a/app.json b/app.json index 9adcee3..7ba0a7f 100644 --- a/app.json +++ b/app.json @@ -91,44 +91,45 @@ "pages/quan_pro/quan_pro", "pages/liveStream/liveStream", "pages/liveStreamDetails/liveStreamDetails", - "pages/addCustomer/addCustomer", - "pages/goods_share/goods_share", - "pages/activity_share/activity_share", - "pages/live_share/live_share", - "pages/quan/quan", - "pages/chongzhi/chongzhi", - "pages/chongzhiDetails/chongzhiDetails", - "pages/jfbuy/jfbuy", - "pages/hongBao/hongBao", - "pages/hongBaoDetails/hongBaoDetails", - "pages/service_record/service_record", - "pages/checkin/checkin", - "pages/distribution/myteam/myteam", - "pages/distribution/order/order", - "pages/distribution/commision/commision", - "pages/distribution/rank/rank", - "pages/distribution/card/card", - "pages/distribution/goods/goods", - "pages/distribution/shop/shop", - "pages/distribution/rookie/rookie", - "pages/service_share/service_share", - "pages/cardList/cardList", - "pages/goodsInfo/goodsInfo", - "pages/my_service/appment_main", - "pages/my_service/i_service", - "pages/my_service/cosmetology_list", - "pages/my_service/hist_service", - "pages/my_service/tment_details", - "pages/my_service/tment_eval", - "pages/my_service/tment_order_list", - "pages/my_service/beauty_deta", - "pages/my_service2/appment_main", - "pages/profile/profile", - "pages/parseHtml/parseHtml", - "pages/myGift/myGift", - "pages/myGiftDetails/myGiftDetails", - "pages/cart2_ser/cart2_ser", - "pages/libao_payment/payment" + "pages/addCustomer/addCustomer", + "pages/goods_share/goods_share", + "pages/activity_share/activity_share", + "pages/live_share/live_share", + "pages/quan/quan", + "pages/chongzhi/chongzhi", + "pages/chongzhiDetails/chongzhiDetails", + "pages/jfbuy/jfbuy", + "pages/hongBao/hongBao", + "pages/hongBaoDetails/hongBaoDetails", + "pages/service_record/service_record", + "pages/checkin/checkin", + "pages/distribution/myteam/myteam", + "pages/distribution/order/order", + "pages/distribution/commision/commision", + "pages/distribution/rank/rank", + "pages/distribution/card/card", + "pages/distribution/goods/goods", + "pages/distribution/shop/shop", + "pages/distribution/rookie/rookie", + "pages/service_share/service_share", + "pages/cardList/cardList", + "pages/goodsInfo/goodsInfo", + "pages/my_service/appment_main", + "pages/my_service/i_service", + "pages/my_service/cosmetology_list", + "pages/my_service/hist_service", + "pages/my_service/tment_details", + "pages/my_service/tment_eval", + "pages/my_service/tment_order_list", + "pages/my_service/beauty_deta", + "pages/my_service2/appment_main", + "pages/profile/profile", + "pages/parseHtml/parseHtml", + "pages/myGift/myGift", + "pages/myGiftDetails/myGiftDetails", + "pages/cart2_ser/cart2_ser", + "pages/libao_payment/payment", + "pages/details_serviceCard/details_serviceCard" ] }, @@ -151,7 +152,9 @@ "pages/zuhegou/list/list", "pages/user/binding_info/binding_info", "pages/user/choice_guide/choice_guide", - "pages/video/index" + "pages/video/index", + "pages/boxes-list/boxes-list", + "pages/boxes-details/boxes-details" ] }, { diff --git a/packageB/pages/boxes-details/boxes-details.js b/packageB/pages/boxes-details/boxes-details.js new file mode 100644 index 0000000..65c0f1d --- /dev/null +++ b/packageB/pages/boxes-details/boxes-details.js @@ -0,0 +1,504 @@ +// packageA/pages/details_serviceCard/details_serviceCard.js +const app = getApp(); +const os = app.globalData.setting; +let self = null; + +Page({ + + /** + * 页面的初始数据 + */ + data: { + is_summit_ing: 0, + + showQr: false, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + self = this; + this.data.options = options; + app.isLogin().then(function(data) { + self.setData({ + userInfo: data, + }); + self.getConfig(); + }); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { + if (app.globalData.userInfo) { + if (!this.data.isLogin) { + this.setData({ + userInfo: app.globalData.userInfo, + imghost: app.globalData.setting.imghost, + isLogin: true, + }); + + let url = '/api/weshop/recharge/user/page' + let data = { + store_id: app.globalData.setting.stoid, + user_id: this.data.userInfo.user_id, + order_id: this.data.options.order_id, + }; + + // 请求数据 + app.promiseGet(url, { + data: data, + }).then(res => { + if (res.data.code == 0) { + console.log('请求成功', res); + this.setData({ + details: res.data.data.pageData[0], + }); + } else { + throw (res); + }; + }).catch(err => { + wx.showToast({ + title: err.data.data, + icon: 'error', + }); + }); + + }; + }; + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function() { + + }, + + + // 内容复制到剪贴板 + copy() { + console.log('点击了复制按钮'); + wx.setClipboardData({ + data: this.data.details.order_sn, + success(res) { + wx.getClipboardData({ + success(res) { + console.log(res.data); + } + }) + } + }) + }, + + + // 图片异常时加载默认图片 + bind_bnerr(e) { + var errImg = e.currentTarget.dataset.errorimg; + var errObj = {}; + errObj[errImg] = 'public/images/default_goods_image_240.gif'; + this.setData(errObj); // this.setData({ details.list[0].img_url}); + }, + + + // 查看商品详情 + viewDetails(e) { + let goods_id = e.currentTarget.dataset.gid; + let url = '/packageA/pages/goodsInfo/goodsInfo?goods_id=' + goods_id; + app.goto(url); + }, + + // 获取系统参数 + getConfig() { + app.getConfig2(function(e) { + // console.log('101',e); + let json_d = JSON.parse(e.switch_list); + self.setData({ + sys_switch: json_d, + // weapp_customertype: json_d.weapp_customertype, + }); + }, 1); + }, + + + // 联系微信客服 + contact_wx() { + var url = this.data.sys_switch.weapp_customertype_url; + var id = this.data.sys_switch.weapp_customertype_appid; + wx.openCustomerServiceChat({ + extInfo: { + url: url + }, + corpId: id, + success(res) {} + }) + }, + + + // 联系电话客服 + contactService() { + app.getConfig(function(t) { + if (t.store_tel == undefined) { + app.request.get('/api/weshop/store/get/' + os.stoid, { + isShowLoading: 1, + data: {}, + success: function(rs) { + app.globalData.config = rs.data.data; + if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) { + app.my_warnning('商家未设置电话', 0, self); + return false; + } + app.confirmBox('请联系客服:' + rs.data.data.store_tel); + } + }) + } else { + app.confirmBox('请联系客服:' + t.store_tel); + } + }); + }, + + + // 评价商品 + access() { + let listLength = this.data.details.list.length; + let order_id = this.data.details.order_id; + let url = ''; + + // 卡项订单跳转到评论页要多加个参数card=1 + // 卡项订单goods_id要带card_id + if (listLength == 1) { + let price = this.data.details.list[0].price; + let card_id = this.data.details.list[0].card_id; + url = + `/packageB/pages/user/add_comment/add_comment?card=1&goods_id=${card_id}&order_id=${order_id}&price=${price}` + }; + if (listLength > 1) { + url = `/packageB/pages/user/comment/comment?card=1&status=0&order_id=${order_id}`; + }; + f + // console.log('url', url); + app.goto(url); + }, + + + // 查看评论 + viewComment() { + let order_id = this.data.details.order_id; + let card_id = this.data.details.list[0].card_id; + let listLength = this.data.details.list.length; + let url = ''; + + // 卡项订单单个商品 + if (listLength == 1) { + url = `/packageB/pages/user/view_comment/view_comment?card=1&goods_id=${card_id}&order_id=${order_id}`; + }; + // 卡项订单多个商品 + if (listLength > 1) { + // status控制评论列表页的activeStatus + url = `/packageB/pages/user/comment/comment?card=1&status=1&order_id=${order_id}`; + }; + + app.goto(url); + }, + + + // 再来一单 + buy2(t) { + let details = this.data.details; + var th = this; + var ind = 1; // 1：加入购物车 + // var ind = t.currentTarget.dataset.openSpecModal_ind; + // var action= t.currentTarget.dataset.action; + var action = 'add'; // + // if(!ind) ind = t.currentTarget.dataset.openspecmodal_ind; + + th.setData({ + open_ind_store: ind + }); + + // if(!th.data.sto_sele_name){ + // getApp().my_warnning('请选择门店', 1, th, 450); + // return false; + // } + + + if (action == "buy") { + //--------------此时操作的数据------------ + // var newd = { + // id: th.data.data.id, + // goods_num: th.data.goodsInputNum, + // pick_id: th.data.sto_sele_id, + // keyid: th.data.sto_sele_keyid, + // }; + // newd['pick_name'] = th.data.sto_sele_name; + // newd['guide_id'] = getApp().globalData.guide_id; + // newd['guide_type']=0; + // th.buyNow(newd); + } else { + + var newd = { + // service_id: th.data.data.id, + // service_sn:th.data.data.service_sn, + // service_name:th.data.data.goods_name, + // goods_num: th.data.goodsInputNum, + // pick_id: th.data.sto_sele_id, + // user_id:oo.user_id, + // store_id:os.stoid, + // money:th.data.data.shop_price, + + service_id: details.list[0].card_id, + service_sn: details.list[0].service_sn, + service_name: details.list[0].service_name, + goods_num: details.list[0].qty, + pick_id: details.list[0].pickup_id, + user_id: this.data.userInfo.user_id, + store_id: app.globalData.setting.stoid, + money: details.list[0].price, + }; + if (getApp().globalData.guide_id) { + newd['guide_id'] = getApp().globalData.guide_id; + newd['guide_type'] = 0; + } + + //----先看会员在购物车中是否加入了该商品----- + app.request.get("/api/weshop/cartService/page", { + data: { + store_id: app.globalData.setting.stoid, + user_id: this.data.userInfo.user_id, + service_id: details.list[0].card_id, + pick_id: details.list[0].pickup_id, + }, + success: function(re) { + + //-------如果购物车中有相关的数据--------- + if (re.data.data.total > 0) { + var item = re.data.data.pageData[0]; + var updata = { + id: item.id, + goods_num: details.list[0].qty + item.goods_num, + money: details.list[0].price, + store_id: app.globalData.setting.stoid, + }; + + if (getApp().globalData.guide_id) { + updata['guide_id'] = getApp().globalData.guide_id; + updata['guide_type'] = 1; + } + getApp().request.put("/api/weshop/cartService/update", { + data: updata, + success: function(t) { + // getApp().my_warnning('加入购物车成功', 1, th, 450); + var c_num = th.data.cartGoodsNum + th.data.goodsInputNum; + th.setData({ + cartGoodsNum: c_num + }); + app.goto('/pages/cart/cart/cart'); + // th.closeSpecModal(); + } + }); + } else { + + getApp().request.post("/api/weshop/cartService/save", { + data: newd, + success: function(t) { + // getApp().my_warnning('加入购物车成功', 1, th, 450); + var c_num = th.data.cartGoodsNum + th.data.goodsInputNum; + th.setData({ + cartGoodsNum: c_num + }); + app.goto('/pages/cart/cart/cart'); + // th.closeSpecModal(); + } + }); + } + } + }); + + } + }, + + + // 取消订单 + // api/weshop/recharge/update?store_id=&order_id=&order_status=3 + cancle() { + wx.showModal({ + title: '提示', + content: '确定取消订单吗？', + success(res) { + if (res.confirm) { + console.log('用户点击确定'); + let order_id = self.data.details.order_id; + let order_sn = self.data.details.order_sn; + app.request.put('/api/weshop/recharge/update', { + data: { + store_id: os.stoid, + order_id: order_id, + order_sn: order_sn, + order_status: 3, + }, + success: function(res) { + + //取消成功刷新订单 + let url = '/api/weshop/recharge/user/page' + let data = { + store_id: app.globalData.setting.stoid, + user_id: self.data.userInfo.user_id, + order_id: self.data.options.order_id, + }; + + // 请求数据 + app.promiseGet(url, { + data: data, + }).then(res => { + if (res.data.code == 0) { + console.log('请求成功', res); + wx.showToast({ + title: '取消成功', + }); + self.setData({ + details: res.data.data.pageData[0], + }); + } else { + throw (res); + }; + }).catch(err => { + wx.showToast({ + title: err.data.data, + icon: 'error', + }); + }); + + }, + }) + } else if (res.cancel) { + console.log('用户点击取消'); + } + } + }); + }, + + + // 立即支付 + pay() { + let order_sn = this.data.details.order_sn; + let store_id = app.globalData.setting.stoid; + + app.request.post('/api/weshop/order/pay/createRechargeOrder', { + data: { + parentSn: order_sn, + store_id: store_id, + }, + + success: function(res) { + var n = res.data.data; + self.weixinPay(n, function() { + app.showWarning('支付成功'); + // setTimeout(function() { + // wx.reLaunch({ + // url: '/pages/user/my_service/i_service', + // }) + // }, 1000) + }, function() { + app.showWarning('支付失败'); + // setTimeout(function() { + // wx.reLaunch({ + // url: '/packageA/pages/cardList/cardList', + // }) + // }, 1000) + }); + } + }) + }, + + + //------调起支付框-------- + weixinPay: function(n, success, fail) { + if (!n) return false; + wx.requestPayment({ + timeStamp: String(n.timeStamp), + nonceStr: n.nonceStr, + package: n.packageValue, + signType: n.signType, + paySign: n.paySign, + success: function(n) { + console.log(n), getApp().showSuccess("支付成功！"); + "function" == typeof success && success(); + wx.redirectTo({ + url: "../deposit/deposit" + }); + }, + fail: function(n) { + console.log(n), "requestPayment:fail" == n.errMsg ? getApp().showWarning("支付失败") : + "requestPayment:fail cancel" == n.errMsg ? getApp().showWarning("您已取消支付") : getApp().showWarning("支付失败：" + n + .errMsg.substr("requestPayment:fail ".length)), + "function" == typeof fail && fail(); + } + }); + }, + + + + + + + + + showQr() { + this.setData({ + showQr: true, + }); + }, + + closeQr() { + this.setData({ + showQr: false, + }); + }, + + touchMove() {} + + + + + + + + +}) diff --git a/packageB/pages/boxes-details/boxes-details.json b/packageB/pages/boxes-details/boxes-details.json new file mode 100644 index 0000000..af2acc1 --- /dev/null +++ b/packageB/pages/boxes-details/boxes-details.json @@ -0,0 +1,8 @@ +{ + "navigationBarTitleText": "订单详情", + "usingComponents": { + "nodata": "/components/nodata/nodata", + "share_button": "/components/share/share" + }, + "enablePullDownRefresh": false +} \ No newline at end of file diff --git a/packageB/pages/boxes-details/boxes-details.wxml b/packageB/pages/boxes-details/boxes-details.wxml new file mode 100644 index 0000000..22c7abf --- /dev/null +++ b/packageB/pages/boxes-details/boxes-details.wxml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + 商品名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称 + x1{{item.price}} + + + + 2{{filters.price(item.group_price)}} + 零售价3{{item.market_price}} + + + + + + + + + + + + + + + + + + 立即兑换 + + + + + + + + + + + + diff --git a/packageB/pages/boxes-details/boxes-details.wxss b/packageB/pages/boxes-details/boxes-details.wxss new file mode 100644 index 0000000..dca743b --- /dev/null +++ b/packageB/pages/boxes-details/boxes-details.wxss @@ -0,0 +1,199 @@ +page { + box-sizing: border-box; + padding: 20rpx 20rpx 0; + background-color: #f2f2f2; + font-size: 28rpx; +} + +.bdr12 { + border-radius: 12rpx; +} + +.w40 { + width: 40%; + box-sizing: border-box; +} + +.btn-border { + border: 2rpx solid #808080; +} + + +.bg-red { + background-image: -webkit-linear-gradient(315deg,#f2140c,#f2270c 70%,#f24d0c); + background-image: linear-gradient(135deg,#f2140c,#f2270c 70%,#f24d0c); +} + +.bg-orange { + background-image: -webkit-linear-gradient(315deg,#ffba0d,#ffc30d 69%,#ffcf0d); + background-image: linear-gradient(135deg,#ffba0d,#ffc30d 69%,#ffcf0d); +} + +.c-orange { + color: #ff9000; +} + +.main { + padding-bottom: 134rpx; +} + +.pic-box { + width: 130rpx; + height: 130rpx; + border-radius: 12rpx; + overflow: hidden; + display: flex; + justify-content: center; + align-items: center; + background-color: pink; +} + +.rmb::before { + content: '￥'; +} + +.title { + height: 88rpx; +} + +.separator { + position: relative; +} + +.separator::before { + content: ''; + position: absolute; + width: 2rpx; + height: 30%; + background-color: #f8f8f8; + left: 0; + top: 0; + bottom: 0; + margin: auto; +} + +.btn-bar { + box-sizing: border-box; + position: fixed; + left: 0; + bottom: 0; + width: 100%; + font-size: 26rpx; + border-top: 2rpx solid #f2f2f2; +} + +.btn { + width: 50%; + box-sizing: border-box; + display: inline-block; + height: 70rpx; + line-height: 70rpx; + padding: 0 40rpx; + border-radius: 100rpx; +} + +.btn-copy { + display: block; + color: #666; + font-size: 22rpx; + padding: 0 20rpx; + border-radius: 6rpx; + background-color: #f0f0f0; +} + +.del { + text-decoration: line-through; +} + + + + + +.mask { + position: fixed; + width: 100%; + height: 100%; + top: 0; + left: 0; + background-color: rgba(0,0,0,.7); + z-index: 1; + } + + .popup-container { + position: fixed; + width: 70%; + border-radius: 12rpx; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + z-index: 3; + } + + .popup { + text-align: center; + border-radius: 12rpx; + background-color: white; + overflow: hidden; + /* width: 80%; */ + } + + .popup-container .icon-close { + color: rgba(255,255,255,.6); + } + + .popup-title { + padding: 40rpx 0; + color: #fe0000; + background-color: #FFD3D6; + position: relative; + } + + .popup-title::after { + content: ''; + position: absolute; + left: -20rpx; + bottom: -12rpx; + width: 130%; + height: 20rpx; + background: -webkit-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent); + background: -moz-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent); + background: -o-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent); + background: radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent); + background-size: 40rpx 40rpx; + transform: rotate(180deg); + -webkit-transform: rotate(180deg); + } + + + .popup .rmb::before { + font-size: 40rpx; + } + + .img-qr { + display: block; + width: 300rpx; + height: 300rpx; + margin: 0 auto; + background-color: pink; + } + + .qrcode { + width: 300rpx; + height: 300rpx; + margin: 0 auto; + } + + + .noMore { + padding: 20rpx; + color: #bbb; + text-align: center; + font-size: 22rpx; + } + + .breakall { + word-break: break-all; + } + + + diff --git a/packageB/pages/boxes-list/boxes-list.js b/packageB/pages/boxes-list/boxes-list.js new file mode 100644 index 0000000..b81d0c5 --- /dev/null +++ b/packageB/pages/boxes-list/boxes-list.js @@ -0,0 +1,330 @@ +const app = getApp(); +let self = null; + +Page({ + data: { + tabArr: ['待核销','已核销'], + currentTabIndex: 0, + + isLogin: false, + list: null, + isLoading: false, // 检测是否已经发送请求,防止重复发送请求 + noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 + pageNum: 1, // 当前页数 + + // showReward: false, + // prizesArr: [], + + // typeArr: [{ + // key: 'point', + // name: '积分', + // },{ + // key: 'grow', + // name: '成长值', + // },{ + // key: 'point', + // name: '优惠券', + // },{ + // key: 'prestore_name', + // name: '项目服务', + // },{ + // key: 'prestore_money', + // name: '预存金额', + // }], + }, + + onLoad: function () { + self = this; + app.isLogin().then(function(data) { + self.setData({ + userInfo: data, + }); + }); + }, + + onShow: function() { + if(app.globalData.userInfo) { + if(!this.data.isLogin) { + this.setData({ + userInfo: app.globalData.userInfo, + imghost: app.globalData.setting.imghost, + isLogin: true, + }); + + let data = { + store_id: app.globalData.setting.stoid, + user_id: this.data.userInfo.user_id, + }; + + // 默认获取'全部' + this.getData(true, '/api/weshop/prom/luckyOrder/page', data) + .then(()=>{ + this.setData({ + currentData: data, + }); + }); + + }; + }; + }, + + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + this.scrollToLower('/api/weshop/prom/luckyOrder/page', this.data.currentData); + }, + + + // 图片异常时加载默认图片 + bind_bnerr: function (e) { + var _errImg = e.target.dataset.errorimg; + var val = e.target.dataset.val; + if(val!=undefined && val!=null && val!='null' ){ + var _errObj = {}; + _errObj[_errImg] = "/public/images/default_goods_image_240.gif"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + } + }, + + + + // 点击tab选项卡 + clickTab(e) { + this.setData({ + currentTabIndex: e.target.dataset.index, + noMore: false, + pageNum: 1, + list: null, + }); + + let currentTabIndex = parseInt(this.data.currentTabIndex); + let currentData = this.data.currentData; + + delete currentData.page; + + switch(currentTabIndex) { + case 0: { + delete currentData.team_status; + break; + }; + case 1: { + currentData.team_status = 0; + break; + }; + case 2: { + currentData.team_status = 2; + break; + }; + case 3: { + currentData.team_status = 1; + break; + }; + }; + + // 请求 + this.getData(true, '/api/weshop/prom/luckyOrder/page', currentData); + + }, + + + /** + * 请求数据 + */ + getData: function(isInit, url, data) { + let p = app.request.promiseGet(url, { + data: data, + isShowLoading: true, + }) + .then(function(res) { + if(res.data.code == 0) { + + self.setData({ + isLoading: false + }); + + if(isInit) {// 第一次加载 + self.setData({ + list: res.data.data + }); + } else { + self.setData({ + 'list.pageData': self.data.list.pageData.concat(res.data.data.pageData) + }); + }; + + if((res.data.data.pageData.length == 0) || (res.data.data.pageSize * res.data.data.page >= res.data.data.total)) { + self.setData({ + noMore: true + }); + }; + + } else { + self.setData({ + 'list.pageData': [] + }); + }; + + }); + + return p; + }, + + + /** + * 上拉加载 + */ + scrollToLower(url, requestData) { + // 数据总量 + let total = this.data.list.total; + // 单页最大数据量 + let pageSize = this.data.list.pageSize; + // 如果数据总量不为0且小于或等于单页最大数据量，说明数据已全部加载，显示‘没有更多了’ + if((total != 0)&&(total <= pageSize)) { + this.setData({ + noMore: true + }); + }; + + if(!this.data.isLoading && !this.data.noMore) { + this.setData({ + isLoading: true, + pageNum: this.data.pageNum + 1 + }); + requestData.page = this.data.pageNum; + this.getData(false, url, requestData); + }; + }, + + + //跳转 + go: function (e) { + var url = e.currentTarget.dataset.url; + getApp().goto(url); + }, + + //查看奖励 + showReward: function(e) { + this.setData({ + currentItemIndex: e.target.dataset.index, + currentItemAid: e.target.dataset.aid, + }); + this.getPrizes(this.data.currentItemIndex); + }, + + //关闭奖励 + closeReward: function() { + this.setData({ + showReward: false, + }); + }, + + + // 获取优惠券奖励和服务项目奖励 + getPrizes: function(currentItemIndex) { + let currentItem = this.data.list.pageData[currentItemIndex]; + let type = currentItem.type; + + // 分割type字符串 + let typeArr = this.splitStringToArr(type); + let prizesArr = []; + let promiseArr = []; + typeArr.forEach(function(item) { + + let obj = {}; + obj.type = item; + + let promise = new Promise((resolve, reject) => { + switch(item) { + case 1: { //积分 + obj.name = '积分'; + obj.num = 'point'; + prizesArr.push(obj); + resolve(); + break; + }; + case 2: { //成长值 + obj.name = '成长值'; + obj.num = 'grow'; + prizesArr.push(obj); + resolve(); + break; + }; + case 3: { //优惠券 + app.request.promiseGet('/api/weshop/prom/luckyCoupon/page', { + data: { + store_id: app.globalData.setting.stoid, + aid: self.data.currentItemAid, + } + }).then(res => { + if(res.data.code == 0) { + obj.couponList = res.data.data.pageData; + prizesArr.push(obj); + resolve(); + }; + }); + break; + }; + case 4: { //服务项目 + app.request.promiseGet('/api/weshop/prom/luckyService/page', { + data: { + store_id: app.globalData.setting.stoid, + aid: self.data.currentItemAid, + } + }).then(res => { + if(res.data.code == 0) { + obj.serviceList = res.data.data.pageData; + prizesArr.push(obj); + resolve(); + }; + }); + break; + }; + case 5: { //预存金额 + obj.name = 'prestore_name'; + obj.num = 'prestore_money'; + prizesArr.push(obj); + resolve(); + break; + }; + }; + }); + + promiseArr.push(promise); + + + Promise.all(promiseArr).then(()=> { + self.setData({ + prizesArr, + showReward: true, + }); + }); + + }); + }, + + // 将type字符串分割成数组 + splitStringToArr: function(typeStr) { + var index; + var newTypeArr = []; + var typeStrArr = typeStr.split(','); + typeStrArr.forEach(function(item) { + index = parseInt(item); + newTypeArr.push(index); + }); + return newTypeArr; + }, + + + + + + viewDetails() { + let url = '/packageB/pages/boxes-details/boxes-details'; + app.goto(url); + } + + +}) + diff --git a/packageB/pages/boxes-list/boxes-list.json b/packageB/pages/boxes-list/boxes-list.json new file mode 100644 index 0000000..365a55c --- /dev/null +++ b/packageB/pages/boxes-list/boxes-list.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "套盒商品", + "enablePullDownRefresh": false, + "usingComponents": { + "nodata": "/components/nodata/nodata" + } +} \ No newline at end of file diff --git a/packageB/pages/boxes-list/boxes-list.wxml b/packageB/pages/boxes-list/boxes-list.wxml new file mode 100644 index 0000000..558f866 --- /dev/null +++ b/packageB/pages/boxes-list/boxes-list.wxml @@ -0,0 +1,57 @@ + + + + + {{item}} + + + + + + + + + 订单编号：191561561565555 + 卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称 + + 2{{filters.price(item.group_price)}} + 零售价3{{item.market_price}} + + *兑换截止日期：2022-01-01至2022-12-31 + + + + 已过期 + 立即兑换 + + + + + + + 订单编号：191561561565555 + 卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称 + + 2{{filters.price(item.group_price)}} + 零售价3{{item.market_price}} + + *兑换截止日期：2022-01-01至2022-12-31 + + + + 已核销 + + + + + + + + + + + + + diff --git a/packageB/pages/boxes-list/boxes-list.wxss b/packageB/pages/boxes-list/boxes-list.wxss new file mode 100644 index 0000000..8d5232d --- /dev/null +++ b/packageB/pages/boxes-list/boxes-list.wxss @@ -0,0 +1,166 @@ +.bdt { + border-top: 2rpx solid #f5f5f5; +} + +page { + background-color: #f2f2f2; +} + +.btn { + display: inline-block; + min-width: 120rpx; + text-align: center; + /* border: 2rpx solid #ff6768; */ + padding: 10rpx 20rpx; + border-radius: 40rpx; +} + +.btn.gray { + border-color: #ccc; +} + +.tab-hd { + display: flex; + text-align: center; + font-size: 28rpx; + background-color: white; + position: sticky; + top: 0; + z-index: 2; +} + +.tab-hd-item { + flex-grow: 1; + padding: 20rpx; + position: relative; +} + +.tab-hd-item.active { + color: #ff6768; +} + +.tab-hd-item.active::after { + content: ''; + position: absolute; + width: 30%; + height: 4rpx; + left: 0; + right: 0; + bottom: 0; + margin: 0 auto; + background-color: #ff6768; +} + +.title { + /* max-height: 88rpx; */ + box-sizing: border-box; + margin-top: 10rpx; + margin-bottom: 10rpx; + height: 90rpx; +} + +.tab-bd { + padding-left: 20rpx; + padding-right: 20rpx; +} + +.list { + overflow: hidden; +} + +.list-item { + background-color: white; + margin-top: 20rpx; + border-radius: 12rpx; + font-size: 28rpx; +} + +.arrow { + position: relative; +} + +.arrow::after { + font-family: iconfont; + content: '\e61f'; + position: absolute; + right: 0; + color: #ccc; +} + +.img-container { + width: 200rpx; + height: 200rpx; + flex-shrink: 0; + margin-right: 20rpx; + border-radius: 14rpx; + overflow: hidden; +} + +.rmb::before { + content: '￥'; + font-size: 24rpx; +} + +.del { + text-decoration: line-through; +} + +.no-more { + font-size: 24rpx; + line-height: 3; + text-align: center; + /* margin-top: 10rpx; */ + color: #ccc; +} + + +.popup-container { + position: fixed; + top: 0; + bottom: 0; + left: 0; + right: 0; + background-color: rgba(0,0,0,.8); +} + +.popup { + background-color: #FFFAE7; + position: fixed; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + border-radius: 12rpx; + min-width: 600rpx; + color: #AF481D; +} + +.popup-list { + max-height: 700rpx; + overflow-y: auto; +} + +.popup-list-item { + display: flex; + align-items: center; + padding: 20rpx; +} + +.popup-list-item .img-container { + width: 120rpx; + height: 100rpx; +} + + .popup-title { + font-size: 28rpx; + height: 88rpx; + } + + .bg-red { + background-image: -webkit-linear-gradient(315deg,#f2140c,#f2270c 70%,#f24d0c); + background-image: linear-gradient(135deg,#f2140c,#f2270c 70%,#f24d0c); + } + + .bg-gray { + background-image: -webkit-linear-gradient(315deg,#bfbfbf,#c3c3c3 70%,#d4d3d3); + background-image: linear-gradient(135deg,#bfbfbf,#c3c3c3 70%,#d4d3d3); + } \ No newline at end of file -- libgit2 0.21.4