diff --git a/app.json b/app.json index bacfe0c..ed7b276 100644 --- a/app.json +++ b/app.json @@ -31,16 +31,9 @@ "pages/team/team_ping/team_ping", "pages/cart/cart2_pt/cart2_pt", "pages/cart/cart_wk/cart_wk", - "pages/user/member/menber", - "pages/user/member/bring/bring", - "pages/user/member/bring/msg/msg", - "pages/user/member/account/account", - "pages/user/member/account_unable/account_unable", - "pages/user/member/cash_record/cash_record", - "pages/user/coupons/coupons", - "pages/user/integral/integral", - "pages/user/integral/query/index", - "pages/user/integral/msg/msg", + + + "pages/user/userqy/userqy", "pages/user/user_spsy/user_spsy", "pages/user/user_fw/user_fw", @@ -74,9 +67,7 @@ "pages/cart/cart2_inte/cart2_inte", "pages/giftpack/festival/festival", "pages/team/team_more/team_more", - "pages/user/deposit/deposit", - "pages/user/deposit/prepaid/msg/msg", - "pages/user/deposit/prepaid/prepaid", + "pages/distribution/distribution", "pages/template/index" ], @@ -189,7 +180,21 @@ "pages/AI-test-skin/select_photo/select_photo", "pages/AI-test-skin/fail_result/fail_result", "pages/AI-test-skin/success_result/success_result", - "pages/AI-test-skin/analyse/analyse" + "pages/AI-test-skin/analyse/analyse", + + "pages/user/coupons/coupons", + "pages/user/integral/integral", + "pages/user/integral/query/index", + "pages/user/integral/msg/msg", + "pages/user/deposit/deposit", + "pages/user/deposit/prepaid/msg/msg", + "pages/user/deposit/prepaid/prepaid", + "pages/user/member/menber", + "pages/user/member/bring/bring", + "pages/user/member/bring/msg/msg", + "pages/user/member/account/account", + "pages/user/member/account_unable/account_unable", + "pages/user/member/cash_record/cash_record" ] } diff --git a/packageA/pages/checkin/checkin.wxml b/packageA/pages/checkin/checkin.wxml index 82cc42f..4f8bb65 100644 --- a/packageA/pages/checkin/checkin.wxml +++ b/packageA/pages/checkin/checkin.wxml @@ -4,7 +4,7 @@ 规则 - + 我的积分 diff --git a/packageA/pages/quan_list/quan_list.js b/packageA/pages/quan_list/quan_list.js index 3187c68..a29af89 100644 --- a/packageA/pages/quan_list/quan_list.js +++ b/packageA/pages/quan_list/quan_list.js @@ -148,7 +148,7 @@ Page({ this.setData({show_success:0,get_item:null}) }, go_quan:function () { - getApp().goto("/pages/user/coupons/coupons"); + getApp().goto("/packageD/pages/user/coupons/coupons"); }, go_detail:function (e) { var index=e.currentTarget.dataset.ind; diff --git a/packageA/pages/quan_pro/quan_pro.js b/packageA/pages/quan_pro/quan_pro.js index 08981c6..b5650c2 100644 --- a/packageA/pages/quan_pro/quan_pro.js +++ b/packageA/pages/quan_pro/quan_pro.js @@ -132,7 +132,7 @@ Page({ this.setData({ show_success:0 }) - getApp().goto("/pages/user/coupons/coupons"); + getApp().goto("/packageD/pages/user/coupons/coupons"); }, close_show(){ diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js index f9370d2..33feeae 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.js +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js @@ -1279,7 +1279,7 @@ Page({ }; switch(type) { case 1: { - url = '/pages/user/integral/integral'; + url = '/packageD/pages/user/integral/integral'; break; }; case 2: { @@ -1287,7 +1287,7 @@ Page({ break; }; case 3: { - url = '/pages/user/coupons/coupons'; + url = '/packageD/pages/user/coupons/coupons'; break; }; case 4: { diff --git a/pages/user/coupons/coupons.js b/packageD/pages/user/coupons/coupons.js index d597009..24bd321 100644 --- a/pages/user/coupons/coupons.js +++ b/packageD/pages/user/coupons/coupons.js @@ -2,14 +2,14 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../utils/util.js"), + i = require("../../../../utils/util.js"), ut = i, - s = require("../../../utils/common.js"); -var regeneratorRuntime = require('../../../utils/runtime.js'); + s = require("../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../utils/runtime.js'); const { barcode, qrcode -} = require('../../../utils/index.js'); +} = require('../../../../utils/index.js'); let _this = null; Page({ diff --git a/pages/user/coupons/coupons.json b/packageD/pages/user/coupons/coupons.json index 8851a02..8851a02 100644 --- a/pages/user/coupons/coupons.json +++ b/packageD/pages/user/coupons/coupons.json diff --git a/pages/user/coupons/coupons.wxml b/packageD/pages/user/coupons/coupons.wxml index a742190..a742190 100644 --- a/pages/user/coupons/coupons.wxml +++ b/packageD/pages/user/coupons/coupons.wxml diff --git a/pages/user/coupons/coupons.wxss b/packageD/pages/user/coupons/coupons.wxss index 8d98860..8d98860 100644 --- a/pages/user/coupons/coupons.wxss +++ b/packageD/pages/user/coupons/coupons.wxss diff --git a/pages/user/coupons/filter.wxs b/packageD/pages/user/coupons/filter.wxs index 4043c1f..4043c1f 100644 --- a/pages/user/coupons/filter.wxs +++ b/packageD/pages/user/coupons/filter.wxs diff --git a/pages/user/deposit/deposit.js b/packageD/pages/user/deposit/deposit.js index 64ebd7e..78c8c9b 100644 --- a/pages/user/deposit/deposit.js +++ b/packageD/pages/user/deposit/deposit.js @@ -2,10 +2,10 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../utils/util.js"), + i = require("../../../../utils/util.js"), ut = i, - s = require("../../../utils/common.js"); -var regeneratorRuntime = require('../../../utils/runtime.js'); + s = require("../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../utils/runtime.js'); Page({ data:{ yucun_money:0, diff --git a/pages/user/deposit/deposit.json b/packageD/pages/user/deposit/deposit.json index 9e26dfe..9e26dfe 100644 --- a/pages/user/deposit/deposit.json +++ b/packageD/pages/user/deposit/deposit.json diff --git a/pages/user/deposit/deposit.wxml b/packageD/pages/user/deposit/deposit.wxml index 2fdc92f..2fdc92f 100644 --- a/pages/user/deposit/deposit.wxml +++ b/packageD/pages/user/deposit/deposit.wxml diff --git a/pages/user/deposit/deposit.wxss b/packageD/pages/user/deposit/deposit.wxss index 8d896b4..8d896b4 100644 --- a/pages/user/deposit/deposit.wxss +++ b/packageD/pages/user/deposit/deposit.wxss diff --git a/pages/user/deposit/prepaid/fil.wxs b/packageD/pages/user/deposit/prepaid/fil.wxs index 20a9079..20a9079 100644 --- a/pages/user/deposit/prepaid/fil.wxs +++ b/packageD/pages/user/deposit/prepaid/fil.wxs diff --git a/pages/user/deposit/prepaid/msg/msg.js b/packageD/pages/user/deposit/prepaid/msg/msg.js index 99706f5..99706f5 100644 --- a/pages/user/deposit/prepaid/msg/msg.js +++ b/packageD/pages/user/deposit/prepaid/msg/msg.js diff --git a/pages/user/deposit/prepaid/msg/msg.json b/packageD/pages/user/deposit/prepaid/msg/msg.json index 8835af0..8835af0 100644 --- a/pages/user/deposit/prepaid/msg/msg.json +++ b/packageD/pages/user/deposit/prepaid/msg/msg.json diff --git a/pages/user/deposit/prepaid/msg/msg.wxml b/packageD/pages/user/deposit/prepaid/msg/msg.wxml index 819e186..819e186 100644 --- a/pages/user/deposit/prepaid/msg/msg.wxml +++ b/packageD/pages/user/deposit/prepaid/msg/msg.wxml diff --git a/pages/user/deposit/prepaid/msg/msg.wxss b/packageD/pages/user/deposit/prepaid/msg/msg.wxss index 5e8634a..5e8634a 100644 --- a/pages/user/deposit/prepaid/msg/msg.wxss +++ b/packageD/pages/user/deposit/prepaid/msg/msg.wxss diff --git a/pages/user/deposit/prepaid/prepaid.js b/packageD/pages/user/deposit/prepaid/prepaid.js index 7de3b9b..b646839 100644 --- a/pages/user/deposit/prepaid/prepaid.js +++ b/packageD/pages/user/deposit/prepaid/prepaid.js @@ -2,10 +2,10 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../../utils/util.js"), + i = require("../../../../../utils/util.js"), ut = i, - s = require("../../../../utils/common.js"); -var regeneratorRuntime = require('../../../../utils/runtime.js'); + s = require("../../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../../utils/runtime.js'); Page({ data: { iurl: o.imghost, diff --git a/pages/user/deposit/prepaid/prepaid.json b/packageD/pages/user/deposit/prepaid/prepaid.json index 8835af0..8835af0 100644 --- a/pages/user/deposit/prepaid/prepaid.json +++ b/packageD/pages/user/deposit/prepaid/prepaid.json diff --git a/pages/user/deposit/prepaid/prepaid.wxml b/packageD/pages/user/deposit/prepaid/prepaid.wxml index b0f0384..b0f0384 100644 --- a/pages/user/deposit/prepaid/prepaid.wxml +++ b/packageD/pages/user/deposit/prepaid/prepaid.wxml diff --git a/pages/user/deposit/prepaid/prepaid.wxss b/packageD/pages/user/deposit/prepaid/prepaid.wxss index d027d41..d027d41 100644 --- a/pages/user/deposit/prepaid/prepaid.wxss +++ b/packageD/pages/user/deposit/prepaid/prepaid.wxss diff --git a/pages/user/integral/filter.wxs b/packageD/pages/user/integral/filter.wxs index cb724f7..cb724f7 100644 --- a/pages/user/integral/filter.wxs +++ b/packageD/pages/user/integral/filter.wxs diff --git a/pages/user/integral/integral.js b/packageD/pages/user/integral/integral.js index 23f0272..a65f460 100644 --- a/pages/user/integral/integral.js +++ b/packageD/pages/user/integral/integral.js @@ -3,9 +3,9 @@ var e = function (e) { return e && e.__esModule ? e : { default: e }; -}(require("../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../utils/util.js"), ut = i, b = require("../../../app.js"), app = b, s = require("../../../utils/common.js"), n = new e.default(); -var regeneratorRuntime = require('../../../utils/runtime.js'); +}(require("../../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o, + i = require("../../../../utils/util.js"), ut = i, b = require("../../../../app.js"), app = b, s = require("../../../../utils/common.js"), n = new e.default(); +var regeneratorRuntime = require('../../../../utils/runtime.js'); Page({ /** diff --git a/pages/user/integral/integral.json b/packageD/pages/user/integral/integral.json index 8835af0..8835af0 100644 --- a/pages/user/integral/integral.json +++ b/packageD/pages/user/integral/integral.json diff --git a/pages/user/integral/integral.wxml b/packageD/pages/user/integral/integral.wxml index e980d75..e980d75 100644 --- a/pages/user/integral/integral.wxml +++ b/packageD/pages/user/integral/integral.wxml diff --git a/pages/user/integral/integral.wxss b/packageD/pages/user/integral/integral.wxss index 9fec40e..9fec40e 100644 --- a/pages/user/integral/integral.wxss +++ b/packageD/pages/user/integral/integral.wxss diff --git a/pages/user/integral/msg/msg.js b/packageD/pages/user/integral/msg/msg.js index 8751640..8751640 100644 --- a/pages/user/integral/msg/msg.js +++ b/packageD/pages/user/integral/msg/msg.js diff --git a/pages/user/integral/msg/msg.json b/packageD/pages/user/integral/msg/msg.json index 8835af0..8835af0 100644 --- a/pages/user/integral/msg/msg.json +++ b/packageD/pages/user/integral/msg/msg.json diff --git a/pages/user/integral/msg/msg.wxml b/packageD/pages/user/integral/msg/msg.wxml index 819e186..819e186 100644 --- a/pages/user/integral/msg/msg.wxml +++ b/packageD/pages/user/integral/msg/msg.wxml diff --git a/pages/user/integral/msg/msg.wxss b/packageD/pages/user/integral/msg/msg.wxss index 5e8634a..5e8634a 100644 --- a/pages/user/integral/msg/msg.wxss +++ b/packageD/pages/user/integral/msg/msg.wxss diff --git a/pages/user/integral/query/index.js b/packageD/pages/user/integral/query/index.js index db4d829..67c3a2d 100644 --- a/pages/user/integral/query/index.js +++ b/packageD/pages/user/integral/query/index.js @@ -2,10 +2,10 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../../utils/util.js"), + i = require("../../../../../utils/util.js"), ut = i, - s = require("../../../../utils/common.js"); -var regeneratorRuntime = require('../../../../utils/runtime.js'); + s = require("../../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../../utils/runtime.js'); Page({ data: { diff --git a/pages/user/integral/query/index.json b/packageD/pages/user/integral/query/index.json index 9e26dfe..9e26dfe 100644 --- a/pages/user/integral/query/index.json +++ b/packageD/pages/user/integral/query/index.json diff --git a/pages/user/integral/query/index.wxml b/packageD/pages/user/integral/query/index.wxml index 9f291dc..9f291dc 100644 --- a/pages/user/integral/query/index.wxml +++ b/packageD/pages/user/integral/query/index.wxml diff --git a/pages/user/integral/query/index.wxss b/packageD/pages/user/integral/query/index.wxss index 55d080a..55d080a 100644 --- a/pages/user/integral/query/index.wxss +++ b/packageD/pages/user/integral/query/index.wxss diff --git a/pages/user/member/account/account.js b/packageD/pages/user/member/account/account.js index a1eee9d..79147dc 100644 --- a/pages/user/member/account/account.js +++ b/packageD/pages/user/member/account/account.js @@ -2,10 +2,10 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../../utils/util.js"), + i = require("../../../../../utils/util.js"), ut = i, - s = require("../../../../utils/common.js"); -var regeneratorRuntime = require('../../../../utils/runtime.js'); + s = require("../../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../../utils/runtime.js'); Page({ data: { details:[],//数据 diff --git a/pages/user/member/account/account.json b/packageD/pages/user/member/account/account.json index 9e26dfe..9e26dfe 100644 --- a/pages/user/member/account/account.json +++ b/packageD/pages/user/member/account/account.json diff --git a/pages/user/member/account/account.wxml b/packageD/pages/user/member/account/account.wxml index 86ee8be..86ee8be 100644 --- a/pages/user/member/account/account.wxml +++ b/packageD/pages/user/member/account/account.wxml diff --git a/pages/user/member/account/account.wxss b/packageD/pages/user/member/account/account.wxss index 376eee0..376eee0 100644 --- a/pages/user/member/account/account.wxss +++ b/packageD/pages/user/member/account/account.wxss diff --git a/pages/user/member/account/index.wxs b/packageD/pages/user/member/account/index.wxs index e247f84..e247f84 100644 --- a/pages/user/member/account/index.wxs +++ b/packageD/pages/user/member/account/index.wxs diff --git a/pages/user/member/account_unable/account_unable.js b/packageD/pages/user/member/account_unable/account_unable.js index 1943da9..58d0728 100644 --- a/pages/user/member/account_unable/account_unable.js +++ b/packageD/pages/user/member/account_unable/account_unable.js @@ -2,10 +2,10 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../../utils/util.js"), + i = require("../../../../../utils/util.js"), ut = i, - s = require("../../../../utils/common.js"); -var regeneratorRuntime = require('../../../../utils/runtime.js'); + s = require("../../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../../utils/runtime.js'); Page({ data: { details: [],//数据 diff --git a/pages/user/member/account_unable/account_unable.json b/packageD/pages/user/member/account_unable/account_unable.json index 8835af0..8835af0 100644 --- a/pages/user/member/account_unable/account_unable.json +++ b/packageD/pages/user/member/account_unable/account_unable.json diff --git a/pages/user/member/account_unable/account_unable.wxml b/packageD/pages/user/member/account_unable/account_unable.wxml index cb52919..cb52919 100644 --- a/pages/user/member/account_unable/account_unable.wxml +++ b/packageD/pages/user/member/account_unable/account_unable.wxml diff --git a/pages/user/member/account_unable/account_unable.wxss b/packageD/pages/user/member/account_unable/account_unable.wxss index 3727f39..3727f39 100644 --- a/pages/user/member/account_unable/account_unable.wxss +++ b/packageD/pages/user/member/account_unable/account_unable.wxss diff --git a/pages/user/member/account_unable/index.wxs b/packageD/pages/user/member/account_unable/index.wxs index e247f84..e247f84 100644 --- a/pages/user/member/account_unable/index.wxs +++ b/packageD/pages/user/member/account_unable/index.wxs diff --git a/pages/user/member/bring/bring.js b/packageD/pages/user/member/bring/bring.js index 8e1bb94..ae7c091 100644 --- a/pages/user/member/bring/bring.js +++ b/packageD/pages/user/member/bring/bring.js @@ -2,10 +2,10 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../../utils/util.js"), + i = require("../../../../../utils/util.js"), ut = i, - s = require("../../../../utils/common.js"); -var regeneratorRuntime = require('../../../../utils/runtime.js'); + s = require("../../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../../utils/runtime.js'); var oo = t.globalData.setting; Page({ /** diff --git a/pages/user/member/bring/bring.json b/packageD/pages/user/member/bring/bring.json index 9e26dfe..9e26dfe 100644 --- a/pages/user/member/bring/bring.json +++ b/packageD/pages/user/member/bring/bring.json diff --git a/pages/user/member/bring/bring.wxml b/packageD/pages/user/member/bring/bring.wxml index 870889f..870889f 100644 --- a/pages/user/member/bring/bring.wxml +++ b/packageD/pages/user/member/bring/bring.wxml diff --git a/pages/user/member/bring/bring.wxss b/packageD/pages/user/member/bring/bring.wxss index 3497834..3497834 100644 --- a/pages/user/member/bring/bring.wxss +++ b/packageD/pages/user/member/bring/bring.wxss diff --git a/pages/user/member/bring/msg/msg.js b/packageD/pages/user/member/bring/msg/msg.js index 096e2ee..096e2ee 100644 --- a/pages/user/member/bring/msg/msg.js +++ b/packageD/pages/user/member/bring/msg/msg.js diff --git a/pages/user/member/bring/msg/msg.json b/packageD/pages/user/member/bring/msg/msg.json index 8835af0..8835af0 100644 --- a/pages/user/member/bring/msg/msg.json +++ b/packageD/pages/user/member/bring/msg/msg.json diff --git a/pages/user/member/bring/msg/msg.wxml b/packageD/pages/user/member/bring/msg/msg.wxml index ac650ae..ac650ae 100644 --- a/pages/user/member/bring/msg/msg.wxml +++ b/packageD/pages/user/member/bring/msg/msg.wxml diff --git a/pages/user/member/bring/msg/msg.wxss b/packageD/pages/user/member/bring/msg/msg.wxss index 3aab5b6..3aab5b6 100644 --- a/pages/user/member/bring/msg/msg.wxss +++ b/packageD/pages/user/member/bring/msg/msg.wxss diff --git a/pages/user/member/cash_record/cash_record.js b/packageD/pages/user/member/cash_record/cash_record.js index c7aa73f..21ea28e 100644 --- a/pages/user/member/cash_record/cash_record.js +++ b/packageD/pages/user/member/cash_record/cash_record.js @@ -2,10 +2,10 @@ var t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../../utils/util.js"), + i = require("../../../../../utils/util.js"), ut = i, - s = require("../../../../utils/common.js"); -var regeneratorRuntime = require('../../../../utils/runtime.js'); + s = require("../../../../../utils/common.js"); +var regeneratorRuntime = require('../../../../../utils/runtime.js'); Page({ data: { parameter: false,//控制有没有数据的时候 diff --git a/pages/user/member/cash_record/cash_record.json b/packageD/pages/user/member/cash_record/cash_record.json index 9e26dfe..9e26dfe 100644 --- a/pages/user/member/cash_record/cash_record.json +++ b/packageD/pages/user/member/cash_record/cash_record.json diff --git a/pages/user/member/cash_record/cash_record.wxml b/packageD/pages/user/member/cash_record/cash_record.wxml index 9e5eae0..9e5eae0 100644 --- a/pages/user/member/cash_record/cash_record.wxml +++ b/packageD/pages/user/member/cash_record/cash_record.wxml diff --git a/pages/user/member/cash_record/cash_record.wxss b/packageD/pages/user/member/cash_record/cash_record.wxss index 51fcf34..51fcf34 100644 --- a/pages/user/member/cash_record/cash_record.wxss +++ b/packageD/pages/user/member/cash_record/cash_record.wxss diff --git a/pages/user/member/cash_record/index.wxs b/packageD/pages/user/member/cash_record/index.wxs index e247f84..e247f84 100644 --- a/pages/user/member/cash_record/index.wxs +++ b/packageD/pages/user/member/cash_record/index.wxs diff --git a/pages/user/member/filter.wxs b/packageD/pages/user/member/filter.wxs index c352e51..c352e51 100644 --- a/pages/user/member/filter.wxs +++ b/packageD/pages/user/member/filter.wxs diff --git a/pages/user/member/menber.js b/packageD/pages/user/member/menber.js index a5fa887..038452d 100644 --- a/pages/user/member/menber.js +++ b/packageD/pages/user/member/menber.js @@ -2,9 +2,9 @@ var e = function (e) { return e && e.__esModule ? e : { default: e }; -}(require("../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o, - i = require("../../../utils/util.js"), ut = i, s = require("../../../utils/common.js"), n = new e.default(); -var regeneratorRuntime = require('../../../utils/runtime.js'); +}(require("../../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o, + i = require("../../../../utils/util.js"), ut = i, s = require("../../../../utils/common.js"), n = new e.default(); +var regeneratorRuntime = require('../../../../utils/runtime.js'); Page({ /** * 页面的初始数据 diff --git a/pages/user/member/menber.json b/packageD/pages/user/member/menber.json index 9e26dfe..9e26dfe 100644 --- a/pages/user/member/menber.json +++ b/packageD/pages/user/member/menber.json diff --git a/pages/user/member/menber.wxml b/packageD/pages/user/member/menber.wxml index 67fa3c5..67fa3c5 100644 --- a/pages/user/member/menber.wxml +++ b/packageD/pages/user/member/menber.wxml diff --git a/pages/user/member/menber.wxss b/packageD/pages/user/member/menber.wxss index 5e086a0..5e086a0 100644 --- a/pages/user/member/menber.wxss +++ b/packageD/pages/user/member/menber.wxss diff --git a/pages/distribution/distribution.wxml b/pages/distribution/distribution.wxml index 1372fc9..7a53c29 100644 --- a/pages/distribution/distribution.wxml +++ b/pages/distribution/distribution.wxml @@ -14,7 +14,7 @@ 可提现金额 - {{filter.show_default(data.liudong_money)}} + {{filter.show_default(data.liudong_money)}} diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml index 560d3cc..f4d613e 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.wxml +++ b/pages/giftpack/giftpacklist/giftpacklist.wxml @@ -100,7 +100,7 @@ --> - + diff --git a/pages/user/assistance/giftpacklist.wxml b/pages/user/assistance/giftpacklist.wxml index 53d5937..831da68 100644 --- a/pages/user/assistance/giftpacklist.wxml +++ b/pages/user/assistance/giftpacklist.wxml @@ -79,7 +79,7 @@ - + diff --git a/pages/user/grow_value/grow_value.js b/pages/user/grow_value/grow_value.js index 504a472..9e6556a 100644 --- a/pages/user/grow_value/grow_value.js +++ b/pages/user/grow_value/grow_value.js @@ -182,7 +182,7 @@ Page({ var index=e.currentTarget.dataset.ind; switch (index) { case "0": getApp().goto("/pages/index/index/index");break; - case "1": getApp().goto("/pages/user/coupons/coupons"); break; + case "1": getApp().goto("/packageD/pages/user/coupons/coupons"); break; case "2": getApp().goto("/pages/user/userqy/userqy"); break; } }, diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 23af5a3..33095ba 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -529,14 +529,14 @@ Page({ deposit: function() { if (!this.data.userInfo) return false; wx.navigateTo({ - url: '../deposit/deposit', + url: '/packageD/pages/user/deposit/deposit', }) }, //--跳转到余额页面-- balance: function() { if (!this.data.userInfo) return false; wx.navigateTo({ - url: '../member/menber', + url: '/packageD/pages/user/member/menber', }) }, //--跳转到优惠券-- @@ -545,14 +545,14 @@ Page({ if (!this.data.userInfo) return false; // th.sendsm(); wx.navigateTo({ - url: '../coupons/coupons', + url: '/packageD/pages/user/coupons/coupons', }) }, //--跳转到积分-- integral: function() { if (!this.data.userInfo) return false; wx.navigateTo({ - url: '../integral/integral', + url: '/packageD/pages/user/integral/integral', }) }, //--跳到绑定页面--