From 05b73c049eba72d029987b4f008b06fd5ef40ce3 Mon Sep 17 00:00:00 2001 From: WXD-SEASON\season Date: Mon, 4 Sep 2023 15:05:44 +0800 Subject: [PATCH] 移包 --- app.json | 22 ++++++++++++---------- packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js | 2 +- packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js | 8 ++++---- packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml | 2 +- packageC/pages/presell/cart/cart.wxml | 2 +- packageD/pages/shop/order_detail/order_detail.js | 8 ++++---- packageF/pages/team/team_more/team_more.js | 216 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageF/pages/team/team_more/team_more.json | 3 +++ packageF/pages/team/team_more/team_more.wxml | 36 ++++++++++++++++++++++++++++++++++++ packageF/pages/team/team_more/team_more.wxss | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageF/pages/team/team_ping/team_ping.js | 309 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageF/pages/team/team_ping/team_ping.json | 3 +++ packageF/pages/team/team_ping/team_ping.wxml | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageF/pages/team/team_ping/team_ping.wxss | 381 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageF/pages/user/return_goods/return_goods.js | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageF/pages/user/return_goods/return_goods.json | 4 ++++ packageF/pages/user/return_goods/return_goods.wxml | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageF/pages/user/return_goods/return_goods.wxss | 276 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageF/pages/user/return_goods_info/fil.wxs | 9 +++++++++ packageF/pages/user/return_goods_info/return_goods_info.js | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageF/pages/user/return_goods_info/return_goods_info.json | 4 ++++ packageF/pages/user/return_goods_info/return_goods_info.wxml | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageF/pages/user/return_goods_info/return_goods_info.wxss | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageF/pages/user/return_goods_list/fil.wxs | 9 +++++++++ packageF/pages/user/return_goods_list/return_goods_list.js | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageF/pages/user/return_goods_list/return_goods_list.json | 3 +++ packageF/pages/user/return_goods_list/return_goods_list.wxml | 31 +++++++++++++++++++++++++++++++ packageF/pages/user/return_goods_list/return_goods_list.wxss | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/goods/goodsInfo/goodsInfo.js | 2 +- pages/payment/payment/payment.js | 2 +- pages/team/team_more/team_more.js | 216 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ pages/team/team_more/team_more.json | 3 --- pages/team/team_more/team_more.wxml | 36 ------------------------------------ pages/team/team_more/team_more.wxss | 91 ------------------------------------------------------------------------------------------- pages/team/team_ping/team_ping.js | 309 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/team/team_ping/team_ping.json | 3 --- pages/team/team_ping/team_ping.wxml | 130 ---------------------------------------------------------------------------------------------------------------------------------- pages/team/team_ping/team_ping.wxss | 381 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/user/index/index.wxml | 2 +- pages/user/order_detail/order_detail.js | 8 ++++---- pages/user/order_detail/order_detail.wxml | 2 +- pages/user/order_list/order_list.js | 8 ++++---- pages/user/order_list/order_list.wxml | 2 +- pages/user/return_goods/return_goods.js | 215 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/user/return_goods/return_goods.json | 4 ---- pages/user/return_goods/return_goods.wxml | 81 --------------------------------------------------------------------------------- pages/user/return_goods/return_goods.wxss | 276 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ pages/user/return_goods_info/fil.wxs | 9 --------- pages/user/return_goods_info/return_goods_info.js | 180 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ pages/user/return_goods_info/return_goods_info.json | 4 ---- pages/user/return_goods_info/return_goods_info.wxml | 89 ----------------------------------------------------------------------------------------- pages/user/return_goods_info/return_goods_info.wxss | 159 --------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/user/return_goods_list/fil.wxs | 9 --------- pages/user/return_goods_list/return_goods_list.js | 122 -------------------------------------------------------------------------------------------------------------------------- pages/user/return_goods_list/return_goods_list.json | 3 --- pages/user/return_goods_list/return_goods_list.wxml | 31 ------------------------------- pages/user/return_goods_list/return_goods_list.wxss | 58 ---------------------------------------------------------- 57 files changed, 2445 insertions(+), 2443 deletions(-) create mode 100644 packageF/pages/team/team_more/team_more.js create mode 100644 packageF/pages/team/team_more/team_more.json create mode 100644 packageF/pages/team/team_more/team_more.wxml create mode 100644 packageF/pages/team/team_more/team_more.wxss create mode 100644 packageF/pages/team/team_ping/team_ping.js create mode 100644 packageF/pages/team/team_ping/team_ping.json create mode 100644 packageF/pages/team/team_ping/team_ping.wxml create mode 100644 packageF/pages/team/team_ping/team_ping.wxss create mode 100644 packageF/pages/user/return_goods/return_goods.js create mode 100644 packageF/pages/user/return_goods/return_goods.json create mode 100644 packageF/pages/user/return_goods/return_goods.wxml create mode 100644 packageF/pages/user/return_goods/return_goods.wxss create mode 100644 packageF/pages/user/return_goods_info/fil.wxs create mode 100644 packageF/pages/user/return_goods_info/return_goods_info.js create mode 100644 packageF/pages/user/return_goods_info/return_goods_info.json create mode 100644 packageF/pages/user/return_goods_info/return_goods_info.wxml create mode 100644 packageF/pages/user/return_goods_info/return_goods_info.wxss create mode 100644 packageF/pages/user/return_goods_list/fil.wxs create mode 100644 packageF/pages/user/return_goods_list/return_goods_list.js create mode 100644 packageF/pages/user/return_goods_list/return_goods_list.json create mode 100644 packageF/pages/user/return_goods_list/return_goods_list.wxml create mode 100644 packageF/pages/user/return_goods_list/return_goods_list.wxss delete mode 100644 pages/team/team_more/team_more.js delete mode 100644 pages/team/team_more/team_more.json delete mode 100644 pages/team/team_more/team_more.wxml delete mode 100644 pages/team/team_more/team_more.wxss delete mode 100644 pages/team/team_ping/team_ping.js delete mode 100644 pages/team/team_ping/team_ping.json delete mode 100644 pages/team/team_ping/team_ping.wxml delete mode 100644 pages/team/team_ping/team_ping.wxss delete mode 100644 pages/user/return_goods/return_goods.js delete mode 100644 pages/user/return_goods/return_goods.json delete mode 100644 pages/user/return_goods/return_goods.wxml delete mode 100644 pages/user/return_goods/return_goods.wxss delete mode 100644 pages/user/return_goods_info/fil.wxs delete mode 100644 pages/user/return_goods_info/return_goods_info.js delete mode 100644 pages/user/return_goods_info/return_goods_info.json delete mode 100644 pages/user/return_goods_info/return_goods_info.wxml delete mode 100644 pages/user/return_goods_info/return_goods_info.wxss delete mode 100644 pages/user/return_goods_list/fil.wxs delete mode 100644 pages/user/return_goods_list/return_goods_list.js delete mode 100644 pages/user/return_goods_list/return_goods_list.json delete mode 100644 pages/user/return_goods_list/return_goods_list.wxml delete mode 100644 pages/user/return_goods_list/return_goods_list.wxss diff --git a/app.json b/app.json index df3ae1a..36803e1 100644 --- a/app.json +++ b/app.json @@ -2,8 +2,7 @@ "pages": [ "pages/index/index/index", "pages/goods/categoryList/categoryList", - "pages/cart/cart/cart", - + "pages/cart/cart/cart", "pages/cart/cart4/cart4", "pages/goods/goodsInfo/goodsInfo", "pages/goods/goodsList/goodsList", @@ -14,19 +13,16 @@ "pages/user/order_list/order_list", "pages/user/order_detail/order_detail", "pages/user/address_list/address_list", - "pages/user/userinfo/userinfo", - "pages/user/return_goods_list/return_goods_list", + "pages/user/userinfo/userinfo", "pages/user/coupon/coupon", "pages/user/checkcoupon/checkcoupon", - "pages/user/add_address/add_address", - "pages/user/return_goods_info/return_goods_info", - "pages/user/return_goods/return_goods", + "pages/user/add_address/add_address", "pages/user/express/express", "pages/activity/seckill_list/seckill_list", "pages/activity/pind_list/pind_list", "pages/team/team_success/team_success", "pages/team/team_show/team_show", - "pages/team/team_ping/team_ping", + "pages/user/userqy/userqy", "pages/user/user_spsy/user_spsy", "pages/payment/pay_success/pay_success", @@ -54,7 +50,7 @@ "pages/user/assistance/assistance", "pages/store/index", "pages/giftpack/festival/festival", - "pages/team/team_more/team_more", + "pages/distribution/distribution", "pages/template/index" @@ -231,7 +227,12 @@ "pages": [ "pages/wuliu/wuliu", "pages/free_delivery/free_delivery", - "pages/xcxServiceChat/xcxServiceChat" + "pages/xcxServiceChat/xcxServiceChat", + "pages/team/team_ping/team_ping", + "pages/team/team_more/team_more", + "pages/user/return_goods_info/return_goods_info", + "pages/user/return_goods_list/return_goods_list", + "pages/user/return_goods/return_goods" ] } @@ -252,6 +253,7 @@ "backgroundColor": "#ffffff", "enablePullDownRefresh": true }, + "__usePrivacyCheck__": true, "tabBar": { "custom": true, "color": "#6e6d6b", diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index fb97f9a..055a8ad 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -5127,7 +5127,7 @@ Page({ go_t_more: function () { var team_id = this.data.prom_id; wx.navigateTo({ - url: "/pages/team/team_more/team_more?team_id=" + team_id, + url: "/packageF/pages/team/team_more/team_more?team_id=" + team_id, }); }, diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js index 13c01bd..35144f8 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js @@ -384,7 +384,7 @@ Page({ wh = "&goods_id=" + e; } wx.navigateTo({ - url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, + url: "/packageF/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, }); }, @@ -402,17 +402,17 @@ Page({ if (t.data.code == 0) { var r = t.data.data.total; if (0 == r) return wx.navigateTo({ - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, }); //--如果拒绝，就重新申请退款-- if (t.data.data.pageData[0].status == 3) { return wx.navigateTo({ - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, }); } wx.navigateTo({ - url: "/pages/user/return_goods_info/return_goods_info?id=" + r + url: "/packageF/pages/user/return_goods_info/return_goods_info?id=" + r }); } } diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml index 732bcbf..bf35f8b 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml @@ -198,7 +198,7 @@ 删除订单 重新退款 退款详情 + url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情 --> diff --git a/packageC/pages/presell/cart/cart.wxml b/packageC/pages/presell/cart/cart.wxml index 7c5a4db..ba66a24 100644 --- a/packageC/pages/presell/cart/cart.wxml +++ b/packageC/pages/presell/cart/cart.wxml @@ -421,7 +421,7 @@ 删除订单 重新退款 退款详情 + url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情 diff --git a/packageD/pages/shop/order_detail/order_detail.js b/packageD/pages/shop/order_detail/order_detail.js index 8068d1e..a166134 100644 --- a/packageD/pages/shop/order_detail/order_detail.js +++ b/packageD/pages/shop/order_detail/order_detail.js @@ -818,7 +818,7 @@ Page({ wh = "&goods_id=" + e; } wx.navigateTo({ - url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, + url: "/packageF/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, }); }, @@ -836,17 +836,17 @@ Page({ if (t.data.code == 0) { var r = t.data.data.total; if (0 == r) return wx.navigateTo({ - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, }); //--如果拒绝，就重新申请退款-- if (t.data.data.pageData[0].status == 3) { return wx.navigateTo({ - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, }); } wx.navigateTo({ - url: "/pages/user/return_goods_info/return_goods_info?id=" + r + url: "/packageF/pages/user/return_goods_info/return_goods_info?id=" + r }); } } diff --git a/packageF/pages/team/team_more/team_more.js b/packageF/pages/team/team_more/team_more.js new file mode 100644 index 0000000..c24596f --- /dev/null +++ b/packageF/pages/team/team_more/team_more.js @@ -0,0 +1,216 @@ +var t = getApp(), a = t.request, o = t.globalData.setting, os = o, + i = require("../../../../utils/util.js"), ut = i, s = require("../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../utils/runtime.js'); + + +Page({ + data: { + ylburl: "https://mshopimg.yolipai.net/",//有礼派图片地址 + pt_act: null,//拼单数据 + baseUrl: "/api/weshop/teamgroup/page?1=1", + resourceUrl: t.globalData.setting.resourceUrl, + currentPage: 1, + requestData: null, + store_id: 1, + team_id:0, + requestUrl: "", + teamgroup:null, + pt_act:null, + }, + + onLoad: function (t) { + + wx.setNavigationBarTitle({ title: "开团列表", }) + + var th=this; + //初始化加載更多 + th.data.requestData=new Array(); + var team_id=t.team_id; + var teamlist=null; + th.data.team_id = team_id; + + //获取活动表的ct_num + getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + team_id, { + data: {} + }).then(res => { + if (res.data.code == 0) { + teamlist = res.data.data; + var jt_team_num=teamlist.ct_rylist; + if (jt_team_num != "" && jt_team_num != null && jt_team_num!= undefined) { + var team_num_arr = JSON.parse(jt_team_num); + var max_num = 0; + team_num_arr.forEach(function (val, ind) { + if (val.rynum > max_num) max_num = val.rynum; + }) + teamlist.max_num = max_num; + } + + th.setData({ pt_act: teamlist }); + th.init(team_id); + } + }) + }, + + //加载更多的函数 + async init(team_id) { + + var teamgroup_arr = [];//活動从表 + var teamgroup = null,//活動从表 + user = null, + ee = this, th=ee, + pt_status = 1;//已支付 + + var req_data={ + store_id: os.stoid, pageSize:6,page:ee.data.currentPage, + state: 2, team_id: team_id,ordernum:1 + } + + if(this.data.pt_act.kttype==3 && this.data.pt_act.max_num){ + req_data.max_num=this.data.pt_act.max_num; + } + + + //获取活动从表信息team_id + await getApp().request.promiseGet("/api/weshop/teamgroup/page", { + data: req_data + }).then(res => { + if(ut.ajax_ok(res)){ + teamgroup = res.data.data.pageData; + console.log(teamgroup); + ee.data.currentPage++; + } + + }) + + //获取订单的总数这个接口不能用 + for (i = 0; i < teamgroup.length; i++) { + await getApp().request.promiseGet("/api/weshop/order/page", { + data: { store_id: os.stoid, pt_status: 1, pt_listno: teamgroup[i].listno } + }).then(res => { + if(ut.ajax_ok(res)){ + var order = res.data.data.pageData; + teamgroup[i].open_num = order.length; + } + }) + + if(!teamgroup[i].open_num) continue; + + await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + teamgroup[i].openvipid, { + }).then(res => { + var user = res.data.data; + teamgroup[i].user = user; + }) + + teamgroup_arr.push(teamgroup[i]); + } + // //设置值 + // for(var ii=0;ii 0) { + let time = (endTime - newTime); + // 获取天、时、分、秒 + let day = parseInt(time / (60 * 60 * 24)); + let hou = parseInt(time % (60 * 60 * 24) / 3600); + let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); + let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); + obj = { + day: this.timeFormat(day), + hou: this.timeFormat(hou), + min: this.timeFormat(min), + sec: this.timeFormat(sec) + } + } else { + //活动已结束，全部设置为'00' + obj = { + day: '00', + hou: '00', + min: '00', + sec: '00' + } + } + var txt = "teamgroup[" + j + "].djs"; + th.setData({ + [txt]: obj + }); + } + + setTimeout(th.countDown2, 1000); + }, + + //--跳转到加载更多-- + go_team_show:function (e) { + + var th=this; + var tid=e.currentTarget.dataset.tid; + var team_id=e.currentTarget.dataset.team_id; + var oo=getApp().globalData; + + getApp().request.get("/api/weshop/order/page", { + data: { + pt_prom_id: team_id, + user_id: oo.user_id, + store_id: os.stoid, + pageSize: 1, + page: 1 + }, + success: function(e) { + //--跳转到已经购买的情况-- + if (e.data.code == 0 && e.data.data.pageData.length > 0) { + var odr = e.data.data.pageData[0]; + //还未支付 + if (odr.pt_status == 0 && odr.order_status == 1) { + wx.navigateTo({ + url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id, + }); + }else if (odr.pt_status == 1 && odr.order_status == 1){ + wx.navigateTo({ + url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + }); + } + } + //--跳转到参团-- + else if(e.data.code == 0){ + wx.navigateTo({ + url: "/pages/team/team_show/team_show?tg_id="+tid+"&goods_id="+th.data.pt_act.goods_id, + }); + } + + } + }); + + } + +}) \ No newline at end of file diff --git a/packageF/pages/team/team_more/team_more.json b/packageF/pages/team/team_more/team_more.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/packageF/pages/team/team_more/team_more.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/packageF/pages/team/team_more/team_more.wxml b/packageF/pages/team/team_more/team_more.wxml new file mode 100644 index 0000000..45f8693 --- /dev/null +++ b/packageF/pages/team/team_more/team_more.wxml @@ -0,0 +1,36 @@ + + + + + + + + + + 等你来拼 (^_^) + + + + 还差{{pt_act.max_num - item.open_num}}人享最低优惠 + 您已经享最低优惠 + + 还差{{pt_act.ct_num - item.open_num}}人成团 + + + 剩余 + {{item.djs.day}}天: + {{item.djs.hou}}: + {{item.djs.min}}: + {{item.djs.sec}}结束 + + + + + + + 去参团 > + + + + + \ No newline at end of file diff --git a/packageF/pages/team/team_more/team_more.wxss b/packageF/pages/team/team_more/team_more.wxss new file mode 100644 index 0000000..8b54aca --- /dev/null +++ b/packageF/pages/team/team_more/team_more.wxss @@ -0,0 +1,91 @@ +/* pages/team/team_more/team_more.wxss */ + +/* pages/team/test.wxss */ + +page { + background-color: white; +} + +.top { + background-color: white; + width: 100%; + height: 100rpx; + font-size: 32rpx; + border-bottom: 2rpx #e5e5e5 solid; + padding-left: 4rpx; + padding-right: 4rpx; +} + +.group { + width: 100%; + margin-top: 20rpx; + min-height: 108rpx; +} + +.group .group-list { + border: 1rpx #f48886 solid; + border-radius: 200rpx; + height: 90rpx; + width: 720rpx; + margin-left: 15rpx; + overflow: hidden; + display: flex; + position: relative; +} + +.group .group-list .gtou { + width: 80rpx; + height: 80rpx; + top: 6rpx; +} + +.group .group-list .gtou image { + width: 80rpx; + height: 80rpx; + border-radius: 200rpx; + background-color: green; +} + +.group .group-list .gdn { + font-size: 24rpx; + line-height: 48rpx; + height: 48rpx; + width: 168rpx; + color: #8f8f94; + margin-left: 15rpx; +} + +.group .group-list .ghaicha { + text-align: right; + width: 320rpx; + height: 96rpx; + font-size: 24rpx; + overflow: hidden; +} + +.group .group-list .ghaicha .gred { + height: 48rpx; + line-height: 48rpx; + color: red; + width: 300rpx; +} + + +.group .group-list .cjt { + height: 86rpx; + width: 120rpx; + position: absolute; + right: 0; + top: 0; + border-radius: 0 100rpx 100rpx 0; + line-height: 86rpx; + font-size: 24rpx; + color: #fff; + border: 2rpx solid #dd524d; + background-color: #dd524d; +} + +.gbody { + background-color: white; +} +.time_show_view{ height: 40rpx; line-height: 40rpx; color: #8f8f94; } diff --git a/packageF/pages/team/team_ping/team_ping.js b/packageF/pages/team/team_ping/team_ping.js new file mode 100644 index 0000000..d1e2963 --- /dev/null +++ b/packageF/pages/team/team_ping/team_ping.js @@ -0,0 +1,309 @@ +var t = require("../../../../utils/util.js"), + ut = t, + e = require("../../../../utils/common.js"), + a = require("../../../../utils/wxParse/wxParse.js"), + s = getApp(), + i = s.request, + rq = i, + oo = s.globalData, + o = s.globalData.setting, + os = o; +var regeneratorRuntime = require('../../../../utils/runtime.js'); +var e = getApp(),oo = e.globalData.setting; + +Page({ + data: { + wu:false, + imageurl: os.imghost,//有礼派图片地址, + iurl: os.imghost,//有礼派图片地址, + pt_state:0, + order : null,//订单数据 + currentTab: 0, + current:0, + ordertx:[],//头像 + baseUrl: "/api/weshop/order/page?1=1", + resourceUrl: e.globalData.setting.resourceUrl, + currentPage: 1, + requestData: null, + original_img:null, + timer:null, + }, + onLoad: function () { + this.data.requestData=new Array(); + this.init(0); + wx.setNavigationBarTitle({ title: "我的拼团",}) + }, + onShow:function(){ + var th=this; + //设置全局定时器 + th.data.timer=setInterval(function () { + th.countDown(); + },1000); + }, + + /** + * 点击tab切换 + */ + swichNav: function (e) { + this.data.requestData=[]; + this.data.currentPage=1; + var that = this; + + if (that.data.order == null){ + that.setData({ + wu:true + }) + } + + if (this.data.currentTab === e.target.dataset.current) { + return false; + } else { + that.setData({ + currentTab: e.target.dataset.current, + }) + that.init(e.target.dataset.current); + } + }, + + async init(current) { + var where="1=1"; + var user_id = getApp().globalData.user_id; + switch (current){ + case "1": + where+="&pt_status=1"; + break; + case "2": + where += "&pt_ok=1"; + break; + case "3": + where += "&pt_status=3"; + break; + } + + var goods_id = 0,//商品ID, + original_img = [],//商品图片 + ee = this, + ordertx=[],//头像 + order = null,//订单数据 + goods = null,//商品数据 + users = null,//会员数据 + order_goods=null,//订单商品表 + team_g=null; + + + //获取订单表的信息根据活动user_id,pt_prom_id>0 AND pay_time>0 + await getApp().request.promiseGet("/api/weshop/order/pageTuanNew?"+where, { + data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,} + }).then(res => { + order = res.data.data.pageData; + this.data.currentPage++; + }) + + + wx.showLoading({ title: "加载中"}); + if(order && order.length){ + for (i = 0; i < order.length; i++) { + + //编号空，就进入下个循环 + if(!order[i].pt_listno) continue; + //获取teamgroup中的值 + await getApp().request.promiseGet("/api/weshop/teamgroup/page", { + data: { store_id: os.stoid, listno: order[i].pt_listno,pageSize:1,page:1} + }).then(res => { + team_g = res.data.data.pageData[0] + }) + + + switch (team_g.goods_type){ + case 0: + //获取订单从表信息 + await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", { + data: { store_id: os.stoid, order_id: order[i].order_id } + }).then(res => { + order_goods = res.data.data.pageData; + order[i].order_goods = order_goods; + order[i].gimage = ee.data.imageurl + order_goods[0]?.original_img; + }) + + //获取订单表信息根据上面查询的订单号order[i].pt_listno + await getApp().request.promiseGet("/api/weshop/order/pagePtList", { + data: { store_id: os.stoid, pt_listno: order[i].pt_listno,pageSize:60,page:1} + }).then(res => { + //console.log("ordertx"); + ordertx = res.data.data.pageData; + //console.log(ordertx); + order[i].tx=ordertx; + }) + //获取预存使用金额 + await getApp().request.promiseGet("/api/weshop/orderMore/get/" + os.stoid + "/" + order[i].order_sn, { + }).then(res => { + if (res.data.code == 0 && res.data.data) { + // data[ind].use_commission = res.data.data.use_commission; + order[i].pre_cut = res.data.data.pre_cut; //是否使用预存，如果是使用预存不能单品退，只能整单退 + order[i].pre_json = res.data.data.pre_json; //是否使用预存，如果是使用预存不能单品退，只能整单退 + } + }) + break; + + case 1: + + order[i].goods_type=1; + order[i].pre_cut=0; + + //获取order信息根据订单编号order_sn + await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", { + data: { store_id: os.stoid, order_id: order[i].order_id,} + }).then(res => { + order_goods = res.data.data.pageData; + order_goods[0].goods_num=order_goods[0].qty; + order_goods[0].goods_price=order_goods[0].price; + order[i].order_goods = order_goods; + }) + + + //pt_tail_money 在从表 + order[i].pt_tail_money=order_goods[0].pt_tail_money; + + //-- 获取商品信息 -- + await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + os.stoid + "/" + order_goods[0].card_id, { + }).then(res => { + //-- 商品地址 -- + order[i].gimage = ee.data.imageurl + res.data.data.imgUrl + order[i].order_goods[0].goods_name= res.data.data.serviceName; + }) + + //-- 多少人参团头像 -- + await getApp().request.promiseGet("/api/weshop/rechargeServicelist/pagePtList", { + data: { + store_id: o.stoid, + pt_listno: team_g.listno, + } + }).then(res => { + ordertx = res.data.data.pageData; + order[i].tx=ordertx; + }) + + break; + } + + + if (order[i].is_zsorder== 4) { + var num = 0; + var jt_data = JSON.parse(order[i].ct_rylist); + for (var m in jt_data) { + if (jt_data[m].rynum > num) num = jt_data[m].rynum; + } + order[i].max_ct_num = num; + } + + var head=[]; + if(team_g.is_xuni_ct) { + head=team_g.xuni_head_id.split(","); + order[i].is_xuni_ct=1; + } + + var sf_num = order[i].ct_num; + if (order[i].ct_num>=3){ sf_num=3;} + sf_num=sf_num-ordertx.length; + if(sf_num>0) { + var arr = []; + for(var j=0;j 0){ + let time = (endTime - newTime); + // 获取天、时、分、秒 + let day = parseInt(time / (60 * 60 * 24)); + let hou = parseInt(time % (60 * 60 * 24) / 3600); + let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); + let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); + obj = { + day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec) + } + }else{ + //活动已结束，全部设置为'00' + obj = { day: '00', hou: '00', min: '00', sec: '00' } + } + + var txt ="order["+i+"].djs"; + th.setData({ [txt]: obj}); + } + }, + //---小于10的格式化函数---- + timeFormat(param) { + return param < 10 ? '0' + param : param; + }, + + images_err:function(e){ + var txt = e.currentTarget.dataset.err; + var ob={}; + ob[txt] = this.data.imageurl + "/miniapp/images/default_g_img.gif"; + this.setData(ob); + } + + +}) + diff --git a/packageF/pages/team/team_ping/team_ping.json b/packageF/pages/team/team_ping/team_ping.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/packageF/pages/team/team_ping/team_ping.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/packageF/pages/team/team_ping/team_ping.wxml b/packageF/pages/team/team_ping/team_ping.wxml new file mode 100644 index 0000000..124ffb5 --- /dev/null +++ b/packageF/pages/team/team_ping/team_ping.wxml @@ -0,0 +1,130 @@ + + + + + 全部 + 待成团 + 已成团 + 拼团失败 + + + + + + + + + + 订单编号：{{item.order_sn}} + + + + + + + + + + {{item.order_goods[0].goods_name}} + + + + + + ￥ + {{item.order_goods[0].goods_price}} + + + + + + + + + + + + + + 还差{{item.ct_num-item.tx.length}}人成团 + + + 还差{{item.max_ct_num-item.tx.length}}人享受最价 + 您已经可以享受最低价 + + + + + + + + + + + 共{{item.order_goods[0].goods_num}}件, + + + 金额：￥ + {{filters.toFix(item.user_money+item.order_amount+item.pt_tail_money+item.pre_cut,2)}} + + + + 金额：￥ + {{filters.toFix(item.user_money+item.order_amount+item.pre_cut,2)}} + + + + + 退款时间：{{filters.format_time(item.is_back_time,1)}} + + + + + + + + + + + + + + + + + ... + + + + + 邀请好友 + 查看详情 + 支付尾款失败 + + + + + + + + + + 剩余： + {{item.djs.day}}天 + {{item.djs.hou}}时 + {{item.djs.min}}分 + {{item.djs.sec}}秒 + + + + + + + + + 暂无更多 + \ No newline at end of file diff --git a/packageF/pages/team/team_ping/team_ping.wxss b/packageF/pages/team/team_ping/team_ping.wxss new file mode 100644 index 0000000..34db240 --- /dev/null +++ b/packageF/pages/team/team_ping/team_ping.wxss @@ -0,0 +1,381 @@ +/* pages/team_ping/team_ping.wxss */ +.top{ + background-color: white; + display: flex; + flex-direction: row; + width: 100%; + min-height: 90rpx; + color: #000000; + line-height: 90rpx; + text-align: center; + font-size: 28rpx; + border-bottom: 2rpx solid #eeeeee; +} + +.tyi{ + + flex:1; + min-height: 90rpx; + color: #000000; + line-height: 90rpx; + text-align: center; +} + +.ter{ + + flex:1; + min-height: 90rpx; + color: #000000; + line-height: 90rpx; +} + +.tsan{ + + flex:1; + min-height: 90rpx; + color: #000000; + line-height: 90rpx; +} + +.tsan{ + + flex:1; + min-height: 90rpx; + color: #000000; + line-height: 90rpx; +} + +.tsi{ + + flex:1; + min-height: 90rpx; + color: #000000; + line-height: 90rpx; +} + +.pd-list-top{ + height: 80rpx; + border-bottom: 2rpx solid #eeeeee; + font-size: 28rpx; + line-height: 80rpx; + color: #666; +} + +.pd-list{ + width: 100%; + overflow: hidden; + background: #FFF; + +} + +.pd-list-top{ + margin: auto; + height: 72rpx; + border-bottom: 2rpx solid #eeeeee; + font-size: 28rpx; + line-height:72rpx; + color: #666; + font-weight: normal; + width:95%; +} + +.pd-list-top image{ + vertical-align: middle; + + display: inline-block; + width: 50rpx; + height: 50rpx; + margin-left: 10rpx; +} + +.pd-wz{ + + display: inline-block; + font-size: 28rpx; + line-height: 76rpx; + color: #000; + font-weight: normal; +} + +.jt{ + float: right; + margin-top:12rpx; + +} + +.pd-list-image{ + width: 100%; + padding-left:10px; + min-height: 120rpx; + display: flex; + +} +.pd-list-image .xc-list{ + width:710rpx; + border-bottom:2rpx solid #eee; +} +.pd-list-image .xc-list .frame{ +width:200rpx; +display:flex; +align-items:center; +height:222rpx; +} +.pd-list-image .xc-list .frame image{ + width: 182rpx; + height: 182rpx; + margin-right:20rpx; +} + +.pd-img-wz1{ + font-size: 30rpx; + height:102rpx; + line-height:114rpx; + color: #000; + width:373rpx; + + +} + + +.pd-img-wz2{ + + font-size: 32rpx; + color: #999; + width:400rpx; + + margin-top: 12rpx; +} + +.pd-jg{ + margin-right:15rpx; + font-size:42rpx; +} + +.pd-sl{ + + width: 40rpx; + float: left; + font-size: 32rpx; + color: #666; + line-height: 40rpx; + position: relative; + right:-596rpx; + top:40rpx; + +} + +.pd-price{ + + + position: absolute; +} + + +.pd-list-foot{ + width: 100%; + margin: auto; + font-size: 28rpx; + line-height: 105rpx; + color: #000; + display: flex; + justify-content:space-between; + +} + +.foot-l-wz{ + padding-right: 10rpx; + display: inline-block; + font-size: 30rpx; + color: #e4374d; + font-weight: normal; +} + +.foot-left{ + margin-left:19rpx; + min-width: 360rpx; + height: 100rpx; + line-height: 100rpx; + font-size:26rpx; +} +.foot-left .jietitun { + height: 50rpx; + line-height: 50rpx; +} + +.foot-right{ + max-width: 50%; +} + +.foot-right image{ + width: 55rpx; + height:55rpx; + border-radius: 50%; + background-color: gold; + margin-top:26rpx; + +} + + +.foot-right-wz{ + + padding: 6rpx 20rpx; + display: inline-block; + border-radius: 10rpx; + color: #fff; + margin-right: 10rpx; + width: 160rpx; + height: 40rpx; + background-color: #D90214; + + + + +} +.s_and_f{ +display:inline-block; +height:40rpx; +margin-top:20rpx; +text-align:center; +line-height:40rpx; +padding:6rpx 20rpx; +border-radius:10rpx; +margin-right:20rpx; +border: 2rpx solid #646464; +color: #646464; +} + +.yao{ + background:#D90214; +width:120rpx; +display: inline-block; +height:40rpx; +margin-top:20rpx; +text-align:center; +line-height:40rpx; + padding: 6rpx 20rpx; + border-radius: 10rpx; +color: white; +margin-right: 20rpx; +} + + + +.bg{ + color: #C4182E; + border-bottom: 4rpx solid #C4182E; + flex:1; + min-height: 90rpx; + + line-height: 90rpx; +} +.bg1{ + color: #C4182E; + border-bottom: 4rpx solid #C4182E; + flex:1; + min-height: 90rpx; + + line-height: 90rpx; +} + + +.swiper-tab{ + width: 100%; + border-bottom: 4rpx solid #777777; + text-align: center; + line-height: 160rpx;} +.swiper-tab-list{ + display: inline-block; + width: 33.33%; + color: #777777; + font-size: 32rpx; +} +.on{ color:#e4374d; + border-bottom: 5rpx solid #e4374d;} + +.swiper-box{ display: block; height: 100%; width: 100%; overflow: hidden; } +.swiper-box view{ + text-align: center; +} + +.foot-right-r{ + display: flex; +} + +.wu{ + background-color: #e0e0e0; + width: 100%; + min-height:60% ; +} + +.kon{ + background-color: e0e0e0; + min-height: 80rpx; + widows: 100%; + line-height: 80rpx; + text-align: center; + caret-color: black; + margin-top: 20rpx; + font-size: 36rpx; +} +.bodytimecen { + + flex-grow: 1; + font-size:30rpx; + color: #000; +justify-content:flex-end; +width:97%; +margin-bottom:40rpx; + line-height: 36rpx; + +} + +.bodytimecen span { + color: #e4374d; + border-radius: 7rpx; + font-size: 25rpx; + margin-right:8rpx; + line-height: 36rpx +} +.xc-price-sn{ + height:73rpx; +line-height:90rpx; +width:508rpx; + +} +.xc-price-no{ +height:102rpx; +line-height:165rpx; +width:510rpx; + +} +.xc-rmb{ + line-height:180rpx; +} +.xc-rmbs{line-height:99rpx;} +.xc-img-frame{ + line-height:176rpx; +text-align:right; + + +} +.xc-img-frame image{ + width:86rpx; +height:86rpx; + +} +.xc-still-bad{ +line-height:10rpx; +} +.xc-ellipsis{ + line-height:121rpx; +margin-left:5rpx; + +} + +.foot-l-wz2{ + font-size: 30rpx; + color: #e4374d; + font-weight: normal; + margin-top:-40rpx; + +} \ No newline at end of file diff --git a/packageF/pages/user/return_goods/return_goods.js b/packageF/pages/user/return_goods/return_goods.js new file mode 100644 index 0000000..92275ea --- /dev/null +++ b/packageF/pages/user/return_goods/return_goods.js @@ -0,0 +1,215 @@ +var t = getApp(), e = t.globalData.setting,os=e,oo=t.globalData, a = t.request, s = require("../../../../utils/common.js"), i = require("../../../../utils/selectFiles.js"); +var ut = require("../../../../utils/util.js"); + +Page({ + data: { + url: e.url, + resourceUrl: e.imghost, + defaultPhoto: e.resourceUrl + "/static/images/camera.png", + filePaths: [], + uploadPath: [], + order: null, + recId: 0, + config: null, + maxWord: 0, + isLongPress: !1, + checkBtns: ["退货退款"], + typeBtnIndex: 0, + applyNum: 1, + isReceive: !1, + causeCont: "注意保持商品的完好,建议您先与卖家沟通", + causeList: [ "订单不能按预计时间送达", "操作有误（商品、地址等选错）", "重复下单/误下单", "其他渠道价格更低", "该商品降价了", "不想买了" ], + checkCauseIndex: -1, + popState: !0, + description: "", + refund_type:0, + isloading:0, + }, + onLoad: function(e) { + var a = this; + + getApp().getConfig2(function (em) { + a.data.refund_type = em.refund_type; + }); + + this.setData({ + recId: e.rec_id + }), this.requestReturnGoods(e), t.getConfig(function(t) { + a.setData({ + "config.address": t.store_address, + "config.phone": t.store_tel, + }); + }); + + }, + requestReturnGoods: function(t) { + var e = this; + wx.showLoading(); + a.get("/api/weshop/ordergoods/list", { + failRollback: !0, + data: { + goods_id: t.rec_id, + order_id: t.order_id, + store_id:os.stoid + }, + success: function(t) { + console.log('requestReturnGoods'); + console.log(t); + e.setData({ + order: t.data.data.pageData[0], + applyNum: t.data.data.pageData[0].goods_num + }); + wx.hideLoading(); + } + }); + }, + InputDescription: function(t) { + this.setData({ + maxWord: t.detail.value.length + }), this.data.description = t.detail.value; + }, + selectGoodsStatus: function(t) { + this.setData({ + isReceive: t.currentTarget.dataset.status + }); + }, + selectServiceType: function(t) { + this.setData({ + typeBtnIndex: t.currentTarget.dataset.i + }); + }, + setNum: function(t) { + this.checkApplyNum(Number(t.detail.value)); + }, + subNum: function() { + this.checkApplyNum(this.data.applyNum - 1); + }, + addNum: function() { + this.checkApplyNum(this.data.applyNum + 1); + }, + checkApplyNum: function(t) { + isNaN(t) ? t = this.data.order.goods_num : t < 1 ? t = 1 : t > this.data.order.goods_num && (t = this.data.order.goods_num), + this.setData({ + applyNum: t + }); + }, + openPop: function() { + this.setData({ + popState: !1 + }); + }, + closePop: function() { + this.setData({ + popState: !0 + }); + }, + selectCause: function(t) { + this.setData({ + checkCauseIndex: t.currentTarget.dataset.i, + causeCont: this.data.causeList[t.currentTarget.dataset.i] + }), this.closePop(); + }, + selectPhotos: function(t) { + if (this.isLongPress) this.isLongPress = !1; else { + var e = this; + i.selectPhotos(this.data.filePaths, t.currentTarget.dataset.idx, function(t) { + e.setData({ + filePaths: t + }); + }); + } + }, + removePhoto: function(t) { + var e = this; + this.isLongPress = !0, i.removePhoto(this.data.filePaths, t.currentTarget.dataset.idx, function(t) { + e.setData({ + filePaths: t + }); + }); + }, + + + /*-------------提交退款申请--------------*/ + submiApply: function() { + + if(!this.data.order) return false; + + var t = this,th=t; + this.checkSubmit(function() { + + if(th.data.isloading) return false; + th.data.isloading=1; + + t.uploadPhotos(function() { + a.post("/api/weshop/order/returngoods/saveReturnGoods", { + /*--- + data: { + rec_id: t.data.recId, + type: t.data.typeBtnIndex, + goods_num: t.data.applyNum, + reason: t.data.causeCont, + describe: t.data.description, + goods_id: t.data.order.goods_id, + order_id: t.data.order.order_id, + order_sn: t.data.order.order_sn, + spec_key: t.data.order.spec_key, + is_receive: Number(t.data.isReceive), + imgs: t.data.uploadPath.join(",") + },---*/ + data: { + order_id: th.data.order.order_id, + order_sn: th.data.order.order_sn, + store_id: os.stoid, + user_id: oo.user_id, + back_money: th.data.order.goods_price * th.data.order.goods_num, + reason: th.data.causeList[th.data.checkCauseIndex], + goods_id: th.data.order.goods_id, + addtime: ut.gettimestamp(), + type:2, + refund_type: th.data.refund_type, + remark:th.data.description + }, + + success: function(t) { + wx.showToast({ + title: "提交成功", + mask: !0, + duration: 1e3, + complete: function() { + setTimeout(function() { + wx.navigateBack(); + }, 1e3); + } + }); + } + }); + }); + }); + }, + + /*----上传图片-----*/ + uploadPhotos: function(t, e) { + if (0 == this.data.filePaths.length) return t(); + if ("number" != typeof e) e = 0; else if (e >= this.data.filePaths.length) return t(); + var s = this; + a.uploadFile("/api/order/upload_return_goods_img", { + filePath: s.data.filePaths[e], + name: "return_imgs", + success: function(a) { + s.data.uploadPath[e] = a.data.result, s.uploadPhotos(t, e + 1); + } + }); + }, + + //----检查提交----- + checkSubmit: function(e) { + return this.data.checkCauseIndex < 0 ? t.showWarning("请先选择提交原因") : 0 == this.data.description.length ? t.showWarning("请先填写问题描述") : void e(); + }, + //------图片失败，默认图片--------- + bind_bnerr: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = "public/images/default_goods_image_240.gif"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + }, +}); \ No newline at end of file diff --git a/packageF/pages/user/return_goods/return_goods.json b/packageF/pages/user/return_goods/return_goods.json new file mode 100644 index 0000000..a639c9a --- /dev/null +++ b/packageF/pages/user/return_goods/return_goods.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "申请售后", + "enablePullDownRefresh": false +} \ No newline at end of file diff --git a/packageF/pages/user/return_goods/return_goods.wxml b/packageF/pages/user/return_goods/return_goods.wxml new file mode 100644 index 0000000..394a0f4 --- /dev/null +++ b/packageF/pages/user/return_goods/return_goods.wxml @@ -0,0 +1,81 @@ + + + + + + + {{order.goods_name}} + + 价格:￥{{order.goods_price}} + 数量:×{{order.goods_num}} + + + + + 服务类型 + + {{item}} + + + + 退款金额 + + ￥{{order.goods_price*order.goods_num}} + + + + 提交原因 + {{causeCont}} + + + + + 问题描述 + + {{500-maxWord}}/500 + + + + + + 寄回地址:{{config.address}} + 上班时间:（周一至周五）08:00-19:00 + 客服电话:{{config.phone}} + + + 提 交 + + diff --git a/packageF/pages/user/return_goods/return_goods.wxss b/packageF/pages/user/return_goods/return_goods.wxss new file mode 100644 index 0000000..cc251e2 --- /dev/null +++ b/packageF/pages/user/return_goods/return_goods.wxss @@ -0,0 +1,276 @@ +.goods-mes { + height: 100rpx; + display: flex; + padding: 20rpx 30rpx; + justify-content: space-between; +} + +.goods-img { + width: 100rpx; + height: 100rpx; + overflow: hidden; +} + +.goods-des { + width: 560rpx; +} + +.goods-des>view { + width: 100%; + line-height: 1; + font-size: 30rpx; + color: #444; +} + +.goods-package { + display: flex; + margin-top: 36rpx; +} + +.goods-package>view { + font-size: 24rpx; + color: #777; +} + +.goods-price { + margin-right: 30rpx; +} + +.service { + margin-top: 20rpx; + color: #444; +} + +.service-title { + font-size: 32rpx; + height: 80rpx; + line-height: 80rpx; +} + +.chcek-btns { + display: flex; + padding-bottom: 20rpx; +} + +.chcek-btns>view { + height: 54rpx; + padding: 0 40rpx; + margin-right: 20rpx; + line-height: 54rpx; + border: 1px solid #ccc; + font-size: 30rpx; + border-radius: 8rpx; +} + +.chcek-btns .checkedBtn { + border-color: #e23435; + color: #e23435; +} + +.apply-num { + margin-top: 20rpx; + color: #444; + font-size: 32rpx; + padding: 0 30rpx 20rpx; + background-color: #fff; +} + +.apply-title { + height: 80rpx; + line-height: 80rpx; +} + +.count { + display: flex; + width: 152rpx; + border: 1px solid #ccc; + border-radius: 8rpx; +} + +.count>view,.count>input { + width: 50rpx; + height: 50rpx; + line-height: 50rpx; + text-align: center; +} + +.count>input { + border-left: 1px solid #ccc; + border-right: 1px solid #ccc; +} + +.cause { + display: flex; + padding: 20rpx 30rpx; + margin-top: 20rpx; + background-color: #fff; + line-height: 42rpx; + overflow: hidden; +} + +.cause-title { + font-size: 32rpx; + color: #444; + margin-right: 20rpx; +} + +.cause-cont { + font-size: 28rpx; + color: #777; + width: 540rpx; + height: 42rpx; +} + +.cause-pop { + position: fixed; + z-index: 12; + left: 0; + bottom: 0; + width: 690rpx; + padding: 20rpx 30rpx 50rpx; + color: #777; + font-size: 28rpx; + background-color: #fff; +} + +.close-btn { + position: absolute; + right: 30rpx; + top: 35rpx; + font-size: 40rpx; + width: 50rpx; + height: 50rpx; + line-height: 50rpx; + text-align: center; + color: #444; +} + +.pop-title { + height: 72rpx; + line-height: 72rpx; + text-align: center; + color: #444; +} + +.cause-item { + display: flex; + align-items: center; + height: 60rpx; + margin: 10rpx 0; +} + +.cause-item>icon { + margin-right: 20rpx; +} + +.receiving-wrap { + padding: 20rpx 30rpx; + margin-top: 20rpx; + background-color: #fff; +} + +.receiving-title { + line-height: 60rpx; + font-size: 32rpx; + color: #444; +} + +.receiving-status { + display: flex; +} + +.receiving { + height: 60rpx; + display: flex; + align-items: center; + font-size: 30rpx; + color: #777; + margin-right: 30rpx; +} + +.receiving>icon { + margin-right: 20rpx; +} + +.evaluation { + padding: 30rpx 30rpx; + margin-top: 20rpx; + position: relative; + font-size: 28rpx; + background-color: #fff; +} + +.evaluation-title { + margin-bottom: 20rpx; + line-height: 50rpx; + font-size: 32rpx; + color: #444; + border-bottom: 1px solid #ddd; +} + +.word-box { + color: #444; + line-height: 40rpx; + width: 100%; + height: 200rpx; +} + +.words-num { + position: absolute; + right: 30rpx; + bottom: 30rpx; + color: #777; +} + +.upload-img { + padding: 20rpx 30rpx; + margin-top: 20rpx; + background-color: #fff; +} + +.upload-title { + line-height: 60rpx; + font-size: 32rpx; + color: #444; +} + +.pic-list { + display: flex; + padding: 20rpx 0; + justify-content: space-around; +} + +.share-pic { + width: 126rpx; + height: 126rpx; + border: 1px solid #ddd; + overflow: hidden; +} + +.upload-tips { + font-size: 28rpx; + color: #777; + line-height: 40rpx; +} + +.contact { + margin-top: 20rpx; + line-height: 72rpx; + font-size: 32rpx; + color: #444; +} + +.btn-wrap { + padding: 20rpx 0; +} + +.submit-btn { + width: 320rpx; + height: 80rpx; + line-height: 80rpx; + text-align: center; + background-color: #f15353; + color: #fff; + margin: auto; +} +.cred{color: #f15353} \ No newline at end of file diff --git a/packageF/pages/user/return_goods_info/fil.wxs b/packageF/pages/user/return_goods_info/fil.wxs new file mode 100644 index 0000000..cb12b88 --- /dev/null +++ b/packageF/pages/user/return_goods_info/fil.wxs @@ -0,0 +1,9 @@ +function is_cancle(word){ + if(word.indexOf('客户取消')!==-1){ + return true; + } + return false; +} +module.exports = { + is_cancle:is_cancle +} \ No newline at end of file diff --git a/packageF/pages/user/return_goods_info/return_goods_info.js b/packageF/pages/user/return_goods_info/return_goods_info.js new file mode 100644 index 0000000..8a75923 --- /dev/null +++ b/packageF/pages/user/return_goods_info/return_goods_info.js @@ -0,0 +1,180 @@ +var e = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(e) { + return typeof e; +} : function(e) { + return e && "function" == typeof Symbol && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e; +}, t = getApp(), r = t.globalData.setting,oo=t.globalData,os=oo.setting, + o = t.request,rq=o, s = require("../../../../utils/util.js"); + +Page({ + data: { + url: r.url, + resourceUrl: r.imghost, + return_goods: null, + goods: null, + loading:0, //是不是在处理中，避免重复点击 + }, + onLoad: function(e) { + if (e.order_id!=undefined){ + this.getreturn(e.order_id, e.goods_id); + }else{ + this.requestReturnGoods(e.id); + } + }, + //获取--return_goods--- + getreturn(a,b){ + var th=this,data=null; + if (b == undefined) { data = { order_id: a, store_id: os.stoid};} + else data = { order_id: a, goods_id: b, store_id: os.stoid}; + rq.get('/api/weshop/order/returngoods/page',{ + data:data, + success:function(dda){ + var item=dda.data.data.pageData[0]; + th.requestReturnGoods(null, item); + } + }) + }, + + //获取--详细内容--- + requestReturnGoods: function(t,b) { + var r = this, th = r; + if(b!=undefined){ + console.log("requestReturnGoods"); + console.log(b); + var o = b, odata = o; + o.addTimeFormat = s.format(o.addtime), "object" == e(o.seller_delivery) && "number" == typeof o.seller_delivery.express_time && (o.seller_delivery.expressTimeFormat = s.format(o.seller_delivery.express_time)), + r.setData({ + return_goods: o, + }); + var arr = new Array(); + if (odata.goods_id == 0) { + var gidlist = odata.goods_id_list.split(","); + for (var i = 0; i < gidlist.length; i++) { + //------读取商品--------- + rq.get("/api/weshop/goods/get/" + os.stoid + "/" + gidlist[i], { + success: function (ed) { + if (odata.goodslist != undefined) { + odata.goodslist.push(ed.data.data); + } else { + arr.push(ed.data.data); + odata.goodslist = arr; + } + th.setData({ return_goods: odata }); + } + }) + } + } else { + //------读取商品--------- + rq.get("/api/weshop/goods/get/" + os.stoid + "/" + odata.goods_id, { + success: function (ed) { + arr.push(ed.data.data); + odata.goodslist = arr; + th.setData({ return_goods: odata }); + } + }) + } + }else{ + rq.get("/api/weshop/order/returngoods/get/"+os.stoid+"/"+t, { + success: function(t) { + console.log("requestReturnGoods"); + console.log(t); + var o = t.data.data,odata=o; + o.addTimeFormat = s.format(o.addtime), "object" == e(o.seller_delivery) && "number" == typeof o.seller_delivery.express_time && (o.seller_delivery.expressTimeFormat = s.format(o.seller_delivery.express_time)), + r.setData({ + return_goods: o, + }); + + var arr = new Array(); + if (odata.goods_id == 0) { + var gidlist = odata.goods_id_list.split(","); + for (var i = 0; i < gidlist.length; i++) { + //------读取商品--------- + rq.get("/api/weshop/ordergoods/list?store_id=" + os.stoid + "&goods_id=" + gidlist[i], { + success: function (ed) { + if (odata.goodslist != undefined) { + odata.goodslist.push(ed.data.data.pageData[0]); + } else { + arr.push(ed.data.data.pageData[0]); + odata.goodslist = arr; + } + th.setData({ return_goods: odata }); + } + }) + } + } else { + //------读取商品--------- + rq.get("/api/weshop/ordergoods/list?store_id=" + os.stoid + "&goods_id=" + odata.goods_id, { + success: function (ed) { + arr.push(ed.data.data.pageData[0]); + odata.goodslist = arr; + th.setData({ return_goods: odata }); + } + }) + } + } + }); + } + }, + receiveOrder: function() { + var e = this, t = this.data.return_goods.id; + wx.showModal({ + title: "确定已收货？", + success: function(r) { + r.confirm && o.post("/api/order/receiveConfirm", { + data: { + return_id: t + }, + success: function(r) { + wx.setStorageSync("user:return_goods_list:update", !0), e.requestReturnGoods(t); + } + }); + } + }); + }, + cancelReturn: function() { + + + var e = this, + id = this.data.return_goods.id; + + if(this.data.loading) return false; + this.data.loading=1; + + wx.showModal({ + title: "确定取消售后服务？", + success: function(r) { + r.confirm && o.put("/api/weshop/order/returngoods/update", { + data: { + id: id, + store_id:os.stoid, + status:3, + remark:'客户取消' + }, + success: function(r) { + + if(r.data.code==0){ + getApp().showWarning('取消成功'); + setTimeout(function(){ + wx.setStorageSync("user:return_goods_list:update", !0), e.requestReturnGoods(id); + },1000) + }else{ + + e.data.loading=0; + s.m_toast(r.data.msg); + } + + } + }); + } + }); + }, + previewImgs: function(e) { + var t = this, r = this.data.return_goods.imgs; + getApp().globalData.no_clear=1; + r = r.map(function(e) { + return t.data.url + e; + }), wx.previewImage({ + current: r[e.currentTarget.dataset.idx], + urls: r + }); + } +}); \ No newline at end of file diff --git a/packageF/pages/user/return_goods_info/return_goods_info.json b/packageF/pages/user/return_goods_info/return_goods_info.json new file mode 100644 index 0000000..dbd6ba3 --- /dev/null +++ b/packageF/pages/user/return_goods_info/return_goods_info.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "申请服务详情", + "enablePullDownRefresh": false +} \ No newline at end of file diff --git a/packageF/pages/user/return_goods_info/return_goods_info.wxml b/packageF/pages/user/return_goods_info/return_goods_info.wxml new file mode 100644 index 0000000..11657a4 --- /dev/null +++ b/packageF/pages/user/return_goods_info/return_goods_info.wxml @@ -0,0 +1,89 @@ + + + + + 订单编号：{{return_goods.order_sn}} + 申请时间：{{return_goods.addTimeFormat}} + + + + + + + + {{item.goods_name}} + 退款金额 : ￥{{return_goods.back_money}} + + + + + 退款金额 : ￥{{return_goods.back_money}} + + + + 退款积分 : {{return_goods.back_integral}}积分 + + + + + 售后信息 + + 已申请成功，待售后审核中 + 处理中 + 退款完成 + 卖家已经拒绝退款 + + + + 处理方式 + 期望处理方式“{{return_goods.type==0?'退货':return_goods.type==1?'换货':'退款'}}” + + + 问题描述 + {{return_goods.reason}} + + + 售后备注 + {{return_goods.remark}} + + + 问题图片 + + + + + + + + + 您的服务单已申请成功，等待售后审核中 + {{return_goods.addTimeFormat}} + 操作人：客户 + + + 亲爱的客户，您的服务正在处理中 + {{filters.format_time(return_goods.handle_time,1)}} + 操作人：卖家 + + + 亲爱的客户，您的服务单已完成 + {{filters.format_time(return_goods.ok_time,1)}} + 操作人：卖家 + + + + 亲爱的客户，你已取消退款 + 操作人：客户 + + + 亲爱的客户，商家已经拒绝退款 + 操作人：卖家 + + + + + + 取消退款 + + + diff --git a/packageF/pages/user/return_goods_info/return_goods_info.wxss b/packageF/pages/user/return_goods_info/return_goods_info.wxss new file mode 100644 index 0000000..e5ac868 --- /dev/null +++ b/packageF/pages/user/return_goods_info/return_goods_info.wxss @@ -0,0 +1,159 @@ +.order-mes { + padding: 10rpx 30rpx; + background-color: #fff; +} + +.order-mes .order-name { + height: 54rpx; + line-height: 54rpx; + font-size: 30rpx; + color: #777; + width: 500rpx; + display: inline-block; +} + +.order-name view { + word-break: keep-all; + white-space: nowrap; + overflow: hidden; + width:680rpx; +} + +.apply-btn { + width: 150rpx; + float: right; + margin-top: 20rpx; +} + +.goods-mes { + padding: 10rpx 30rpx; + background-color: #fff; + display: flex; + justify-content: space-between; +} + +.goods-pic { + width: 180rpx; + height: 180rpx; +} + +.goods-des { + width: 490rpx; + font-size: 30rpx; +} + +.goods-name { + width: 100%; + height: 30rpx; + color: #444; + line-height: 1; + margin-bottom: 20rpx; +} + +.apply-mes { + padding: 30rpx; +} + +.apply-item { + display: flex; + height: 60rpx; + line-height: 60rpx; + font-size: 28rpx; + overflow: hidden; + color: #777; +} + +.apply-til { + color: #444; + margin-right: 40rpx; +} + +.apply-state { + margin-top: 20rpx; + background-color: #fff; + padding-left: 50rpx; + padding-top: 80rpx; +} + +.img-title { + position: relative; + border-top: 1rpx solid #dedede; + margin-top: 40rpx; + text-align: center; +} + +.img-title view { + position: relative; + top: -28rpx; + font-size: 28rpx; + color: #666666; + display: inline; + background: white; + padding: 0 5rpx; +} + +.img-box { + display: inline-block; +} + +.img-box image { + height: 120rpx; + width: 120rpx; + padding: 8rpx; +} + +.state-item { + border-left: 1px solid #ccc; + padding-left: 40rpx; +} + +.item-wrap { + position: relative; + margin-bottom: 80rpx; + padding-bottom: 50rpx; + border-bottom: 1px solid #eee; + font-size: 24rpx; + color: #aaa; + line-height: 1; +} + +.item-wrap::before { + content: ''; + position: absolute; + left: -61rpx; + top: 0; + width: 26rpx; + height: 26rpx; + border-radius: 50%; + background-color: #e23435; + border: 4px solid #ed8182; +} + +.state-title { + font-size: 28rpx; + font-weight: bold; + color: #666; + padding-bottom: 20rpx; +} + +.state-title view { + font-weight: normal; +} + +.state-time { + padding-bottom: 20rpx; +} + +.btn-wrap { + padding: 20rpx 0; +} +.submit-btn { + width: 320rpx; + height: 80rpx; + line-height: 80rpx; + text-align: center; + background-color: #f15353; + color: #fff; + margin: auto; +} +.cred{color: #f15353} \ No newline at end of file diff --git a/packageF/pages/user/return_goods_list/fil.wxs b/packageF/pages/user/return_goods_list/fil.wxs new file mode 100644 index 0000000..248e170 --- /dev/null +++ b/packageF/pages/user/return_goods_list/fil.wxs @@ -0,0 +1,9 @@ +function set_word(word){ + if(word.indexOf('客户取消')!==-1){ + return '客户取消'; + } + return '卖家已经拒绝退款'; +} +module.exports = { + set_word:set_word +} \ No newline at end of file diff --git a/packageF/pages/user/return_goods_list/return_goods_list.js b/packageF/pages/user/return_goods_list/return_goods_list.js new file mode 100644 index 0000000..82c56f4 --- /dev/null +++ b/packageF/pages/user/return_goods_list/return_goods_list.js @@ -0,0 +1,122 @@ +var t = function(t) { + return t && t.__esModule ? t : { + default: t + }; +}(require("../../../../utils/LoadMore.js")), e = getApp(),oo=e.globalData,os=oo.setting, + r = e.request,rq=r, s = new t.default(), o = require("../../../../utils/util.js"); + +Page({ + data: { + url: e.globalData.setting.url, + resourceUrl: e.globalData.setting.imghost, + iurl: e.globalData.setting.imghost, + list: null, + currentPage: 1 + }, + onLoad: function() { + var th=this,ts=s; + //确保有登录 + e.getUserInfo(function(){ + ts.init(th, "", "list"), th.requestReturnGoods(); + }) + + }, + onShow: function() { + wx.getStorageSync("user:return_goods_list:update") && (wx.setStorageSync("user:return_goods_list:update", !1), + this.resetData(), this.requestReturnGoods()); + }, + onPullDownRefresh: function() { + this.resetData(), this.requestReturnGoods(); + }, + onReachBottom: function() { + s.canloadMore() && this.requestReturnGoods(); + }, + //----------读取退款退货------------ + requestReturnGoods: function() { + var t = this, th=t,er = t.data.url + "/api/weshop/order/returngoods/page?page=" + t.data.currentPage; + s.request(er, function(e) { + t.data.currentPage++, th.data.list.forEach(function(t, ind, r) { + t.addTimeFommat = o.formatTime(t.addtime); + //-----判断是商品列表是否已经装载------ + if(t.goodslist==undefined){ + var arr=new Array(); + if (t.goods_id==0){ + var gidlist = t.goods_id_list.split(","); + for (var i = 0; i < gidlist.length;i++){ + //------读取商品--------- + rq.get("/api/weshop/goods/get/" + os.stoid + "/" + gidlist[i], { + success: function (ed) { + if (th.data.list[ind].goodslist != undefined){ + th.data.list[ind].goodslist.push(ed.data.data); + }else{ + arr.push(ed.data.data); + th.data.list[ind].goodslist = arr; + } + th.setData({ list: th.data.list }); + } + }) + } + }else{ + //------读取商品--------- + rq.get("/api/weshop/goods/get/" + os.stoid + "/" + t.goods_id,{ + success:function(ed){ + arr.push(ed.data.data); + th.data.list[ind].goodslist=arr; + th.setData({ list: th.data.list}); + } + }) + } + } + } + ), wx.stopPullDownRefresh(); + }, null, { store_id: os.stoid, user_id: oo.user_id} + ); + }, + resetData: function() { + this.data.currentPage = 1, this.data.list = null, s.resetConfig(); + }, + receiveOrder: function(t) { + var e = this, s = t.currentTarget.dataset.id; + wx.showModal({ + title: "确定已收货？", + success: function(t) { + t.confirm && r.post("/api/order/receiveConfirm", { + data: { + return_id: s + }, + success: function(t) { + e.resetData(), e.requestReturnGoods(); + } + }); + } + }); + }, + cancelReturn: function(t) { + var e = this, + s = t.currentTarget.dataset.id; + wx.showModal({ + title: "确定取消售后服务？", + success: function(t) { + t.confirm && r.put("/api/weshop/order/returngoods/update", { + data: { + id: s, + store_id:os.stoid, + status:3, + remark:'客户取消' + }, + success: function(t) { + if(t.data.code==0){ + + getApp().showWarning('取消成功'); + setTimeout(function(){ + e.resetData(), e.requestReturnGoods(); + },1000); + } + + + } + }); + } + }); + } +}); \ No newline at end of file diff --git a/packageF/pages/user/return_goods_list/return_goods_list.json b/packageF/pages/user/return_goods_list/return_goods_list.json new file mode 100644 index 0000000..07f1384 --- /dev/null +++ b/packageF/pages/user/return_goods_list/return_goods_list.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "退换货" +} \ No newline at end of file diff --git a/packageF/pages/user/return_goods_list/return_goods_list.wxml b/packageF/pages/user/return_goods_list/return_goods_list.wxml new file mode 100644 index 0000000..fde9ef9 --- /dev/null +++ b/packageF/pages/user/return_goods_list/return_goods_list.wxml @@ -0,0 +1,31 @@ + + + + + 订单号：{{item.order_sn}} + + + 已申请成功，待售后审核中 + 处理中 + 退款完成 + {{fil.set_word(item.remark)}} + + + + + + + {{goods.goods_name}} + 申请时间：{{item.addTimeFommat}} + + + 进度查询 + + 取消申请 + + + + 没有找到相关的记录 + 去逛逛 + + diff --git a/packageF/pages/user/return_goods_list/return_goods_list.wxss b/packageF/pages/user/return_goods_list/return_goods_list.wxss new file mode 100644 index 0000000..40fca37 --- /dev/null +++ b/packageF/pages/user/return_goods_list/return_goods_list.wxss @@ -0,0 +1,58 @@ +.return-box { + background-color: white; + margin-bottom: 20rpx; + font-size: 30rpx; +} + +.item { + padding: 20rpx 25rpx; + border-bottom: 3rpx #f8f8f8 solid; +} + +.state { + color: red; + float: right; +} + +.arrow { + margin-top: 5rpx; + width: 25rpx; + height: 28rpx; + float: right; +} + +.return-goods { + height: 100rpx; +} + +.goods_img { + height: 100rpx; + width: 100rpx; + float: left; +} + +.goods-desc { + padding-left: 30rpx; + width: 570rpx; + float: left; +} + +.goods-name { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + padding-bottom: 35rpx; +} + +.apply-time { + font-size: 26rpx; + color: #999999; +} + +.return-btn { + float: right; + border: 1rpx #aaaaaa solid; + padding: 8rpx; + border-radius: 3rpx; + margin: 20rpx 25rpx; +} \ No newline at end of file diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 13ea49b..fbcf318 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -5750,7 +5750,7 @@ Page({ go_t_more: function () { var team_id = this.data.prom_id; wx.navigateTo({ - url: "/pages/team/team_more/team_more?team_id=" + team_id, + url: "/packageF/pages/team/team_more/team_more?team_id=" + team_id, }); }, diff --git a/pages/payment/payment/payment.js b/pages/payment/payment/payment.js index 58226ad..4552b05 100644 --- a/pages/payment/payment/payment.js +++ b/pages/payment/payment/payment.js @@ -15,7 +15,7 @@ Page({ lookOrder: function() { this.data.order.is_group ? wx.redirectTo({ //url: "/pages/team/team_order/team_order?type=0" - url: "/pages/team/team_ping/team_ping?type=0" + url: "/packageF/pages/team/team_ping/team_ping?type=0" }) : wx.redirectTo({ url: "/pages/user/order_list/order_list?type=0" }); diff --git a/pages/team/team_more/team_more.js b/pages/team/team_more/team_more.js deleted file mode 100644 index 38d8119..0000000 --- a/pages/team/team_more/team_more.js +++ /dev/null @@ -1,216 +0,0 @@ -var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../utils/util.js"), ut = i, s = require("../../../utils/common.js"); -var regeneratorRuntime = require('../../../utils/runtime.js'); - - -Page({ - data: { - ylburl: "https://mshopimg.yolipai.net/",//有礼派图片地址 - pt_act: null,//拼单数据 - baseUrl: "/api/weshop/teamgroup/page?1=1", - resourceUrl: t.globalData.setting.resourceUrl, - currentPage: 1, - requestData: null, - store_id: 1, - team_id:0, - requestUrl: "", - teamgroup:null, - pt_act:null, - }, - - onLoad: function (t) { - - wx.setNavigationBarTitle({ title: "开团列表", }) - - var th=this; - //初始化加載更多 - th.data.requestData=new Array(); - var team_id=t.team_id; - var teamlist=null; - th.data.team_id = team_id; - - //获取活动表的ct_num - getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + team_id, { - data: {} - }).then(res => { - if (res.data.code == 0) { - teamlist = res.data.data; - var jt_team_num=teamlist.ct_rylist; - if (jt_team_num != "" && jt_team_num != null && jt_team_num!= undefined) { - var team_num_arr = JSON.parse(jt_team_num); - var max_num = 0; - team_num_arr.forEach(function (val, ind) { - if (val.rynum > max_num) max_num = val.rynum; - }) - teamlist.max_num = max_num; - } - - th.setData({ pt_act: teamlist }); - th.init(team_id); - } - }) - }, - - //加载更多的函数 - async init(team_id) { - - var teamgroup_arr = [];//活動从表 - var teamgroup = null,//活動从表 - user = null, - ee = this, th=ee, - pt_status = 1;//已支付 - - var req_data={ - store_id: os.stoid, pageSize:6,page:ee.data.currentPage, - state: 2, team_id: team_id,ordernum:1 - } - - if(this.data.pt_act.kttype==3 && this.data.pt_act.max_num){ - req_data.max_num=this.data.pt_act.max_num; - } - - - //获取活动从表信息team_id - await getApp().request.promiseGet("/api/weshop/teamgroup/page", { - data: req_data - }).then(res => { - if(ut.ajax_ok(res)){ - teamgroup = res.data.data.pageData; - console.log(teamgroup); - ee.data.currentPage++; - } - - }) - - //获取订单的总数这个接口不能用 - for (i = 0; i < teamgroup.length; i++) { - await getApp().request.promiseGet("/api/weshop/order/page", { - data: { store_id: os.stoid, pt_status: 1, pt_listno: teamgroup[i].listno } - }).then(res => { - if(ut.ajax_ok(res)){ - var order = res.data.data.pageData; - teamgroup[i].open_num = order.length; - } - }) - - if(!teamgroup[i].open_num) continue; - - await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + teamgroup[i].openvipid, { - }).then(res => { - var user = res.data.data; - teamgroup[i].user = user; - }) - - teamgroup_arr.push(teamgroup[i]); - } - // //设置值 - // for(var ii=0;ii 0) { - let time = (endTime - newTime); - // 获取天、时、分、秒 - let day = parseInt(time / (60 * 60 * 24)); - let hou = parseInt(time % (60 * 60 * 24) / 3600); - let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); - let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); - obj = { - day: this.timeFormat(day), - hou: this.timeFormat(hou), - min: this.timeFormat(min), - sec: this.timeFormat(sec) - } - } else { - //活动已结束，全部设置为'00' - obj = { - day: '00', - hou: '00', - min: '00', - sec: '00' - } - } - var txt = "teamgroup[" + j + "].djs"; - th.setData({ - [txt]: obj - }); - } - - setTimeout(th.countDown2, 1000); - }, - - //--跳转到加载更多-- - go_team_show:function (e) { - - var th=this; - var tid=e.currentTarget.dataset.tid; - var team_id=e.currentTarget.dataset.team_id; - var oo=getApp().globalData; - - getApp().request.get("/api/weshop/order/page", { - data: { - pt_prom_id: team_id, - user_id: oo.user_id, - store_id: os.stoid, - pageSize: 1, - page: 1 - }, - success: function(e) { - //--跳转到已经购买的情况-- - if (e.data.code == 0 && e.data.data.pageData.length > 0) { - var odr = e.data.data.pageData[0]; - //还未支付 - if (odr.pt_status == 0 && odr.order_status == 1) { - wx.navigateTo({ - url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id, - }); - }else if (odr.pt_status == 1 && odr.order_status == 1){ - wx.navigateTo({ - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, - }); - } - } - //--跳转到参团-- - else if(e.data.code == 0){ - wx.navigateTo({ - url: "/pages/team/team_show/team_show?tg_id="+tid+"&goods_id="+th.data.pt_act.goods_id, - }); - } - - } - }); - - } - -}) \ No newline at end of file diff --git a/pages/team/team_more/team_more.json b/pages/team/team_more/team_more.json deleted file mode 100644 index 8835af0..0000000 --- a/pages/team/team_more/team_more.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/team/team_more/team_more.wxml b/pages/team/team_more/team_more.wxml deleted file mode 100644 index 45f8693..0000000 --- a/pages/team/team_more/team_more.wxml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - 等你来拼 (^_^) - - - - 还差{{pt_act.max_num - item.open_num}}人享最低优惠 - 您已经享最低优惠 - - 还差{{pt_act.ct_num - item.open_num}}人成团 - - - 剩余 - {{item.djs.day}}天: - {{item.djs.hou}}: - {{item.djs.min}}: - {{item.djs.sec}}结束 - - - - - - - 去参团 > - - - - - \ No newline at end of file diff --git a/pages/team/team_more/team_more.wxss b/pages/team/team_more/team_more.wxss deleted file mode 100644 index 8b54aca..0000000 --- a/pages/team/team_more/team_more.wxss +++ /dev/null @@ -1,91 +0,0 @@ -/* pages/team/team_more/team_more.wxss */ - -/* pages/team/test.wxss */ - -page { - background-color: white; -} - -.top { - background-color: white; - width: 100%; - height: 100rpx; - font-size: 32rpx; - border-bottom: 2rpx #e5e5e5 solid; - padding-left: 4rpx; - padding-right: 4rpx; -} - -.group { - width: 100%; - margin-top: 20rpx; - min-height: 108rpx; -} - -.group .group-list { - border: 1rpx #f48886 solid; - border-radius: 200rpx; - height: 90rpx; - width: 720rpx; - margin-left: 15rpx; - overflow: hidden; - display: flex; - position: relative; -} - -.group .group-list .gtou { - width: 80rpx; - height: 80rpx; - top: 6rpx; -} - -.group .group-list .gtou image { - width: 80rpx; - height: 80rpx; - border-radius: 200rpx; - background-color: green; -} - -.group .group-list .gdn { - font-size: 24rpx; - line-height: 48rpx; - height: 48rpx; - width: 168rpx; - color: #8f8f94; - margin-left: 15rpx; -} - -.group .group-list .ghaicha { - text-align: right; - width: 320rpx; - height: 96rpx; - font-size: 24rpx; - overflow: hidden; -} - -.group .group-list .ghaicha .gred { - height: 48rpx; - line-height: 48rpx; - color: red; - width: 300rpx; -} - - -.group .group-list .cjt { - height: 86rpx; - width: 120rpx; - position: absolute; - right: 0; - top: 0; - border-radius: 0 100rpx 100rpx 0; - line-height: 86rpx; - font-size: 24rpx; - color: #fff; - border: 2rpx solid #dd524d; - background-color: #dd524d; -} - -.gbody { - background-color: white; -} -.time_show_view{ height: 40rpx; line-height: 40rpx; color: #8f8f94; } diff --git a/pages/team/team_ping/team_ping.js b/pages/team/team_ping/team_ping.js deleted file mode 100644 index acbbd3b..0000000 --- a/pages/team/team_ping/team_ping.js +++ /dev/null @@ -1,309 +0,0 @@ -var t = require("../../../utils/util.js"), - ut = t, - e = require("../../../utils/common.js"), - a = require("../../../utils/wxParse/wxParse.js"), - s = getApp(), - i = s.request, - rq = i, - oo = s.globalData, - o = s.globalData.setting, - os = o; -var regeneratorRuntime = require('../../../utils/runtime.js'); -var e = getApp(),oo = e.globalData.setting; - -Page({ - data: { - wu:false, - imageurl: os.imghost,//有礼派图片地址, - iurl: os.imghost,//有礼派图片地址, - pt_state:0, - order : null,//订单数据 - currentTab: 0, - current:0, - ordertx:[],//头像 - baseUrl: "/api/weshop/order/page?1=1", - resourceUrl: e.globalData.setting.resourceUrl, - currentPage: 1, - requestData: null, - original_img:null, - timer:null, - }, - onLoad: function () { - this.data.requestData=new Array(); - this.init(0); - wx.setNavigationBarTitle({ title: "我的拼团",}) - }, - onShow:function(){ - var th=this; - //设置全局定时器 - th.data.timer=setInterval(function () { - th.countDown(); - },1000); - }, - - /** - * 点击tab切换 - */ - swichNav: function (e) { - this.data.requestData=[]; - this.data.currentPage=1; - var that = this; - - if (that.data.order == null){ - that.setData({ - wu:true - }) - } - - if (this.data.currentTab === e.target.dataset.current) { - return false; - } else { - that.setData({ - currentTab: e.target.dataset.current, - }) - that.init(e.target.dataset.current); - } - }, - - async init(current) { - var where="1=1"; - var user_id = getApp().globalData.user_id; - switch (current){ - case "1": - where+="&pt_status=1"; - break; - case "2": - where += "&pt_ok=1"; - break; - case "3": - where += "&pt_status=3"; - break; - } - - var goods_id = 0,//商品ID, - original_img = [],//商品图片 - ee = this, - ordertx=[],//头像 - order = null,//订单数据 - goods = null,//商品数据 - users = null,//会员数据 - order_goods=null,//订单商品表 - team_g=null; - - - //获取订单表的信息根据活动user_id,pt_prom_id>0 AND pay_time>0 - await getApp().request.promiseGet("/api/weshop/order/pageTuanNew?"+where, { - data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,} - }).then(res => { - order = res.data.data.pageData; - this.data.currentPage++; - }) - - - wx.showLoading({ title: "加载中"}); - if(order && order.length){ - for (i = 0; i < order.length; i++) { - - //编号空，就进入下个循环 - if(!order[i].pt_listno) continue; - //获取teamgroup中的值 - await getApp().request.promiseGet("/api/weshop/teamgroup/page", { - data: { store_id: os.stoid, listno: order[i].pt_listno,pageSize:1,page:1} - }).then(res => { - team_g = res.data.data.pageData[0] - }) - - - switch (team_g.goods_type){ - case 0: - //获取订单从表信息 - await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", { - data: { store_id: os.stoid, order_id: order[i].order_id } - }).then(res => { - order_goods = res.data.data.pageData; - order[i].order_goods = order_goods; - order[i].gimage = ee.data.imageurl + order_goods[0]?.original_img; - }) - - //获取订单表信息根据上面查询的订单号order[i].pt_listno - await getApp().request.promiseGet("/api/weshop/order/pagePtList", { - data: { store_id: os.stoid, pt_listno: order[i].pt_listno,pageSize:60,page:1} - }).then(res => { - //console.log("ordertx"); - ordertx = res.data.data.pageData; - //console.log(ordertx); - order[i].tx=ordertx; - }) - //获取预存使用金额 - await getApp().request.promiseGet("/api/weshop/orderMore/get/" + os.stoid + "/" + order[i].order_sn, { - }).then(res => { - if (res.data.code == 0 && res.data.data) { - // data[ind].use_commission = res.data.data.use_commission; - order[i].pre_cut = res.data.data.pre_cut; //是否使用预存，如果是使用预存不能单品退，只能整单退 - order[i].pre_json = res.data.data.pre_json; //是否使用预存，如果是使用预存不能单品退，只能整单退 - } - }) - break; - - case 1: - - order[i].goods_type=1; - order[i].pre_cut=0; - - //获取order信息根据订单编号order_sn - await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", { - data: { store_id: os.stoid, order_id: order[i].order_id,} - }).then(res => { - order_goods = res.data.data.pageData; - order_goods[0].goods_num=order_goods[0].qty; - order_goods[0].goods_price=order_goods[0].price; - order[i].order_goods = order_goods; - }) - - - //pt_tail_money 在从表 - order[i].pt_tail_money=order_goods[0].pt_tail_money; - - //-- 获取商品信息 -- - await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + os.stoid + "/" + order_goods[0].card_id, { - }).then(res => { - //-- 商品地址 -- - order[i].gimage = ee.data.imageurl + res.data.data.imgUrl - order[i].order_goods[0].goods_name= res.data.data.serviceName; - }) - - //-- 多少人参团头像 -- - await getApp().request.promiseGet("/api/weshop/rechargeServicelist/pagePtList", { - data: { - store_id: o.stoid, - pt_listno: team_g.listno, - } - }).then(res => { - ordertx = res.data.data.pageData; - order[i].tx=ordertx; - }) - - break; - } - - - if (order[i].is_zsorder== 4) { - var num = 0; - var jt_data = JSON.parse(order[i].ct_rylist); - for (var m in jt_data) { - if (jt_data[m].rynum > num) num = jt_data[m].rynum; - } - order[i].max_ct_num = num; - } - - var head=[]; - if(team_g.is_xuni_ct) { - head=team_g.xuni_head_id.split(","); - order[i].is_xuni_ct=1; - } - - var sf_num = order[i].ct_num; - if (order[i].ct_num>=3){ sf_num=3;} - sf_num=sf_num-ordertx.length; - if(sf_num>0) { - var arr = []; - for(var j=0;j 0){ - let time = (endTime - newTime); - // 获取天、时、分、秒 - let day = parseInt(time / (60 * 60 * 24)); - let hou = parseInt(time % (60 * 60 * 24) / 3600); - let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); - let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); - obj = { - day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec) - } - }else{ - //活动已结束，全部设置为'00' - obj = { day: '00', hou: '00', min: '00', sec: '00' } - } - - var txt ="order["+i+"].djs"; - th.setData({ [txt]: obj}); - } - }, - //---小于10的格式化函数---- - timeFormat(param) { - return param < 10 ? '0' + param : param; - }, - - images_err:function(e){ - var txt = e.currentTarget.dataset.err; - var ob={}; - ob[txt] = this.data.imageurl + "/miniapp/images/default_g_img.gif"; - this.setData(ob); - } - - -}) - diff --git a/pages/team/team_ping/team_ping.json b/pages/team/team_ping/team_ping.json deleted file mode 100644 index 8835af0..0000000 --- a/pages/team/team_ping/team_ping.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml deleted file mode 100644 index 52bd7bc..0000000 --- a/pages/team/team_ping/team_ping.wxml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - 全部 - 待成团 - 已成团 - 拼团失败 - - - - - - - - - - 订单编号：{{item.order_sn}} - - - - - - - - - - {{item.order_goods[0].goods_name}} - - - - - - ￥ - {{item.order_goods[0].goods_price}} - - - - - - - - - - - - - - 还差{{item.ct_num-item.tx.length}}人成团 - - - 还差{{item.max_ct_num-item.tx.length}}人享受最价 - 您已经可以享受最低价 - - - - - - - - - - - 共{{item.order_goods[0].goods_num}}件, - - - 金额：￥ - {{filters.toFix(item.user_money+item.order_amount+item.pt_tail_money+item.pre_cut,2)}} - - - - 金额：￥ - {{filters.toFix(item.user_money+item.order_amount+item.pre_cut,2)}} - - - - - 退款时间：{{filters.format_time(item.is_back_time,1)}} - - - - - - - - - - - - - - - - - ... - - - - - 邀请好友 - 查看详情 - 支付尾款失败 - - - - - - - - - - 剩余： - {{item.djs.day}}天 - {{item.djs.hou}}时 - {{item.djs.min}}分 - {{item.djs.sec}}秒 - - - - - - - - - 暂无更多 - \ No newline at end of file diff --git a/pages/team/team_ping/team_ping.wxss b/pages/team/team_ping/team_ping.wxss deleted file mode 100644 index 34db240..0000000 --- a/pages/team/team_ping/team_ping.wxss +++ /dev/null @@ -1,381 +0,0 @@ -/* pages/team_ping/team_ping.wxss */ -.top{ - background-color: white; - display: flex; - flex-direction: row; - width: 100%; - min-height: 90rpx; - color: #000000; - line-height: 90rpx; - text-align: center; - font-size: 28rpx; - border-bottom: 2rpx solid #eeeeee; -} - -.tyi{ - - flex:1; - min-height: 90rpx; - color: #000000; - line-height: 90rpx; - text-align: center; -} - -.ter{ - - flex:1; - min-height: 90rpx; - color: #000000; - line-height: 90rpx; -} - -.tsan{ - - flex:1; - min-height: 90rpx; - color: #000000; - line-height: 90rpx; -} - -.tsan{ - - flex:1; - min-height: 90rpx; - color: #000000; - line-height: 90rpx; -} - -.tsi{ - - flex:1; - min-height: 90rpx; - color: #000000; - line-height: 90rpx; -} - -.pd-list-top{ - height: 80rpx; - border-bottom: 2rpx solid #eeeeee; - font-size: 28rpx; - line-height: 80rpx; - color: #666; -} - -.pd-list{ - width: 100%; - overflow: hidden; - background: #FFF; - -} - -.pd-list-top{ - margin: auto; - height: 72rpx; - border-bottom: 2rpx solid #eeeeee; - font-size: 28rpx; - line-height:72rpx; - color: #666; - font-weight: normal; - width:95%; -} - -.pd-list-top image{ - vertical-align: middle; - - display: inline-block; - width: 50rpx; - height: 50rpx; - margin-left: 10rpx; -} - -.pd-wz{ - - display: inline-block; - font-size: 28rpx; - line-height: 76rpx; - color: #000; - font-weight: normal; -} - -.jt{ - float: right; - margin-top:12rpx; - -} - -.pd-list-image{ - width: 100%; - padding-left:10px; - min-height: 120rpx; - display: flex; - -} -.pd-list-image .xc-list{ - width:710rpx; - border-bottom:2rpx solid #eee; -} -.pd-list-image .xc-list .frame{ -width:200rpx; -display:flex; -align-items:center; -height:222rpx; -} -.pd-list-image .xc-list .frame image{ - width: 182rpx; - height: 182rpx; - margin-right:20rpx; -} - -.pd-img-wz1{ - font-size: 30rpx; - height:102rpx; - line-height:114rpx; - color: #000; - width:373rpx; - - -} - - -.pd-img-wz2{ - - font-size: 32rpx; - color: #999; - width:400rpx; - - margin-top: 12rpx; -} - -.pd-jg{ - margin-right:15rpx; - font-size:42rpx; -} - -.pd-sl{ - - width: 40rpx; - float: left; - font-size: 32rpx; - color: #666; - line-height: 40rpx; - position: relative; - right:-596rpx; - top:40rpx; - -} - -.pd-price{ - - - position: absolute; -} - - -.pd-list-foot{ - width: 100%; - margin: auto; - font-size: 28rpx; - line-height: 105rpx; - color: #000; - display: flex; - justify-content:space-between; - -} - -.foot-l-wz{ - padding-right: 10rpx; - display: inline-block; - font-size: 30rpx; - color: #e4374d; - font-weight: normal; -} - -.foot-left{ - margin-left:19rpx; - min-width: 360rpx; - height: 100rpx; - line-height: 100rpx; - font-size:26rpx; -} -.foot-left .jietitun { - height: 50rpx; - line-height: 50rpx; -} - -.foot-right{ - max-width: 50%; -} - -.foot-right image{ - width: 55rpx; - height:55rpx; - border-radius: 50%; - background-color: gold; - margin-top:26rpx; - -} - - -.foot-right-wz{ - - padding: 6rpx 20rpx; - display: inline-block; - border-radius: 10rpx; - color: #fff; - margin-right: 10rpx; - width: 160rpx; - height: 40rpx; - background-color: #D90214; - - - - -} -.s_and_f{ -display:inline-block; -height:40rpx; -margin-top:20rpx; -text-align:center; -line-height:40rpx; -padding:6rpx 20rpx; -border-radius:10rpx; -margin-right:20rpx; -border: 2rpx solid #646464; -color: #646464; -} - -.yao{ - background:#D90214; -width:120rpx; -display: inline-block; -height:40rpx; -margin-top:20rpx; -text-align:center; -line-height:40rpx; - padding: 6rpx 20rpx; - border-radius: 10rpx; -color: white; -margin-right: 20rpx; -} - - - -.bg{ - color: #C4182E; - border-bottom: 4rpx solid #C4182E; - flex:1; - min-height: 90rpx; - - line-height: 90rpx; -} -.bg1{ - color: #C4182E; - border-bottom: 4rpx solid #C4182E; - flex:1; - min-height: 90rpx; - - line-height: 90rpx; -} - - -.swiper-tab{ - width: 100%; - border-bottom: 4rpx solid #777777; - text-align: center; - line-height: 160rpx;} -.swiper-tab-list{ - display: inline-block; - width: 33.33%; - color: #777777; - font-size: 32rpx; -} -.on{ color:#e4374d; - border-bottom: 5rpx solid #e4374d;} - -.swiper-box{ display: block; height: 100%; width: 100%; overflow: hidden; } -.swiper-box view{ - text-align: center; -} - -.foot-right-r{ - display: flex; -} - -.wu{ - background-color: #e0e0e0; - width: 100%; - min-height:60% ; -} - -.kon{ - background-color: e0e0e0; - min-height: 80rpx; - widows: 100%; - line-height: 80rpx; - text-align: center; - caret-color: black; - margin-top: 20rpx; - font-size: 36rpx; -} -.bodytimecen { - - flex-grow: 1; - font-size:30rpx; - color: #000; -justify-content:flex-end; -width:97%; -margin-bottom:40rpx; - line-height: 36rpx; - -} - -.bodytimecen span { - color: #e4374d; - border-radius: 7rpx; - font-size: 25rpx; - margin-right:8rpx; - line-height: 36rpx -} -.xc-price-sn{ - height:73rpx; -line-height:90rpx; -width:508rpx; - -} -.xc-price-no{ -height:102rpx; -line-height:165rpx; -width:510rpx; - -} -.xc-rmb{ - line-height:180rpx; -} -.xc-rmbs{line-height:99rpx;} -.xc-img-frame{ - line-height:176rpx; -text-align:right; - - -} -.xc-img-frame image{ - width:86rpx; -height:86rpx; - -} -.xc-still-bad{ -line-height:10rpx; -} -.xc-ellipsis{ - line-height:121rpx; -margin-left:5rpx; - -} - -.foot-l-wz2{ - font-size: 30rpx; - color: #e4374d; - font-weight: normal; - margin-top:-40rpx; - -} \ No newline at end of file diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml index caaed88..cdc58f5 100644 --- a/pages/user/index/index.wxml +++ b/pages/user/index/index.wxml @@ -145,7 +145,7 @@ 待评论 - + 售后/退款 diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 496b672..93945d3 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -1298,7 +1298,7 @@ Page({ wh = "&goods_id=" + e; } wx.navigateTo({ - url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, + url: "/packageF/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, }); }, @@ -1316,17 +1316,17 @@ Page({ if (t.data.code == 0) { var r = t.data.data.total; if (0 == r) return wx.navigateTo({ - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, }); //--如果拒绝，就重新申请退款-- if (t.data.data.pageData[0].status == 3) { return wx.navigateTo({ - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, }); } wx.navigateTo({ - url: "/pages/user/return_goods_info/return_goods_info?id=" + r + url: "/packageF/pages/user/return_goods_info/return_goods_info?id=" + r }); } } diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml index 251af46..ce95d16 100644 --- a/pages/user/order_detail/order_detail.wxml +++ b/pages/user/order_detail/order_detail.wxml @@ -190,7 +190,7 @@ 删除订单 重新退款 退款详情 + url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情 diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 7ac5f86..07df254 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -647,17 +647,17 @@ Page({ if (t.data.code == 0) { var r = t.data.data.total; if (0 == r) return wx.navigateTo({ - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, }); //--如果拒绝，就重新申请退款-- if (t.data.data.pageData[0].status == 3) { return wx.navigateTo({ - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, }); } wx.navigateTo({ - url: "/pages/user/return_goods_info/return_goods_info?id=" + r + url: "/packageF/pages/user/return_goods_info/return_goods_info?id=" + r }); } } @@ -1715,7 +1715,7 @@ Page({ wh = "&goods_id=" + e; } wx.navigateTo({ - url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, + url: "/packageF/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, }); }, diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index 27ef3c7..f9ecaef 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -258,7 +258,7 @@ 删除订单 重新退款 - 退款详情 + 退款详情 this.data.order.goods_num && (t = this.data.order.goods_num), - this.setData({ - applyNum: t - }); - }, - openPop: function() { - this.setData({ - popState: !1 - }); - }, - closePop: function() { - this.setData({ - popState: !0 - }); - }, - selectCause: function(t) { - this.setData({ - checkCauseIndex: t.currentTarget.dataset.i, - causeCont: this.data.causeList[t.currentTarget.dataset.i] - }), this.closePop(); - }, - selectPhotos: function(t) { - if (this.isLongPress) this.isLongPress = !1; else { - var e = this; - i.selectPhotos(this.data.filePaths, t.currentTarget.dataset.idx, function(t) { - e.setData({ - filePaths: t - }); - }); - } - }, - removePhoto: function(t) { - var e = this; - this.isLongPress = !0, i.removePhoto(this.data.filePaths, t.currentTarget.dataset.idx, function(t) { - e.setData({ - filePaths: t - }); - }); - }, - - - /*-------------提交退款申请--------------*/ - submiApply: function() { - - if(!this.data.order) return false; - - var t = this,th=t; - this.checkSubmit(function() { - - if(th.data.isloading) return false; - th.data.isloading=1; - - t.uploadPhotos(function() { - a.post("/api/weshop/order/returngoods/saveReturnGoods", { - /*--- - data: { - rec_id: t.data.recId, - type: t.data.typeBtnIndex, - goods_num: t.data.applyNum, - reason: t.data.causeCont, - describe: t.data.description, - goods_id: t.data.order.goods_id, - order_id: t.data.order.order_id, - order_sn: t.data.order.order_sn, - spec_key: t.data.order.spec_key, - is_receive: Number(t.data.isReceive), - imgs: t.data.uploadPath.join(",") - },---*/ - data: { - order_id: th.data.order.order_id, - order_sn: th.data.order.order_sn, - store_id: os.stoid, - user_id: oo.user_id, - back_money: th.data.order.goods_price * th.data.order.goods_num, - reason: th.data.causeList[th.data.checkCauseIndex], - goods_id: th.data.order.goods_id, - addtime: ut.gettimestamp(), - type:2, - refund_type: th.data.refund_type, - remark:th.data.description - }, - - success: function(t) { - wx.showToast({ - title: "提交成功", - mask: !0, - duration: 1e3, - complete: function() { - setTimeout(function() { - wx.navigateBack(); - }, 1e3); - } - }); - } - }); - }); - }); - }, - - /*----上传图片-----*/ - uploadPhotos: function(t, e) { - if (0 == this.data.filePaths.length) return t(); - if ("number" != typeof e) e = 0; else if (e >= this.data.filePaths.length) return t(); - var s = this; - a.uploadFile("/api/order/upload_return_goods_img", { - filePath: s.data.filePaths[e], - name: "return_imgs", - success: function(a) { - s.data.uploadPath[e] = a.data.result, s.uploadPhotos(t, e + 1); - } - }); - }, - - //----检查提交----- - checkSubmit: function(e) { - return this.data.checkCauseIndex < 0 ? t.showWarning("请先选择提交原因") : 0 == this.data.description.length ? t.showWarning("请先填写问题描述") : void e(); - }, - //------图片失败，默认图片--------- - bind_bnerr: function (e) { - var _errImg = e.target.dataset.errorimg; - var _errObj = {}; - _errObj[_errImg] = "public/images/default_goods_image_240.gif"; - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; - }, -}); \ No newline at end of file diff --git a/pages/user/return_goods/return_goods.json b/pages/user/return_goods/return_goods.json deleted file mode 100644 index a639c9a..0000000 --- a/pages/user/return_goods/return_goods.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "申请售后", - "enablePullDownRefresh": false -} \ No newline at end of file diff --git a/pages/user/return_goods/return_goods.wxml b/pages/user/return_goods/return_goods.wxml deleted file mode 100644 index 394a0f4..0000000 --- a/pages/user/return_goods/return_goods.wxml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - {{order.goods_name}} - - 价格:￥{{order.goods_price}} - 数量:×{{order.goods_num}} - - - - - 服务类型 - - {{item}} - - - - 退款金额 - - ￥{{order.goods_price*order.goods_num}} - - - - 提交原因 - {{causeCont}} - - - - - 问题描述 - - {{500-maxWord}}/500 - - - - - - 寄回地址:{{config.address}} - 上班时间:（周一至周五）08:00-19:00 - 客服电话:{{config.phone}} - - - 提 交 - - diff --git a/pages/user/return_goods/return_goods.wxss b/pages/user/return_goods/return_goods.wxss deleted file mode 100644 index cc251e2..0000000 --- a/pages/user/return_goods/return_goods.wxss +++ /dev/null @@ -1,276 +0,0 @@ -.goods-mes { - height: 100rpx; - display: flex; - padding: 20rpx 30rpx; - justify-content: space-between; -} - -.goods-img { - width: 100rpx; - height: 100rpx; - overflow: hidden; -} - -.goods-des { - width: 560rpx; -} - -.goods-des>view { - width: 100%; - line-height: 1; - font-size: 30rpx; - color: #444; -} - -.goods-package { - display: flex; - margin-top: 36rpx; -} - -.goods-package>view { - font-size: 24rpx; - color: #777; -} - -.goods-price { - margin-right: 30rpx; -} - -.service { - margin-top: 20rpx; - color: #444; -} - -.service-title { - font-size: 32rpx; - height: 80rpx; - line-height: 80rpx; -} - -.chcek-btns { - display: flex; - padding-bottom: 20rpx; -} - -.chcek-btns>view { - height: 54rpx; - padding: 0 40rpx; - margin-right: 20rpx; - line-height: 54rpx; - border: 1px solid #ccc; - font-size: 30rpx; - border-radius: 8rpx; -} - -.chcek-btns .checkedBtn { - border-color: #e23435; - color: #e23435; -} - -.apply-num { - margin-top: 20rpx; - color: #444; - font-size: 32rpx; - padding: 0 30rpx 20rpx; - background-color: #fff; -} - -.apply-title { - height: 80rpx; - line-height: 80rpx; -} - -.count { - display: flex; - width: 152rpx; - border: 1px solid #ccc; - border-radius: 8rpx; -} - -.count>view,.count>input { - width: 50rpx; - height: 50rpx; - line-height: 50rpx; - text-align: center; -} - -.count>input { - border-left: 1px solid #ccc; - border-right: 1px solid #ccc; -} - -.cause { - display: flex; - padding: 20rpx 30rpx; - margin-top: 20rpx; - background-color: #fff; - line-height: 42rpx; - overflow: hidden; -} - -.cause-title { - font-size: 32rpx; - color: #444; - margin-right: 20rpx; -} - -.cause-cont { - font-size: 28rpx; - color: #777; - width: 540rpx; - height: 42rpx; -} - -.cause-pop { - position: fixed; - z-index: 12; - left: 0; - bottom: 0; - width: 690rpx; - padding: 20rpx 30rpx 50rpx; - color: #777; - font-size: 28rpx; - background-color: #fff; -} - -.close-btn { - position: absolute; - right: 30rpx; - top: 35rpx; - font-size: 40rpx; - width: 50rpx; - height: 50rpx; - line-height: 50rpx; - text-align: center; - color: #444; -} - -.pop-title { - height: 72rpx; - line-height: 72rpx; - text-align: center; - color: #444; -} - -.cause-item { - display: flex; - align-items: center; - height: 60rpx; - margin: 10rpx 0; -} - -.cause-item>icon { - margin-right: 20rpx; -} - -.receiving-wrap { - padding: 20rpx 30rpx; - margin-top: 20rpx; - background-color: #fff; -} - -.receiving-title { - line-height: 60rpx; - font-size: 32rpx; - color: #444; -} - -.receiving-status { - display: flex; -} - -.receiving { - height: 60rpx; - display: flex; - align-items: center; - font-size: 30rpx; - color: #777; - margin-right: 30rpx; -} - -.receiving>icon { - margin-right: 20rpx; -} - -.evaluation { - padding: 30rpx 30rpx; - margin-top: 20rpx; - position: relative; - font-size: 28rpx; - background-color: #fff; -} - -.evaluation-title { - margin-bottom: 20rpx; - line-height: 50rpx; - font-size: 32rpx; - color: #444; - border-bottom: 1px solid #ddd; -} - -.word-box { - color: #444; - line-height: 40rpx; - width: 100%; - height: 200rpx; -} - -.words-num { - position: absolute; - right: 30rpx; - bottom: 30rpx; - color: #777; -} - -.upload-img { - padding: 20rpx 30rpx; - margin-top: 20rpx; - background-color: #fff; -} - -.upload-title { - line-height: 60rpx; - font-size: 32rpx; - color: #444; -} - -.pic-list { - display: flex; - padding: 20rpx 0; - justify-content: space-around; -} - -.share-pic { - width: 126rpx; - height: 126rpx; - border: 1px solid #ddd; - overflow: hidden; -} - -.upload-tips { - font-size: 28rpx; - color: #777; - line-height: 40rpx; -} - -.contact { - margin-top: 20rpx; - line-height: 72rpx; - font-size: 32rpx; - color: #444; -} - -.btn-wrap { - padding: 20rpx 0; -} - -.submit-btn { - width: 320rpx; - height: 80rpx; - line-height: 80rpx; - text-align: center; - background-color: #f15353; - color: #fff; - margin: auto; -} -.cred{color: #f15353} \ No newline at end of file diff --git a/pages/user/return_goods_info/fil.wxs b/pages/user/return_goods_info/fil.wxs deleted file mode 100644 index cb12b88..0000000 --- a/pages/user/return_goods_info/fil.wxs +++ /dev/null @@ -1,9 +0,0 @@ -function is_cancle(word){ - if(word.indexOf('客户取消')!==-1){ - return true; - } - return false; -} -module.exports = { - is_cancle:is_cancle -} \ No newline at end of file diff --git a/pages/user/return_goods_info/return_goods_info.js b/pages/user/return_goods_info/return_goods_info.js deleted file mode 100644 index 80bdb89..0000000 --- a/pages/user/return_goods_info/return_goods_info.js +++ /dev/null @@ -1,180 +0,0 @@ -var e = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(e) { - return typeof e; -} : function(e) { - return e && "function" == typeof Symbol && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e; -}, t = getApp(), r = t.globalData.setting,oo=t.globalData,os=oo.setting, - o = t.request,rq=o, s = require("../../../utils/util.js"); - -Page({ - data: { - url: r.url, - resourceUrl: r.imghost, - return_goods: null, - goods: null, - loading:0, //是不是在处理中，避免重复点击 - }, - onLoad: function(e) { - if (e.order_id!=undefined){ - this.getreturn(e.order_id, e.goods_id); - }else{ - this.requestReturnGoods(e.id); - } - }, - //获取--return_goods--- - getreturn(a,b){ - var th=this,data=null; - if (b == undefined) { data = { order_id: a, store_id: os.stoid};} - else data = { order_id: a, goods_id: b, store_id: os.stoid}; - rq.get('/api/weshop/order/returngoods/page',{ - data:data, - success:function(dda){ - var item=dda.data.data.pageData[0]; - th.requestReturnGoods(null, item); - } - }) - }, - - //获取--详细内容--- - requestReturnGoods: function(t,b) { - var r = this, th = r; - if(b!=undefined){ - console.log("requestReturnGoods"); - console.log(b); - var o = b, odata = o; - o.addTimeFormat = s.format(o.addtime), "object" == e(o.seller_delivery) && "number" == typeof o.seller_delivery.express_time && (o.seller_delivery.expressTimeFormat = s.format(o.seller_delivery.express_time)), - r.setData({ - return_goods: o, - }); - var arr = new Array(); - if (odata.goods_id == 0) { - var gidlist = odata.goods_id_list.split(","); - for (var i = 0; i < gidlist.length; i++) { - //------读取商品--------- - rq.get("/api/weshop/goods/get/" + os.stoid + "/" + gidlist[i], { - success: function (ed) { - if (odata.goodslist != undefined) { - odata.goodslist.push(ed.data.data); - } else { - arr.push(ed.data.data); - odata.goodslist = arr; - } - th.setData({ return_goods: odata }); - } - }) - } - } else { - //------读取商品--------- - rq.get("/api/weshop/goods/get/" + os.stoid + "/" + odata.goods_id, { - success: function (ed) { - arr.push(ed.data.data); - odata.goodslist = arr; - th.setData({ return_goods: odata }); - } - }) - } - }else{ - rq.get("/api/weshop/order/returngoods/get/"+os.stoid+"/"+t, { - success: function(t) { - console.log("requestReturnGoods"); - console.log(t); - var o = t.data.data,odata=o; - o.addTimeFormat = s.format(o.addtime), "object" == e(o.seller_delivery) && "number" == typeof o.seller_delivery.express_time && (o.seller_delivery.expressTimeFormat = s.format(o.seller_delivery.express_time)), - r.setData({ - return_goods: o, - }); - - var arr = new Array(); - if (odata.goods_id == 0) { - var gidlist = odata.goods_id_list.split(","); - for (var i = 0; i < gidlist.length; i++) { - //------读取商品--------- - rq.get("/api/weshop/ordergoods/list?store_id=" + os.stoid + "&goods_id=" + gidlist[i], { - success: function (ed) { - if (odata.goodslist != undefined) { - odata.goodslist.push(ed.data.data.pageData[0]); - } else { - arr.push(ed.data.data.pageData[0]); - odata.goodslist = arr; - } - th.setData({ return_goods: odata }); - } - }) - } - } else { - //------读取商品--------- - rq.get("/api/weshop/ordergoods/list?store_id=" + os.stoid + "&goods_id=" + odata.goods_id, { - success: function (ed) { - arr.push(ed.data.data.pageData[0]); - odata.goodslist = arr; - th.setData({ return_goods: odata }); - } - }) - } - } - }); - } - }, - receiveOrder: function() { - var e = this, t = this.data.return_goods.id; - wx.showModal({ - title: "确定已收货？", - success: function(r) { - r.confirm && o.post("/api/order/receiveConfirm", { - data: { - return_id: t - }, - success: function(r) { - wx.setStorageSync("user:return_goods_list:update", !0), e.requestReturnGoods(t); - } - }); - } - }); - }, - cancelReturn: function() { - - - var e = this, - id = this.data.return_goods.id; - - if(this.data.loading) return false; - this.data.loading=1; - - wx.showModal({ - title: "确定取消售后服务？", - success: function(r) { - r.confirm && o.put("/api/weshop/order/returngoods/update", { - data: { - id: id, - store_id:os.stoid, - status:3, - remark:'客户取消' - }, - success: function(r) { - - if(r.data.code==0){ - getApp().showWarning('取消成功'); - setTimeout(function(){ - wx.setStorageSync("user:return_goods_list:update", !0), e.requestReturnGoods(id); - },1000) - }else{ - - e.data.loading=0; - s.m_toast(r.data.msg); - } - - } - }); - } - }); - }, - previewImgs: function(e) { - var t = this, r = this.data.return_goods.imgs; - getApp().globalData.no_clear=1; - r = r.map(function(e) { - return t.data.url + e; - }), wx.previewImage({ - current: r[e.currentTarget.dataset.idx], - urls: r - }); - } -}); \ No newline at end of file diff --git a/pages/user/return_goods_info/return_goods_info.json b/pages/user/return_goods_info/return_goods_info.json deleted file mode 100644 index dbd6ba3..0000000 --- a/pages/user/return_goods_info/return_goods_info.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "申请服务详情", - "enablePullDownRefresh": false -} \ No newline at end of file diff --git a/pages/user/return_goods_info/return_goods_info.wxml b/pages/user/return_goods_info/return_goods_info.wxml deleted file mode 100644 index 77d3c16..0000000 --- a/pages/user/return_goods_info/return_goods_info.wxml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - 订单编号：{{return_goods.order_sn}} - 申请时间：{{return_goods.addTimeFormat}} - - - - - - - - {{item.goods_name}} - 退款金额 : ￥{{return_goods.back_money}} - - - - - 退款金额 : ￥{{return_goods.back_money}} - - - - 退款积分 : {{return_goods.back_integral}}积分 - - - - - 售后信息 - - 已申请成功，待售后审核中 - 处理中 - 退款完成 - 卖家已经拒绝退款 - - - - 处理方式 - 期望处理方式“{{return_goods.type==0?'退货':return_goods.type==1?'换货':'退款'}}” - - - 问题描述 - {{return_goods.reason}} - - - 售后备注 - {{return_goods.remark}} - - - 问题图片 - - - - - - - - - 您的服务单已申请成功，等待售后审核中 - {{return_goods.addTimeFormat}} - 操作人：客户 - - - 亲爱的客户，您的服务正在处理中 - {{filters.format_time(return_goods.handle_time,1)}} - 操作人：卖家 - - - 亲爱的客户，您的服务单已完成 - {{filters.format_time(return_goods.ok_time,1)}} - 操作人：卖家 - - - - 亲爱的客户，你已取消退款 - 操作人：客户 - - - 亲爱的客户，商家已经拒绝退款 - 操作人：卖家 - - - - - - 取消退款 - - - diff --git a/pages/user/return_goods_info/return_goods_info.wxss b/pages/user/return_goods_info/return_goods_info.wxss deleted file mode 100644 index e5ac868..0000000 --- a/pages/user/return_goods_info/return_goods_info.wxss +++ /dev/null @@ -1,159 +0,0 @@ -.order-mes { - padding: 10rpx 30rpx; - background-color: #fff; -} - -.order-mes .order-name { - height: 54rpx; - line-height: 54rpx; - font-size: 30rpx; - color: #777; - width: 500rpx; - display: inline-block; -} - -.order-name view { - word-break: keep-all; - white-space: nowrap; - overflow: hidden; - width:680rpx; -} - -.apply-btn { - width: 150rpx; - float: right; - margin-top: 20rpx; -} - -.goods-mes { - padding: 10rpx 30rpx; - background-color: #fff; - display: flex; - justify-content: space-between; -} - -.goods-pic { - width: 180rpx; - height: 180rpx; -} - -.goods-des { - width: 490rpx; - font-size: 30rpx; -} - -.goods-name { - width: 100%; - height: 30rpx; - color: #444; - line-height: 1; - margin-bottom: 20rpx; -} - -.apply-mes { - padding: 30rpx; -} - -.apply-item { - display: flex; - height: 60rpx; - line-height: 60rpx; - font-size: 28rpx; - overflow: hidden; - color: #777; -} - -.apply-til { - color: #444; - margin-right: 40rpx; -} - -.apply-state { - margin-top: 20rpx; - background-color: #fff; - padding-left: 50rpx; - padding-top: 80rpx; -} - -.img-title { - position: relative; - border-top: 1rpx solid #dedede; - margin-top: 40rpx; - text-align: center; -} - -.img-title view { - position: relative; - top: -28rpx; - font-size: 28rpx; - color: #666666; - display: inline; - background: white; - padding: 0 5rpx; -} - -.img-box { - display: inline-block; -} - -.img-box image { - height: 120rpx; - width: 120rpx; - padding: 8rpx; -} - -.state-item { - border-left: 1px solid #ccc; - padding-left: 40rpx; -} - -.item-wrap { - position: relative; - margin-bottom: 80rpx; - padding-bottom: 50rpx; - border-bottom: 1px solid #eee; - font-size: 24rpx; - color: #aaa; - line-height: 1; -} - -.item-wrap::before { - content: ''; - position: absolute; - left: -61rpx; - top: 0; - width: 26rpx; - height: 26rpx; - border-radius: 50%; - background-color: #e23435; - border: 4px solid #ed8182; -} - -.state-title { - font-size: 28rpx; - font-weight: bold; - color: #666; - padding-bottom: 20rpx; -} - -.state-title view { - font-weight: normal; -} - -.state-time { - padding-bottom: 20rpx; -} - -.btn-wrap { - padding: 20rpx 0; -} -.submit-btn { - width: 320rpx; - height: 80rpx; - line-height: 80rpx; - text-align: center; - background-color: #f15353; - color: #fff; - margin: auto; -} -.cred{color: #f15353} \ No newline at end of file diff --git a/pages/user/return_goods_list/fil.wxs b/pages/user/return_goods_list/fil.wxs deleted file mode 100644 index 248e170..0000000 --- a/pages/user/return_goods_list/fil.wxs +++ /dev/null @@ -1,9 +0,0 @@ -function set_word(word){ - if(word.indexOf('客户取消')!==-1){ - return '客户取消'; - } - return '卖家已经拒绝退款'; -} -module.exports = { - set_word:set_word -} \ No newline at end of file diff --git a/pages/user/return_goods_list/return_goods_list.js b/pages/user/return_goods_list/return_goods_list.js deleted file mode 100644 index b7add3a..0000000 --- a/pages/user/return_goods_list/return_goods_list.js +++ /dev/null @@ -1,122 +0,0 @@ -var t = function(t) { - return t && t.__esModule ? t : { - default: t - }; -}(require("../../../utils/LoadMore.js")), e = getApp(),oo=e.globalData,os=oo.setting, - r = e.request,rq=r, s = new t.default(), o = require("../../../utils/util.js"); - -Page({ - data: { - url: e.globalData.setting.url, - resourceUrl: e.globalData.setting.imghost, - iurl: e.globalData.setting.imghost, - list: null, - currentPage: 1 - }, - onLoad: function() { - var th=this,ts=s; - //确保有登录 - e.getUserInfo(function(){ - ts.init(th, "", "list"), th.requestReturnGoods(); - }) - - }, - onShow: function() { - wx.getStorageSync("user:return_goods_list:update") && (wx.setStorageSync("user:return_goods_list:update", !1), - this.resetData(), this.requestReturnGoods()); - }, - onPullDownRefresh: function() { - this.resetData(), this.requestReturnGoods(); - }, - onReachBottom: function() { - s.canloadMore() && this.requestReturnGoods(); - }, - //----------读取退款退货------------ - requestReturnGoods: function() { - var t = this, th=t,er = t.data.url + "/api/weshop/order/returngoods/page?page=" + t.data.currentPage; - s.request(er, function(e) { - t.data.currentPage++, th.data.list.forEach(function(t, ind, r) { - t.addTimeFommat = o.formatTime(t.addtime); - //-----判断是商品列表是否已经装载------ - if(t.goodslist==undefined){ - var arr=new Array(); - if (t.goods_id==0){ - var gidlist = t.goods_id_list.split(","); - for (var i = 0; i < gidlist.length;i++){ - //------读取商品--------- - rq.get("/api/weshop/goods/get/" + os.stoid + "/" + gidlist[i], { - success: function (ed) { - if (th.data.list[ind].goodslist != undefined){ - th.data.list[ind].goodslist.push(ed.data.data); - }else{ - arr.push(ed.data.data); - th.data.list[ind].goodslist = arr; - } - th.setData({ list: th.data.list }); - } - }) - } - }else{ - //------读取商品--------- - rq.get("/api/weshop/goods/get/" + os.stoid + "/" + t.goods_id,{ - success:function(ed){ - arr.push(ed.data.data); - th.data.list[ind].goodslist=arr; - th.setData({ list: th.data.list}); - } - }) - } - } - } - ), wx.stopPullDownRefresh(); - }, null, { store_id: os.stoid, user_id: oo.user_id} - ); - }, - resetData: function() { - this.data.currentPage = 1, this.data.list = null, s.resetConfig(); - }, - receiveOrder: function(t) { - var e = this, s = t.currentTarget.dataset.id; - wx.showModal({ - title: "确定已收货？", - success: function(t) { - t.confirm && r.post("/api/order/receiveConfirm", { - data: { - return_id: s - }, - success: function(t) { - e.resetData(), e.requestReturnGoods(); - } - }); - } - }); - }, - cancelReturn: function(t) { - var e = this, - s = t.currentTarget.dataset.id; - wx.showModal({ - title: "确定取消售后服务？", - success: function(t) { - t.confirm && r.put("/api/weshop/order/returngoods/update", { - data: { - id: s, - store_id:os.stoid, - status:3, - remark:'客户取消' - }, - success: function(t) { - if(t.data.code==0){ - - getApp().showWarning('取消成功'); - setTimeout(function(){ - e.resetData(), e.requestReturnGoods(); - },1000); - } - - - } - }); - } - }); - } -}); \ No newline at end of file diff --git a/pages/user/return_goods_list/return_goods_list.json b/pages/user/return_goods_list/return_goods_list.json deleted file mode 100644 index 07f1384..0000000 --- a/pages/user/return_goods_list/return_goods_list.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "navigationBarTitleText": "退换货" -} \ No newline at end of file diff --git a/pages/user/return_goods_list/return_goods_list.wxml b/pages/user/return_goods_list/return_goods_list.wxml deleted file mode 100644 index 0c4d801..0000000 --- a/pages/user/return_goods_list/return_goods_list.wxml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - 订单号：{{item.order_sn}} - - - 已申请成功，待售后审核中 - 处理中 - 退款完成 - {{fil.set_word(item.remark)}} - - - - - - - {{goods.goods_name}} - 申请时间：{{item.addTimeFommat}} - - - 进度查询 - - 取消申请 - - - - 没有找到相关的记录 - 去逛逛 - - diff --git a/pages/user/return_goods_list/return_goods_list.wxss b/pages/user/return_goods_list/return_goods_list.wxss deleted file mode 100644 index 40fca37..0000000 --- a/pages/user/return_goods_list/return_goods_list.wxss +++ /dev/null @@ -1,58 +0,0 @@ -.return-box { - background-color: white; - margin-bottom: 20rpx; - font-size: 30rpx; -} - -.item { - padding: 20rpx 25rpx; - border-bottom: 3rpx #f8f8f8 solid; -} - -.state { - color: red; - float: right; -} - -.arrow { - margin-top: 5rpx; - width: 25rpx; - height: 28rpx; - float: right; -} - -.return-goods { - height: 100rpx; -} - -.goods_img { - height: 100rpx; - width: 100rpx; - float: left; -} - -.goods-desc { - padding-left: 30rpx; - width: 570rpx; - float: left; -} - -.goods-name { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - padding-bottom: 35rpx; -} - -.apply-time { - font-size: 26rpx; - color: #999999; -} - -.return-btn { - float: right; - border: 1rpx #aaaaaa solid; - padding: 8rpx; - border-radius: 3rpx; - margin: 20rpx 25rpx; -} \ No newline at end of file -- libgit2 0.21.4