From 60b85d17e857b359a3719c7583066ffc0e772e4c Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Wed, 14 Sep 2022 10:33:59 +0800 Subject: [PATCH] 代码分包优化 --- app.json | 4 ++-- packageE/pages/user/Detailed/Detailed.js | 518 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageE/pages/user/Detailed/Detailed.json | 6 ++++++ packageE/pages/user/Detailed/Detailed.wxml | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageE/pages/user/Detailed/Detailed.wxss | 304 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/user/Detailed/Detailed.js | 518 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/user/Detailed/Detailed.json | 6 ------ pages/user/Detailed/Detailed.wxml | 89 ----------------------------------------------------------------------------------------- pages/user/Detailed/Detailed.wxss | 304 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/user/cardinfo/cardinfo.js | 2 +- pages/user/cardinfo/cardinfo.wxml | 3 +-- utils/auth.js | 2 +- 12 files changed, 922 insertions(+), 923 deletions(-) create mode 100644 packageE/pages/user/Detailed/Detailed.js create mode 100644 packageE/pages/user/Detailed/Detailed.json create mode 100644 packageE/pages/user/Detailed/Detailed.wxml create mode 100644 packageE/pages/user/Detailed/Detailed.wxss delete mode 100644 pages/user/Detailed/Detailed.js delete mode 100644 pages/user/Detailed/Detailed.json delete mode 100644 pages/user/Detailed/Detailed.wxml delete mode 100644 pages/user/Detailed/Detailed.wxss diff --git a/app.json b/app.json index 822686e..f9d7122 100644 --- a/app.json +++ b/app.json @@ -38,7 +38,6 @@ "pages/payment/pay_success/pay_success", "pages/user/plus/plus", "pages/user/cardinfo/cardinfo", - "pages/user/Detailed/Detailed", "pages/user/my_service/appment_main", "pages/user/my_service/i_service", "pages/user/my_service/cosmetology_list", @@ -208,7 +207,8 @@ "root": "packageE/", "name": "pack5", "pages": [ - "pages/togoin/togoin" + "pages/togoin/togoin", + "pages/user/Detailed/Detailed" ] } diff --git a/packageE/pages/user/Detailed/Detailed.js b/packageE/pages/user/Detailed/Detailed.js new file mode 100644 index 0000000..3109a8b --- /dev/null +++ b/packageE/pages/user/Detailed/Detailed.js @@ -0,0 +1,518 @@ +var t = getApp(), + r = t.globalData, + a = t.request, + o = t.globalData.setting, + os = o, + i = require("../../../../utils/util.js"), + ut = i, + s = require("../../../../utils/common.js"); + +Page({ + /** + * 页面的初始数据 + */ + data: { + url: o.imghost, + arrayDetailed: [],//明细数组 + page: 1, + pageSize: 20, + isDetailed: 0, + total: 0, + ismore: 0,//数据是否加载完毕 + screenWidth:0, + + head_pic:"",//会员头像 + img_money:"",//缓存VIP的图片 + img_Ancrown:"",//会员权益 + img_Identification:"",//缓存标识的图片 + img_square:"",//缓存方块的图片 + privilege_o:"",//卡的勋章图 + bas_ming:"", //卡的图片 + big_card:null, //最大卡的信息 + + imagePath:"", //分享的生成图片 + + canvasHidden:true, + isBind:true, + isBinds:true, + + input_val:null, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + var ee=this; + var img_money = this.data.url + "/miniapp/images/plus/share/money.png"; + var img_Ancrown = this.data.url + "/miniapp/images/plus/share/Ancrown.png"; + var img_Identification = this.data.url + "/miniapp/images/plus/share/Identification.png"; + var img_square = this.data.url + "/miniapp/images/plus/share/square.png"; + var privilege_o = this.data.url + "/miniapp/images/plus/share/privilege_o.png"; + var user=getApp().globalData.userInfo; + //--获取用户设备信息，屏幕宽度-- + wx.getSystemInfo({ + success: res => { + ee.data.screenWidth=res.screenWidth; + } + }) + + //--------------------缓存vip价格的图片--------------- + wx.getImageInfo({ + src:img_money, + success: function (res) { + //回调写法 + var img_money = res.path; + ee.setData({ img_money: img_money}); + } + }) + //--------------------缓存权益的图片--------------- + wx.getImageInfo({ + src: img_Ancrown, + success: function (res) { + //回调写法 + var img_Ancrown = res.path; + ee.setData({ img_Ancrown: img_Ancrown }); + } + }) + //--------------------缓存标识的图片--------------- + wx.getImageInfo({ + src: img_Identification, + success: function (res) { + //回调写法 + var img_Identification = res.path; + ee.setData({ img_Identification: img_Identification }); + } + }) + + //--------------------卡的勋章--------------- + wx.getImageInfo({ + src: privilege_o, + success: function (res) { + //回调写法 + var privilege_o = res.path; + ee.setData({ privilege_o: privilege_o }); + } + }) + + //--------------------方块图--------------- + wx.getImageInfo({ + src: img_square, + success: function (res) { + //回调写法 + var img_square = res.path; + ee.setData({ img_square: img_square}); + } + }) + + //-----------获取最大值的卡-------------- + ee.getPlusCardType(); + + }, + + selectDetailed: function() { + var th = this, e = th; + var r_data={ + storeId: o.stoid, + userId: r.user_id, + page: th.data.page, + pageSize: th.data.pageSize + }; + + if(th.data.datet!="" && th.data.datet){ + r_data.Sdate=th.data.datet; + } + if(th.data.dates!="" && th.data.dates){ + r_data.Edate=th.data.dates; + } + if(th.data.input_val!="" && th.data.input_val){ + r_data.MobileTel=th.data.input_val; + } + + getApp().request.promiseGet("/api/weshop/plus/vip/mem/referee/page", { + data:r_data + }).then(res => { + + setTimeout(function () { + th.setData({isDetailed: 1 }); + },300) + if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0) { + th.data.page++;//当前页数+1 + var arr1 = th.data.arrayDetailed;//获取明细数组 + var arr2 = res.data.data.pageData;//获取当前查询数据 + if(!arr1) arr1=[]; + + var arr3 = [...arr1, ...arr2];//把当前查询数组拼接到原本数组后面 + var ismore = 0; + if (arr3.length == res.data.data.total) ismore = 1 //数据已加载完判断 + th.setData({ + arrayDetailed: arr3, + total: res.data.data.total, + ismore: ismore, + }) + + + } + }) + + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { + this.selectDetailed(); + }, + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function() { + if (this.data.total <= this.data.pageSize) return; + if (this.data.ismore) { + t.my_warnning("加载完啦!", 0, this); + return + }; + this.selectDetailed(); + }, + + + saveImageToPhotosAlbum: function () { + if (this.data.imagePath != "") { + getApp().pre_img(this.data.imagePath); + return; + } + + this.data.is_loading=1; + wx.showLoading({ title: '生成中...',}) + this.setData({ canvasHidden: false }) + + var th = this; + + //设置画板显示，才能开始绘图 + var card_ming=th.data.bas_ming;//卡的图片 + var big_card= th.data.big_card;//获取最大的卡 + var user_head = th.data.head_pic;//会员头像 + var img_money = th.data.img_money;//缓存vip的价格 + var img_Ancrown = th.data.img_Ancrown;//会员权益的图片 + var img_Identification = th.data.img_Identification;//会员标识 + var privilege_o = th.data.privilege_o;//勋章图片 + var img_square=th.data.img_square; + var app = getApp(); + var user=app.globalData.userInfo; + var unit = th.data.screenWidth / 750 * 1.35; + var scene = getApp().globalData.user_id; + var nickname = user.nickname; + + //---二微码--- + var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + + os.stoid + "?sceneValue=" + scene + "&pageValue=pages/user/index/index"; + + wx.getImageInfo({ + src: path3, + success: function (res) { + th.get_head_temp(function(){ + var vpath=res.path; + + //开启画布 + const ctx = wx.createCanvasContext('myCanvas'); + //先画背景 + ctx.drawImage("../../../../images/share/mackground.png", 0, 0, 554 * unit, 899 * unit); + ctx.setFontSize(24 * unit); + ctx.setFillStyle("rgb(0,0,0)"); + ctx.fillText(nickname, 152 * unit, 76 * unit); + var width = 24 * nickname.length * unit + 2 * unit; + var tj_path = "../../../../images/share/q_tj.png"; + ctx.drawImage(tj_path, 152 * unit + width, 54 * unit, 95 * unit, 30 * unit); + ctx.setFontSize(18 * unit); + ctx.setLineJoin('round'); //交点设置成圆角 + ctx.setFillStyle("rgb(255,255,255)"); + // ctx.fillText("强烈推荐", 265 * unit, 72 * unit); + ctx.fillText('强烈推荐', 149 * unit + width + 15 * unit, 76 * unit); + ctx.setStrokeStyle("rgb(255,255,255)"); + ctx.setLineDash([5 * unit, 5 * unit], 5 * unit); + ctx.beginPath(); + ctx.moveTo(0, 125 * unit); + ctx.lineTo(554 * unit, 125 * unit); + ctx.stroke(); + + var x = 55 * unit, y = 165 * unit,w = 444 * unit, h = 220 * unit,r = 14 * unit; + ut.draw_randon_rect(ctx,x,y,r,w,h); + ctx.clip(); //一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 + ctx.drawImage(card_ming, x, y, 444 * unit, 220 * unit); // 推进去图片 + ctx.restore(); //恢复之前保存的绘图上下文 恢复之前保存的绘图上下午即状态 可以继续绘制 + + ctx.beginPath(); + // 卡图片 + // ctx.drawImage("../../../images/plus/share/one.jpg", 55 * unit, 165 * unit, 444 * unit, 220 * unit,); + ctx.setFontSize(26 * unit); + ctx.setFillStyle('rgb(218,194,169)'); + ctx.fillText(big_card.CardName, 80 * unit, 215 * unit); + ctx.setFontSize(18 * unit); + ctx.setFillStyle('rgb(218,194,169)'); + ctx.fillText("开通plus会员仅" + big_card.CardFee+"元", 80 * unit, 240 * unit); + + //zz ctx.drawImage(privilege_o, 80 * unit, 343 * unit, 20 * unit, 20 * unit); + + ctx.setFontSize(14 * unit); + ctx.setFillStyle('rgb(218,194,169)'); + ctx.fillText("按去年用户消费计算，开卡后一年预计省￥3031", 85 * unit, 360 * unit); + + ctx.rect(70 * unit, 425 * unit, 182 * unit, 1 * unit); + ctx.setFillStyle('rgb(218,194,169)'); + ctx.fill(); + + ctx.drawImage(img_square, 267 * unit, 420 * unit, 13 * unit, 13 * unit); + + ctx.beginPath(); + ctx.rect(295 * unit, 425 * unit, 182 * unit, 1 * unit); + ctx.setFillStyle('rgb(218,194,169)'); + ctx.fill(); + + ctx.drawImage(img_square, 80 * unit, 470 * unit, 10 * unit, 10 * unit); + ctx.setFontSize(24 * unit); + ctx.setFillStyle("rgb(198,165,126)"); + ctx.fillText("PLUS会员权益", 100 * unit, 475 * unit); + + ctx.setFontSize(20 * unit); + ctx.setFillStyle("rgb(198,165,126)"); + ctx.fillText("PLUS会员专属权益", 100 * unit, 505 * unit); + ctx.drawImage(img_Ancrown, 355 * unit, 440 * unit, 65 * unit, 65 * unit); + + ctx.rect(85 * unit, 530 * unit, 375 * unit, 1 * unit) + ctx.setFillStyle('rgb(218,194,169)') + ctx.fill(); + + ctx.drawImage(img_square, 80 * unit, 575 * unit, 10 * unit, 10 * unit); + ctx.setFontSize(24 * unit); + ctx.setFillStyle("rgb(198,165,126)"); + ctx.fillText("PLUS会员标识", 100 * unit, 580 * unit); + + ctx.setFontSize(20 * unit); + ctx.setFillStyle("rgb(198,165,126)"); + ctx.fillText("彰显尊贵身份的象征", 100 * unit, 610 * unit); + ctx.drawImage(img_Identification, 355 * unit, 548 * unit, 65 * unit, 65 * unit); + + ctx.rect(85 * unit, 635 * unit, 375 * unit, 1 * unit); + ctx.setFillStyle('rgb(218,194,169)'); + ctx.fill(); + + ctx.drawImage(img_square, 80 * unit, 695 * unit, 10 * unit, 10 * unit); + ctx.setFontSize(24 * unit); + ctx.setFillStyle("rgb(198,165,126)"); + ctx.fillText("PLUS会员价格", 100 * unit, 695 * unit); + + ctx.setFontSize(20 * unit); + ctx.setFillStyle("rgb(198,165,126)"); + ctx.fillText("享受专属会员超低价", 100 * unit, 725 * unit); + ctx.drawImage(img_money, 355 * unit, 660 * unit, 65 * unit, 65 * unit); + + ctx.rect(85 * unit, 750 * unit, 375 * unit, 1 * unit) + ctx.setFillStyle('rgb(218,194,169)') + ctx.fill(); + + ctx.drawImage(vpath, 100 * unit, 780 * unit, 110 * unit, 110 * unit); + + ctx.setFontSize(20 * unit); + ctx.setFillStyle("#000"); + ctx.fillText("解锁新权益 精彩享不停", 230 * unit, 825 * unit); + + ctx.setFontSize(20 * unit); + ctx.setFillStyle("#000"); + ctx.fillText("长按识别二维码,立即开通!", 230 * unit, 865 * unit); + + //---绘制圆形要放在最后,头像---- + ctx.save(); + ctx.beginPath(); + var h_x = 60 * unit; + var h_y = 24 * unit; + var h_r = 40 * unit; + var cx = h_x + h_r; + var cy = h_y + h_r; + ctx.arc(cx, cy, h_r, 0, Math.PI * 2, false); + ctx.closePath(); + ctx.fill(); + ctx.clip(); + ctx.drawImage(th.data.head_pic, h_x, h_y, h_r * 2, h_r * 2); + ctx.restore(); + + x = 345 * unit, y = 190 * unit, + w = 105 * unit, h = 30 * unit, + r = 14 * unit; + ut.draw_randon_rect(ctx,x,y,r,w,h); + ctx.setFontSize(18 * unit); + ctx.setFillStyle("#000"); + ctx.fillText("立即开通", 362 * unit, 212 * unit); + + //--绘制图片--- + ctx.draw(false, + function(){ + setTimeout(function(){ + wx.canvasToTempFilePath({ + x: 0, + y: 0, + width: 750, + height: 930, + destWidth: 1.2 * 750 * 750 / th.data.screenWidth, + destHeight: 1.2 * 1217 * 750 / th.data.screenWidth, + canvasId: 'myCanvas', + success: function (res) { + wx.hideLoading();//关闭生成中的方法 + th.data.is_loading = 0; + console.log("生成的海报"); + console.log(res.tempFilePath); + var tempFilePath = res.tempFilePath; + th.setData({ + imagePath: tempFilePath, + maskHidden: false, + canvasHidden: true + }); + + getApp().pre_img(res.tempFilePath); + if (!res.tempFilePath) { + wx.showModal({ + title: '提示', + content: '图片绘制中，请稍后重试', + showCancel: false + }) + } + + } + + }) + },300) + }) + }) + + } + + }) + + }, + + //--获取头像的本地缓存,回调写法-- + get_head_temp: function (tt) { + var ee = this; + if (ee.data.head_pic) { + tt();return false; + } + //---获取分享图片的本地地址,头像和商品图片---- + var path2 = getApp().globalData.userInfo.head_pic; + if (path2 == "") { + ee.data.head_pic = "../../../images/share/hui_hear_pic.png";tt(); + } else { + path2 = path2.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); + path2 = path2.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); + wx.getImageInfo({ + src: path2, + success: function (res) { + //res.path是网络图片的本地地址 + ee.data.head_pic= res.path;tt(); + }, + fail: function (res) { + ee.data.head_pic= "../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的 + tt(); + } + }); + } + }, + + //--- 获取卡类列表 --- + getPlusCardType: function (e) { + var storid = o.stoid; + var th = this; + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { + var plusCard = res.data.data; + var arr = [1219, 2089, 3031]; + var new_arr = new Array(); + for (var i = 0; i < plusCard.length; i++) { + //plusCard[i].free=arr[i]; + var item = {"fee": plusCard[i].CardFee, 'index': i} + new_arr.push(item); + } + //根據距離遠近排序，越近在前面，升序 + new_arr.sort(function (a, b) { + if (a.fee < b.fee) { return -1; } else if (a.fee == b.fee) { return 0; } else { return 1;} + }); + + var max_card=plusCard[new_arr[new_arr.length-1].index]; + th.setData({big_card:max_card}) + + //缓存分享卡的图片 + wx.getImageInfo({ + src: max_card.CardImg, + success: function (res) { + var bas_ming = res.path; th.setData({ bas_ming: bas_ming}); + } + }) + + }) + }, + + + //起始时间 + bindDateChenge: function(e) { + var isBind = false; + this.setData({ + datet: e.detail.value, + isBind: isBind + }); + }, + // 结束时间 + bindDateChenges: function(e) { + var isBinds = false; + this.setData({ + dates: e.detail.value, + isBinds: isBinds + }); + }, + //catchtap阻止冒泡，点击清除开始时间的按钮 + eliminate: function() { + var isBind = true; + var data = ""; + this.setData({ + datet: data, + isBind: isBind + }) + }, + //catchtap阻止冒泡，点击清除结束时间的按钮 + eliminates: function() { + var isBinds = true; + var dates = ""; + this.setData({ + dates: dates, + isBinds: isBinds + }) + }, + + get_input:function (e) { + this.data.input_val=e.detail.value; + }, + + //点击的搜索事件 + get_search:function () { + var th=this; + + if(th.data.datet && th.data.dates){ + var oDate1 = new Date(th.data.datet); + var oDate2 = new Date(th.data.dates); + if(oDate2 +
+ + 日期: + + + + {{datet}} + + + + + + 至 + + + {{dates}} + + + + + + + + 查询内容 + + + + + +
+ + + + + + 会员昵称 + + + + 手机号码 + + + 奖励明细 + + + + + + + + + + {{item.VIPName}} + + + + {{item.MobileTel}} + + + + +{{item.VIPRebate}} + + + + + + + + + + + + 暂无邀请明细 + + + 去邀请 + + + + + + + + \ No newline at end of file diff --git a/packageE/pages/user/Detailed/Detailed.wxss b/packageE/pages/user/Detailed/Detailed.wxss new file mode 100644 index 0000000..97a6d96 --- /dev/null +++ b/packageE/pages/user/Detailed/Detailed.wxss @@ -0,0 +1,304 @@ +.title { + background-color: rgb(238, 238, 238); + height: 65rpx; + color: rgb(153, 153, 153); +} + +.Nickname { + width: 200rpx; + padding-left: 50rpx; +} + +.reward { + width: 250rpx; +} + + +.phone { + width: 250rpx; +} + +.maxvalue { + border-bottom: 1rpx solid rgb(242, 242, 242); +} + +.Nicknamevalue { + height: 85rpx; + width: 190rpx; + padding-left: 60rpx; +} + +.phonevalue { + width: 250rpx; +} + +.rewardvalue { + width: 250rpx; + color: rgb(215, 0, 38); +} +/*无明细*/ +.empty_order image { + width: 329rpx; + height: 280rpx; + margin-top: 202rpx; +} + +.empty_order .xc-ash { + margin-top: 10rpx; + font-weight: 600px; +} + +.empty_order navigator { + margin-top: 60rpx; + border-radius: 40rpx; +} + +.empty_order navigator view { + width: 247rpx; + height: 56rpx; + background-color: rgb(255, 72, 72); + border-radius: 40rpx; +} + + +.big-rim{ + margin-top: 15rpx; + width: 100%; + height: 305rpx; + border-bottom: 8px solid #EEEEEE; +} +/* 单据时间 */ +.time{ + + font-size: 25rpx; + color: #999999; + width: 100%; +} +.min-rim{ + display: flex; + width: 100%; + height: auto; + margin-left: 30rpx; +} +/* 日期 */ +.rq{ + height: 25rpx; + font-size: 28rpx; + margin-top:12rpx; + font-family:'SimHei',Arial; +} +/* 日期控件 */ +.pi{ + width:200rpx; + height:auto; + margin-left:10rpx; + +} +.pis{ + width:200rpx; + height:auto; + margin-left:30rpx; +} +/* 日期边框 */ +.rq-rim{ + position:relative; + left:0; + top:0 +} +/* 开始时间边框*/ +.kssj{ + display: inline-block; + height: 50rpx; + background-color: #EEEEEE; + border: 1px solid #DADADA; + width:200rpx; + border-radius: 3px; + line-height:40rpx; + position:relative; + top:0rpx; + left:0rpx; + +} +/* 开始时间的文字 */ +.wz{ + display: inline-block; + font-size: 25rpx; + color: #333; +} + +/* 开始清空按钮的 边框*/ +.qc-rim{ + position:absolute; + top:10rpx; + left:173rpx; + +} +/* 结束时间清空输入框的按钮的边框 */ +.end-rim{ + position: absolute; + top: 23rpx; + left:547rpx; + width: 25rpx; + height: 25rpx; +} +/* 查询内容 */ +.cxnr{ + margin-left:30rpx; + font-size:28rpx; + font-family: 'SimHei',Arial; +} +/* 至 */ +.zi{ + margin-top:14rpx; + font-weight:600; + font-size:28rpx; + font-family: 'SimHei',Arial; + margin-left:30rpx; +} +/* 结束时间 */ + +.jssj{ + padding-left: 10rpx; + margin-left: 30rpx; + padding-bottom: 10rpx; + height: 35rpx; + font-size: 25rpx; + color: #333; + background-color: #EEEEEE; + border: 1px solid #DADADA; + width:85%; + border-radius: 5px; + +} +/* 查询内容的备考的边框 */ +.xknr-rim{ + display: flex; + width: 100%; + height: 55rpx; + line-height:105rpx; + margin-top:20rpx; +} +/* 明细查询 */ +.botton{ + margin-left: 30rpx; + margin-top: 50rpx; + background-color: #C4182E; + width: 95%; + border-radius:10rpx; + text-align: center; + height: 70rpx; + line-height: 70rpx; + color: #FFF; + font-size: 29rpx; + border: none; + font-family: 'SimHei',Arial; +} + +/*开始时间清空输入框的按钮*/ +.empty{ + width: 25rpx; + height: 25rpx; + border-radius:50%; + background: #767676; + color: #fff; + font-size: 25rpx; + text-align: center; + line-height:19rpx; +} +/*结束时间清空输入框的按钮*/ +.end{ + width: 25rpx; + height: 25rpx; + border-radius:50%; + background: #767676; + color: #fff; + font-size: 25rpx; + text-align: center; + line-height:19rpx; +} + +/* 顶部 */ +.top{ + width: 170rpx; + height: 50rpx; + padding: 0 10rpx; + line-height: 50rpx; + font-size: 34rpx; + margin-top: 25rpx; + border-radius:3rpx; +} +.images{ + width:35rpx; + height:35rpx; + margin-left:-9rpx; + margin-top:6rpx; +} +.rim-images{ + width: 62rpx; + height: 46rpx; + line-height: 37rpx; + /* border-style: inset;padding:4rpx;text-align: center; */ + background: #f1f1f1; + border-color:#000000; + border-width: 1rpx; + transform:translateX(28%); + margin-top:-3rpx; + border-radius:5rpx; +} +/* 下拉框 */ +.top-selected{ + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + border: 1px solid #ccc; + padding: 0 10rpx; + font-size: 30rpx; + background:#eeeeee; + height:50rpx; + border-radius:6rpx; + +} +.texts{ + margin:0 auto; + font-size: 25rpx; +} + +/* 下拉内容 */ +.select-box { + background-color: #eeeeee; + width:190rpx; + position: relative; + z-index:1; + overflow: hidden; + text-align: left; + animation: myfirst 0.5s; + font-size: 25rpx; + border: 1px solid #DADADA; +} +.select_one { + padding-left: 20rpx; + width: 100%; + height: 60rpx; + line-height: 60rpx; +} +/* 注释 */ +.zs{ + margin-left: 30rpx; + font-size: 25rpx; + color: #999999; + font-family: 'SimHei',Arial; + margin-top: 42rpx; + margin-bottom: 30rpx; +} + +.input{ + width: 300rpx; + background-color: #EEEEEE; + border-radius: 10rpx; + font-size: 24rpx; + text-indent: 5rpx; + height: 56rpx; + border: 1rpx solid #ccc; + +} \ No newline at end of file diff --git a/pages/user/Detailed/Detailed.js b/pages/user/Detailed/Detailed.js deleted file mode 100644 index 16cdf46..0000000 --- a/pages/user/Detailed/Detailed.js +++ /dev/null @@ -1,518 +0,0 @@ -var t = getApp(), - r = t.globalData, - a = t.request, - o = t.globalData.setting, - os = o, - i = require("../../../utils/util.js"), - ut = i, - s = require("../../../utils/common.js"); - -Page({ - /** - * 页面的初始数据 - */ - data: { - url: o.imghost, - arrayDetailed: [],//明细数组 - page: 1, - pageSize: 20, - isDetailed: 0, - total: 0, - ismore: 0,//数据是否加载完毕 - screenWidth:0, - - head_pic:"",//会员头像 - img_money:"",//缓存VIP的图片 - img_Ancrown:"",//会员权益 - img_Identification:"",//缓存标识的图片 - img_square:"",//缓存方块的图片 - privilege_o:"",//卡的勋章图 - bas_ming:"", //卡的图片 - big_card:null, //最大卡的信息 - - imagePath:"", //分享的生成图片 - - canvasHidden:true, - isBind:true, - isBinds:true, - - input_val:null, - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function(options) { - var ee=this; - var img_money = this.data.url + "/miniapp/images/plus/share/money.png"; - var img_Ancrown = this.data.url + "/miniapp/images/plus/share/Ancrown.png"; - var img_Identification = this.data.url + "/miniapp/images/plus/share/Identification.png"; - var img_square = this.data.url + "/miniapp/images/plus/share/square.png"; - var privilege_o = this.data.url + "/miniapp/images/plus/share/privilege_o.png"; - var user=getApp().globalData.userInfo; - //--获取用户设备信息，屏幕宽度-- - wx.getSystemInfo({ - success: res => { - ee.data.screenWidth=res.screenWidth; - } - }) - - //--------------------缓存vip价格的图片--------------- - wx.getImageInfo({ - src:img_money, - success: function (res) { - //回调写法 - var img_money = res.path; - ee.setData({ img_money: img_money}); - } - }) - //--------------------缓存权益的图片--------------- - wx.getImageInfo({ - src: img_Ancrown, - success: function (res) { - //回调写法 - var img_Ancrown = res.path; - ee.setData({ img_Ancrown: img_Ancrown }); - } - }) - //--------------------缓存标识的图片--------------- - wx.getImageInfo({ - src: img_Identification, - success: function (res) { - //回调写法 - var img_Identification = res.path; - ee.setData({ img_Identification: img_Identification }); - } - }) - - //--------------------卡的勋章--------------- - wx.getImageInfo({ - src: privilege_o, - success: function (res) { - //回调写法 - var privilege_o = res.path; - ee.setData({ privilege_o: privilege_o }); - } - }) - - //--------------------方块图--------------- - wx.getImageInfo({ - src: img_square, - success: function (res) { - //回调写法 - var img_square = res.path; - ee.setData({ img_square: img_square}); - } - }) - - //-----------获取最大值的卡-------------- - ee.getPlusCardType(); - - }, - - selectDetailed: function() { - var th = this, e = th; - var r_data={ - storeId: o.stoid, - userId: r.user_id, - page: th.data.page, - pageSize: th.data.pageSize - }; - - if(th.data.datet!="" && th.data.datet){ - r_data.Sdate=th.data.datet; - } - if(th.data.dates!="" && th.data.dates){ - r_data.Edate=th.data.dates; - } - if(th.data.input_val!="" && th.data.input_val){ - r_data.MobileTel=th.data.input_val; - } - - getApp().request.promiseGet("/api/weshop/plus/vip/mem/referee/page", { - data:r_data - }).then(res => { - - setTimeout(function () { - th.setData({isDetailed: 1 }); - },300) - if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0) { - th.data.page++;//当前页数+1 - var arr1 = th.data.arrayDetailed;//获取明细数组 - var arr2 = res.data.data.pageData;//获取当前查询数据 - if(!arr1) arr1=[]; - - var arr3 = [...arr1, ...arr2];//把当前查询数组拼接到原本数组后面 - var ismore = 0; - if (arr3.length == res.data.data.total) ismore = 1 //数据已加载完判断 - th.setData({ - arrayDetailed: arr3, - total: res.data.data.total, - ismore: ismore, - }) - - - } - }) - - }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function() { - this.selectDetailed(); - }, - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function() { - if (this.data.total <= this.data.pageSize) return; - if (this.data.ismore) { - t.my_warnning("加载完啦!", 0, this); - return - }; - this.selectDetailed(); - }, - - - saveImageToPhotosAlbum: function () { - if (this.data.imagePath != "") { - getApp().pre_img(this.data.imagePath); - return; - } - - this.data.is_loading=1; - wx.showLoading({ title: '生成中...',}) - this.setData({ canvasHidden: false }) - - var th = this; - - //设置画板显示，才能开始绘图 - var card_ming=th.data.bas_ming;//卡的图片 - var big_card= th.data.big_card;//获取最大的卡 - var user_head = th.data.head_pic;//会员头像 - var img_money = th.data.img_money;//缓存vip的价格 - var img_Ancrown = th.data.img_Ancrown;//会员权益的图片 - var img_Identification = th.data.img_Identification;//会员标识 - var privilege_o = th.data.privilege_o;//勋章图片 - var img_square=th.data.img_square; - var app = getApp(); - var user=app.globalData.userInfo; - var unit = th.data.screenWidth / 750 * 1.35; - var scene = getApp().globalData.user_id; - var nickname = user.nickname; - - //---二微码--- - var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + - os.stoid + "?sceneValue=" + scene + "&pageValue=pages/user/index/index"; - - wx.getImageInfo({ - src: path3, - success: function (res) { - th.get_head_temp(function(){ - var vpath=res.path; - - //开启画布 - const ctx = wx.createCanvasContext('myCanvas'); - //先画背景 - ctx.drawImage("../../../images/share/mackground.png", 0, 0, 554 * unit, 899 * unit); - ctx.setFontSize(24 * unit); - ctx.setFillStyle("rgb(0,0,0)"); - ctx.fillText(nickname, 152 * unit, 76 * unit); - var width = 24 * nickname.length * unit + 2 * unit; - var tj_path = "../../../images/share/q_tj.png"; - ctx.drawImage(tj_path, 152 * unit + width, 54 * unit, 95 * unit, 30 * unit); - ctx.setFontSize(18 * unit); - ctx.setLineJoin('round'); //交点设置成圆角 - ctx.setFillStyle("rgb(255,255,255)"); - // ctx.fillText("强烈推荐", 265 * unit, 72 * unit); - ctx.fillText('强烈推荐', 149 * unit + width + 15 * unit, 76 * unit); - ctx.setStrokeStyle("rgb(255,255,255)"); - ctx.setLineDash([5 * unit, 5 * unit], 5 * unit); - ctx.beginPath(); - ctx.moveTo(0, 125 * unit); - ctx.lineTo(554 * unit, 125 * unit); - ctx.stroke(); - - var x = 55 * unit, y = 165 * unit,w = 444 * unit, h = 220 * unit,r = 14 * unit; - ut.draw_randon_rect(ctx,x,y,r,w,h); - ctx.clip(); //一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内 - ctx.drawImage(card_ming, x, y, 444 * unit, 220 * unit); // 推进去图片 - ctx.restore(); //恢复之前保存的绘图上下文 恢复之前保存的绘图上下午即状态 可以继续绘制 - - ctx.beginPath(); - // 卡图片 - // ctx.drawImage("../../../images/plus/share/one.jpg", 55 * unit, 165 * unit, 444 * unit, 220 * unit,); - ctx.setFontSize(26 * unit); - ctx.setFillStyle('rgb(218,194,169)'); - ctx.fillText(big_card.CardName, 80 * unit, 215 * unit); - ctx.setFontSize(18 * unit); - ctx.setFillStyle('rgb(218,194,169)'); - ctx.fillText("开通plus会员仅" + big_card.CardFee+"元", 80 * unit, 240 * unit); - - //zz ctx.drawImage(privilege_o, 80 * unit, 343 * unit, 20 * unit, 20 * unit); - - ctx.setFontSize(14 * unit); - ctx.setFillStyle('rgb(218,194,169)'); - ctx.fillText("按去年用户消费计算，开卡后一年预计省￥3031", 85 * unit, 360 * unit); - - ctx.rect(70 * unit, 425 * unit, 182 * unit, 1 * unit); - ctx.setFillStyle('rgb(218,194,169)'); - ctx.fill(); - - ctx.drawImage(img_square, 267 * unit, 420 * unit, 13 * unit, 13 * unit); - - ctx.beginPath(); - ctx.rect(295 * unit, 425 * unit, 182 * unit, 1 * unit); - ctx.setFillStyle('rgb(218,194,169)'); - ctx.fill(); - - ctx.drawImage(img_square, 80 * unit, 470 * unit, 10 * unit, 10 * unit); - ctx.setFontSize(24 * unit); - ctx.setFillStyle("rgb(198,165,126)"); - ctx.fillText("PLUS会员权益", 100 * unit, 475 * unit); - - ctx.setFontSize(20 * unit); - ctx.setFillStyle("rgb(198,165,126)"); - ctx.fillText("PLUS会员专属权益", 100 * unit, 505 * unit); - ctx.drawImage(img_Ancrown, 355 * unit, 440 * unit, 65 * unit, 65 * unit); - - ctx.rect(85 * unit, 530 * unit, 375 * unit, 1 * unit) - ctx.setFillStyle('rgb(218,194,169)') - ctx.fill(); - - ctx.drawImage(img_square, 80 * unit, 575 * unit, 10 * unit, 10 * unit); - ctx.setFontSize(24 * unit); - ctx.setFillStyle("rgb(198,165,126)"); - ctx.fillText("PLUS会员标识", 100 * unit, 580 * unit); - - ctx.setFontSize(20 * unit); - ctx.setFillStyle("rgb(198,165,126)"); - ctx.fillText("彰显尊贵身份的象征", 100 * unit, 610 * unit); - ctx.drawImage(img_Identification, 355 * unit, 548 * unit, 65 * unit, 65 * unit); - - ctx.rect(85 * unit, 635 * unit, 375 * unit, 1 * unit); - ctx.setFillStyle('rgb(218,194,169)'); - ctx.fill(); - - ctx.drawImage(img_square, 80 * unit, 695 * unit, 10 * unit, 10 * unit); - ctx.setFontSize(24 * unit); - ctx.setFillStyle("rgb(198,165,126)"); - ctx.fillText("PLUS会员价格", 100 * unit, 695 * unit); - - ctx.setFontSize(20 * unit); - ctx.setFillStyle("rgb(198,165,126)"); - ctx.fillText("享受专属会员超低价", 100 * unit, 725 * unit); - ctx.drawImage(img_money, 355 * unit, 660 * unit, 65 * unit, 65 * unit); - - ctx.rect(85 * unit, 750 * unit, 375 * unit, 1 * unit) - ctx.setFillStyle('rgb(218,194,169)') - ctx.fill(); - - ctx.drawImage(vpath, 100 * unit, 780 * unit, 110 * unit, 110 * unit); - - ctx.setFontSize(20 * unit); - ctx.setFillStyle("#000"); - ctx.fillText("解锁新权益 精彩享不停", 230 * unit, 825 * unit); - - ctx.setFontSize(20 * unit); - ctx.setFillStyle("#000"); - ctx.fillText("长按识别二维码,立即开通!", 230 * unit, 865 * unit); - - //---绘制圆形要放在最后,头像---- - ctx.save(); - ctx.beginPath(); - var h_x = 60 * unit; - var h_y = 24 * unit; - var h_r = 40 * unit; - var cx = h_x + h_r; - var cy = h_y + h_r; - ctx.arc(cx, cy, h_r, 0, Math.PI * 2, false); - ctx.closePath(); - ctx.fill(); - ctx.clip(); - ctx.drawImage(th.data.head_pic, h_x, h_y, h_r * 2, h_r * 2); - ctx.restore(); - - x = 345 * unit, y = 190 * unit, - w = 105 * unit, h = 30 * unit, - r = 14 * unit; - ut.draw_randon_rect(ctx,x,y,r,w,h); - ctx.setFontSize(18 * unit); - ctx.setFillStyle("#000"); - ctx.fillText("立即开通", 362 * unit, 212 * unit); - - //--绘制图片--- - ctx.draw(false, - function(){ - setTimeout(function(){ - wx.canvasToTempFilePath({ - x: 0, - y: 0, - width: 750, - height: 930, - destWidth: 1.2 * 750 * 750 / th.data.screenWidth, - destHeight: 1.2 * 1217 * 750 / th.data.screenWidth, - canvasId: 'myCanvas', - success: function (res) { - wx.hideLoading();//关闭生成中的方法 - th.data.is_loading = 0; - console.log("生成的海报"); - console.log(res.tempFilePath); - var tempFilePath = res.tempFilePath; - th.setData({ - imagePath: tempFilePath, - maskHidden: false, - canvasHidden: true - }); - - getApp().pre_img(res.tempFilePath); - if (!res.tempFilePath) { - wx.showModal({ - title: '提示', - content: '图片绘制中，请稍后重试', - showCancel: false - }) - } - - } - - }) - },300) - }) - }) - - } - - }) - - }, - - //--获取头像的本地缓存,回调写法-- - get_head_temp: function (tt) { - var ee = this; - if (ee.data.head_pic) { - tt();return false; - } - //---获取分享图片的本地地址,头像和商品图片---- - var path2 = getApp().globalData.userInfo.head_pic; - if (path2 == "") { - ee.data.head_pic = "../../../images/share/hui_hear_pic.png";tt(); - } else { - path2 = path2.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); - path2 = path2.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); - wx.getImageInfo({ - src: path2, - success: function (res) { - //res.path是网络图片的本地地址 - ee.data.head_pic= res.path;tt(); - }, - fail: function (res) { - ee.data.head_pic= "../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的 - tt(); - } - }); - } - }, - - //--- 获取卡类列表 --- - getPlusCardType: function (e) { - var storid = o.stoid; - var th = this; - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { - var plusCard = res.data.data; - var arr = [1219, 2089, 3031]; - var new_arr = new Array(); - for (var i = 0; i < plusCard.length; i++) { - //plusCard[i].free=arr[i]; - var item = {"fee": plusCard[i].CardFee, 'index': i} - new_arr.push(item); - } - //根據距離遠近排序，越近在前面，升序 - new_arr.sort(function (a, b) { - if (a.fee < b.fee) { return -1; } else if (a.fee == b.fee) { return 0; } else { return 1;} - }); - - var max_card=plusCard[new_arr[new_arr.length-1].index]; - th.setData({big_card:max_card}) - - //缓存分享卡的图片 - wx.getImageInfo({ - src: max_card.CardImg, - success: function (res) { - var bas_ming = res.path; th.setData({ bas_ming: bas_ming}); - } - }) - - }) - }, - - - //起始时间 - bindDateChenge: function(e) { - var isBind = false; - this.setData({ - datet: e.detail.value, - isBind: isBind - }); - }, - // 结束时间 - bindDateChenges: function(e) { - var isBinds = false; - this.setData({ - dates: e.detail.value, - isBinds: isBinds - }); - }, - //catchtap阻止冒泡，点击清除开始时间的按钮 - eliminate: function() { - var isBind = true; - var data = ""; - this.setData({ - datet: data, - isBind: isBind - }) - }, - //catchtap阻止冒泡，点击清除结束时间的按钮 - eliminates: function() { - var isBinds = true; - var dates = ""; - this.setData({ - dates: dates, - isBinds: isBinds - }) - }, - - get_input:function (e) { - this.data.input_val=e.detail.value; - }, - - //点击的搜索事件 - get_search:function () { - var th=this; - - if(th.data.datet && th.data.dates){ - var oDate1 = new Date(th.data.datet); - var oDate2 = new Date(th.data.dates); - if(oDate2 -
- - 日期: - - - - {{datet}} - - - - - - 至 - - - {{dates}} - - - - - - - - 查询内容 - - - - - -
- - - - - - 会员昵称 - - - - 手机号码 - - - 奖励明细 - - - - - - - - - - {{item.VIPName}} - - - - {{item.MobileTel}} - - - - +{{item.VIPRebate}} - - - - - - - - - - - - 暂无邀请明细 - - - 去邀请 - - - - - - - - \ No newline at end of file diff --git a/pages/user/Detailed/Detailed.wxss b/pages/user/Detailed/Detailed.wxss deleted file mode 100644 index 97a6d96..0000000 --- a/pages/user/Detailed/Detailed.wxss +++ /dev/null @@ -1,304 +0,0 @@ -.title { - background-color: rgb(238, 238, 238); - height: 65rpx; - color: rgb(153, 153, 153); -} - -.Nickname { - width: 200rpx; - padding-left: 50rpx; -} - -.reward { - width: 250rpx; -} - - -.phone { - width: 250rpx; -} - -.maxvalue { - border-bottom: 1rpx solid rgb(242, 242, 242); -} - -.Nicknamevalue { - height: 85rpx; - width: 190rpx; - padding-left: 60rpx; -} - -.phonevalue { - width: 250rpx; -} - -.rewardvalue { - width: 250rpx; - color: rgb(215, 0, 38); -} -/*无明细*/ -.empty_order image { - width: 329rpx; - height: 280rpx; - margin-top: 202rpx; -} - -.empty_order .xc-ash { - margin-top: 10rpx; - font-weight: 600px; -} - -.empty_order navigator { - margin-top: 60rpx; - border-radius: 40rpx; -} - -.empty_order navigator view { - width: 247rpx; - height: 56rpx; - background-color: rgb(255, 72, 72); - border-radius: 40rpx; -} - - -.big-rim{ - margin-top: 15rpx; - width: 100%; - height: 305rpx; - border-bottom: 8px solid #EEEEEE; -} -/* 单据时间 */ -.time{ - - font-size: 25rpx; - color: #999999; - width: 100%; -} -.min-rim{ - display: flex; - width: 100%; - height: auto; - margin-left: 30rpx; -} -/* 日期 */ -.rq{ - height: 25rpx; - font-size: 28rpx; - margin-top:12rpx; - font-family:'SimHei',Arial; -} -/* 日期控件 */ -.pi{ - width:200rpx; - height:auto; - margin-left:10rpx; - -} -.pis{ - width:200rpx; - height:auto; - margin-left:30rpx; -} -/* 日期边框 */ -.rq-rim{ - position:relative; - left:0; - top:0 -} -/* 开始时间边框*/ -.kssj{ - display: inline-block; - height: 50rpx; - background-color: #EEEEEE; - border: 1px solid #DADADA; - width:200rpx; - border-radius: 3px; - line-height:40rpx; - position:relative; - top:0rpx; - left:0rpx; - -} -/* 开始时间的文字 */ -.wz{ - display: inline-block; - font-size: 25rpx; - color: #333; -} - -/* 开始清空按钮的 边框*/ -.qc-rim{ - position:absolute; - top:10rpx; - left:173rpx; - -} -/* 结束时间清空输入框的按钮的边框 */ -.end-rim{ - position: absolute; - top: 23rpx; - left:547rpx; - width: 25rpx; - height: 25rpx; -} -/* 查询内容 */ -.cxnr{ - margin-left:30rpx; - font-size:28rpx; - font-family: 'SimHei',Arial; -} -/* 至 */ -.zi{ - margin-top:14rpx; - font-weight:600; - font-size:28rpx; - font-family: 'SimHei',Arial; - margin-left:30rpx; -} -/* 结束时间 */ - -.jssj{ - padding-left: 10rpx; - margin-left: 30rpx; - padding-bottom: 10rpx; - height: 35rpx; - font-size: 25rpx; - color: #333; - background-color: #EEEEEE; - border: 1px solid #DADADA; - width:85%; - border-radius: 5px; - -} -/* 查询内容的备考的边框 */ -.xknr-rim{ - display: flex; - width: 100%; - height: 55rpx; - line-height:105rpx; - margin-top:20rpx; -} -/* 明细查询 */ -.botton{ - margin-left: 30rpx; - margin-top: 50rpx; - background-color: #C4182E; - width: 95%; - border-radius:10rpx; - text-align: center; - height: 70rpx; - line-height: 70rpx; - color: #FFF; - font-size: 29rpx; - border: none; - font-family: 'SimHei',Arial; -} - -/*开始时间清空输入框的按钮*/ -.empty{ - width: 25rpx; - height: 25rpx; - border-radius:50%; - background: #767676; - color: #fff; - font-size: 25rpx; - text-align: center; - line-height:19rpx; -} -/*结束时间清空输入框的按钮*/ -.end{ - width: 25rpx; - height: 25rpx; - border-radius:50%; - background: #767676; - color: #fff; - font-size: 25rpx; - text-align: center; - line-height:19rpx; -} - -/* 顶部 */ -.top{ - width: 170rpx; - height: 50rpx; - padding: 0 10rpx; - line-height: 50rpx; - font-size: 34rpx; - margin-top: 25rpx; - border-radius:3rpx; -} -.images{ - width:35rpx; - height:35rpx; - margin-left:-9rpx; - margin-top:6rpx; -} -.rim-images{ - width: 62rpx; - height: 46rpx; - line-height: 37rpx; - /* border-style: inset;padding:4rpx;text-align: center; */ - background: #f1f1f1; - border-color:#000000; - border-width: 1rpx; - transform:translateX(28%); - margin-top:-3rpx; - border-radius:5rpx; -} -/* 下拉框 */ -.top-selected{ - width: 100%; - display: flex; - align-items: center; - justify-content: space-between; - border: 1px solid #ccc; - padding: 0 10rpx; - font-size: 30rpx; - background:#eeeeee; - height:50rpx; - border-radius:6rpx; - -} -.texts{ - margin:0 auto; - font-size: 25rpx; -} - -/* 下拉内容 */ -.select-box { - background-color: #eeeeee; - width:190rpx; - position: relative; - z-index:1; - overflow: hidden; - text-align: left; - animation: myfirst 0.5s; - font-size: 25rpx; - border: 1px solid #DADADA; -} -.select_one { - padding-left: 20rpx; - width: 100%; - height: 60rpx; - line-height: 60rpx; -} -/* 注释 */ -.zs{ - margin-left: 30rpx; - font-size: 25rpx; - color: #999999; - font-family: 'SimHei',Arial; - margin-top: 42rpx; - margin-bottom: 30rpx; -} - -.input{ - width: 300rpx; - background-color: #EEEEEE; - border-radius: 10rpx; - font-size: 24rpx; - text-indent: 5rpx; - height: 56rpx; - border: 1rpx solid #ccc; - -} \ No newline at end of file diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js index 20fb5be..4b140d0 100644 --- a/pages/user/cardinfo/cardinfo.js +++ b/pages/user/cardinfo/cardinfo.js @@ -707,7 +707,7 @@ Page({ to_user_money:function(){ //提现小于0的值也不提现 if(!this.data.free.VIPRebate || parseFloat(this.data.free.VIPRebate)<=0){ - getApp().my_warnning("您目前没有可提现的金额",0,th); return false; + getApp().my_warnning("您目前没有可提现的金额",0,this); return false; } this.setData({yu_e_show:1}) }, diff --git a/pages/user/cardinfo/cardinfo.wxml b/pages/user/cardinfo/cardinfo.wxml index 2341d85..e54425a 100644 --- a/pages/user/cardinfo/cardinfo.wxml +++ b/pages/user/cardinfo/cardinfo.wxml @@ -1,5 +1,4 @@ - @@ -63,7 +62,7 @@ - 明细 + 明细 转到余额 diff --git a/utils/auth.js b/utils/auth.js index f5bf325..7dc9db5 100644 --- a/utils/auth.js +++ b/utils/auth.js @@ -269,7 +269,7 @@ module.exports = { }, goGetUserInfo: function() { wx.navigateTo({ - url: "/pages/user/get_user_info/get_user_info" + url: "/packageE/pages/togoin/togoin" }); } }; -- libgit2 0.21.4