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/pages/team/team_more/team_more.js b/packageF/pages/team/team_more/team_more.js index 38d8119..c24596f 100644 --- a/pages/team/team_more/team_more.js +++ b/packageF/pages/team/team_more/team_more.js @@ -1,6 +1,6 @@ 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'); + i = require("../../../../utils/util.js"), ut = i, s = require("../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../utils/runtime.js'); Page({ diff --git a/pages/team/team_more/team_more.json b/packageF/pages/team/team_more/team_more.json index 8835af0..8835af0 100644 --- a/pages/team/team_more/team_more.json +++ b/packageF/pages/team/team_more/team_more.json diff --git a/pages/team/team_more/team_more.wxml b/packageF/pages/team/team_more/team_more.wxml index 45f8693..45f8693 100644 --- a/pages/team/team_more/team_more.wxml +++ b/packageF/pages/team/team_more/team_more.wxml diff --git a/pages/team/team_more/team_more.wxss b/packageF/pages/team/team_more/team_more.wxss index 8b54aca..8b54aca 100644 --- a/pages/team/team_more/team_more.wxss +++ b/packageF/pages/team/team_more/team_more.wxss diff --git a/pages/team/team_ping/team_ping.js b/packageF/pages/team/team_ping/team_ping.js index acbbd3b..d1e2963 100644 --- a/pages/team/team_ping/team_ping.js +++ b/packageF/pages/team/team_ping/team_ping.js @@ -1,14 +1,14 @@ -var t = require("../../../utils/util.js"), +var t = require("../../../../utils/util.js"), ut = t, - e = require("../../../utils/common.js"), - a = require("../../../utils/wxParse/wxParse.js"), + 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 regeneratorRuntime = require('../../../../utils/runtime.js'); var e = getApp(),oo = e.globalData.setting; Page({ diff --git a/pages/team/team_ping/team_ping.json b/packageF/pages/team/team_ping/team_ping.json index 8835af0..8835af0 100644 --- a/pages/team/team_ping/team_ping.json +++ b/packageF/pages/team/team_ping/team_ping.json diff --git a/pages/team/team_ping/team_ping.wxml b/packageF/pages/team/team_ping/team_ping.wxml index 52bd7bc..124ffb5 100644 --- a/pages/team/team_ping/team_ping.wxml +++ b/packageF/pages/team/team_ping/team_ping.wxml @@ -1,4 +1,4 @@ - + diff --git a/pages/team/team_ping/team_ping.wxss b/packageF/pages/team/team_ping/team_ping.wxss index 34db240..34db240 100644 --- a/pages/team/team_ping/team_ping.wxss +++ b/packageF/pages/team/team_ping/team_ping.wxss diff --git a/pages/user/return_goods/return_goods.js b/packageF/pages/user/return_goods/return_goods.js index 4419264..92275ea 100644 --- a/pages/user/return_goods/return_goods.js +++ b/packageF/pages/user/return_goods/return_goods.js @@ -1,5 +1,5 @@ -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"); +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: { diff --git a/pages/user/return_goods/return_goods.json b/packageF/pages/user/return_goods/return_goods.json index a639c9a..a639c9a 100644 --- a/pages/user/return_goods/return_goods.json +++ b/packageF/pages/user/return_goods/return_goods.json diff --git a/pages/user/return_goods/return_goods.wxml b/packageF/pages/user/return_goods/return_goods.wxml index 394a0f4..394a0f4 100644 --- a/pages/user/return_goods/return_goods.wxml +++ b/packageF/pages/user/return_goods/return_goods.wxml diff --git a/pages/user/return_goods/return_goods.wxss b/packageF/pages/user/return_goods/return_goods.wxss index cc251e2..cc251e2 100644 --- a/pages/user/return_goods/return_goods.wxss +++ b/packageF/pages/user/return_goods/return_goods.wxss diff --git a/pages/user/return_goods_info/fil.wxs b/packageF/pages/user/return_goods_info/fil.wxs index cb12b88..cb12b88 100644 --- a/pages/user/return_goods_info/fil.wxs +++ b/packageF/pages/user/return_goods_info/fil.wxs diff --git a/pages/user/return_goods_info/return_goods_info.js b/packageF/pages/user/return_goods_info/return_goods_info.js index 80bdb89..8a75923 100644 --- a/pages/user/return_goods_info/return_goods_info.js +++ b/packageF/pages/user/return_goods_info/return_goods_info.js @@ -3,7 +3,7 @@ var e = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? func } : 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"); + o = t.request,rq=o, s = require("../../../../utils/util.js"); Page({ data: { diff --git a/pages/user/return_goods_info/return_goods_info.json b/packageF/pages/user/return_goods_info/return_goods_info.json index dbd6ba3..dbd6ba3 100644 --- a/pages/user/return_goods_info/return_goods_info.json +++ b/packageF/pages/user/return_goods_info/return_goods_info.json diff --git a/pages/user/return_goods_info/return_goods_info.wxml b/packageF/pages/user/return_goods_info/return_goods_info.wxml index 77d3c16..11657a4 100644 --- a/pages/user/return_goods_info/return_goods_info.wxml +++ b/packageF/pages/user/return_goods_info/return_goods_info.wxml @@ -1,4 +1,4 @@ - + diff --git a/pages/user/return_goods_info/return_goods_info.wxss b/packageF/pages/user/return_goods_info/return_goods_info.wxss index e5ac868..e5ac868 100644 --- a/pages/user/return_goods_info/return_goods_info.wxss +++ b/packageF/pages/user/return_goods_info/return_goods_info.wxss diff --git a/pages/user/return_goods_list/fil.wxs b/packageF/pages/user/return_goods_list/fil.wxs index 248e170..248e170 100644 --- a/pages/user/return_goods_list/fil.wxs +++ b/packageF/pages/user/return_goods_list/fil.wxs diff --git a/pages/user/return_goods_list/return_goods_list.js b/packageF/pages/user/return_goods_list/return_goods_list.js index b7add3a..82c56f4 100644 --- a/pages/user/return_goods_list/return_goods_list.js +++ b/packageF/pages/user/return_goods_list/return_goods_list.js @@ -2,8 +2,8 @@ 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"); +}(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: { diff --git a/pages/user/return_goods_list/return_goods_list.json b/packageF/pages/user/return_goods_list/return_goods_list.json index 07f1384..07f1384 100644 --- a/pages/user/return_goods_list/return_goods_list.json +++ b/packageF/pages/user/return_goods_list/return_goods_list.json diff --git a/pages/user/return_goods_list/return_goods_list.wxml b/packageF/pages/user/return_goods_list/return_goods_list.wxml index 0c4d801..fde9ef9 100644 --- a/pages/user/return_goods_list/return_goods_list.wxml +++ b/packageF/pages/user/return_goods_list/return_goods_list.wxml @@ -4,7 +4,7 @@ 订单号：{{item.order_sn}} - + 已申请成功，待售后审核中 处理中 退款完成 @@ -19,7 +19,7 @@ 申请时间：{{item.addTimeFommat}} - 进度查询 + 进度查询 取消申请 diff --git a/pages/user/return_goods_list/return_goods_list.wxss b/packageF/pages/user/return_goods_list/return_goods_list.wxss index 40fca37..40fca37 100644 --- a/pages/user/return_goods_list/return_goods_list.wxss +++ b/packageF/pages/user/return_goods_list/return_goods_list.wxss 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/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 @@ 删除订单 重新退款 - 退款详情 + 退款详情