From 98d92dc290b044f32d67b532e3c279f3910d48b2 Mon Sep 17 00:00:00 2001 From: WXD-SEASON\season Date: Tue, 13 Dec 2022 09:40:35 +0800 Subject: [PATCH] 会员标签及会员成长值移到E包 --- app.json | 11 ++++++----- packageA/pages/profile/profile.wxml | 4 ++-- packageB/pages/luckactivity/luckinfo/luckinfo.js | 2 +- packageD/components/diy_login/login.wxml | 4 ++-- packageE/pages/user/grow_value/filter.wxs | 17 +++++++++++++++++ packageE/pages/user/grow_value/grow_value.js | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageE/pages/user/grow_value/grow_value.json | 7 +++++++ packageE/pages/user/grow_value/grow_value.wxml | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ packageE/pages/user/grow_value/grow_value.wxss | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageE/pages/user/labels/labels.js | 298 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageE/pages/user/labels/labels.json | 7 +++++++ packageE/pages/user/labels/labels.wxml | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageE/pages/user/labels/labels.wxss | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/user/grow_value/filter.wxs | 17 ----------------- pages/user/grow_value/grow_value.js | 213 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/user/grow_value/grow_value.json | 7 ------- pages/user/grow_value/grow_value.wxml | 51 --------------------------------------------------- pages/user/grow_value/grow_value.wxss | 91 ------------------------------------------------------------------------------------------- pages/user/index/index.js | 2 +- pages/user/labels/labels.js | 298 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/user/labels/labels.json | 7 ------- pages/user/labels/labels.wxml | 70 ---------------------------------------------------------------------- pages/user/labels/labels.wxss | 98 -------------------------------------------------------------------------------------------------- pages/user/userinfo/userinfo.wxml | 4 ++-- pages/user/userqy/userqy.js | 2 +- 25 files changed, 867 insertions(+), 866 deletions(-) create mode 100644 packageE/pages/user/grow_value/filter.wxs create mode 100644 packageE/pages/user/grow_value/grow_value.js create mode 100644 packageE/pages/user/grow_value/grow_value.json create mode 100644 packageE/pages/user/grow_value/grow_value.wxml create mode 100644 packageE/pages/user/grow_value/grow_value.wxss create mode 100644 packageE/pages/user/labels/labels.js create mode 100644 packageE/pages/user/labels/labels.json create mode 100644 packageE/pages/user/labels/labels.wxml create mode 100644 packageE/pages/user/labels/labels.wxss delete mode 100644 pages/user/grow_value/filter.wxs delete mode 100644 pages/user/grow_value/grow_value.js delete mode 100644 pages/user/grow_value/grow_value.json delete mode 100644 pages/user/grow_value/grow_value.wxml delete mode 100644 pages/user/grow_value/grow_value.wxss delete mode 100644 pages/user/labels/labels.js delete mode 100644 pages/user/labels/labels.json delete mode 100644 pages/user/labels/labels.wxml delete mode 100644 pages/user/labels/labels.wxss diff --git a/app.json b/app.json index 900da75..deeb986 100644 --- a/app.json +++ b/app.json @@ -34,7 +34,7 @@ "pages/user/userqy/userqy", "pages/user/user_spsy/user_spsy", - "pages/user/grow_value/grow_value", + "pages/payment/pay_success/pay_success", "pages/user/plus/plus", @@ -45,8 +45,7 @@ "pages/user/my_service/tment_details", "pages/user/my_service/tment_eval", "pages/user/my_service/tment_order_list", - "pages/user/my_service/beauty_deta", - "pages/user/labels/labels", + "pages/user/my_service/beauty_deta", "pages/giftpack/birthdaygift/birthdaygift", "pages/giftpack/evaluategift/evaluategift", "pages/giftpack/newvipgift/newvipgift", @@ -122,7 +121,7 @@ "pages/serviceCard_pd/team_success/team_success" ], - "plugins":{"live-player-plugin":{"version":"1.3.2","provider":"wx2b03c6e691cd7370"}} + "plugins":{"live-player-plugin":{"version":"1.3.5","provider":"wx2b03c6e691cd7370"}} }, { "root": "packageB/", @@ -213,7 +212,9 @@ "pages/user/cardinfo/cardinfo", "pages/user/nick_avatar/nick_avatar", "pages/user/slimming/slimming", - "pages/user/punchInhistory/punchInhistory" + "pages/user/punchInhistory/punchInhistory", + "pages/user/grow_value/grow_value", + "pages/user/labels/labels" ] } diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml index 147ab81..97a3374 100644 --- a/packageA/pages/profile/profile.wxml +++ b/packageA/pages/profile/profile.wxml @@ -149,7 +149,7 @@ - + 我的兴趣 ∟ @@ -161,7 +161,7 @@ - + + 标签 diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js index f7460c2..58b8cd1 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.js +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js @@ -1282,7 +1282,7 @@ Page({ break; }; case 2: { - url = '/pages/user/grow_value/grow_value'; + url = '/packageE/pages/user/grow_value/grow_value'; break; }; case 3: { diff --git a/packageD/components/diy_login/login.wxml b/packageD/components/diy_login/login.wxml index 31de3dd..2f325d8 100644 --- a/packageD/components/diy_login/login.wxml +++ b/packageD/components/diy_login/login.wxml @@ -215,7 +215,7 @@ - + 我的兴趣 ∟ @@ -227,7 +227,7 @@ - + + 标签 diff --git a/packageE/pages/user/grow_value/filter.wxs b/packageE/pages/user/grow_value/filter.wxs new file mode 100644 index 0000000..00c2b32 --- /dev/null +++ b/packageE/pages/user/grow_value/filter.wxs @@ -0,0 +1,17 @@ +var format = function (text) { + if (!text) { + return + } + var reg = getRegExp('\\\\n', 'g') + return text.replace(reg, '\n') +} + +var swi=function(type){ + if(type==0 || type==null ) return "POS销售"; +} + + +module.exports = { + format: format, + swi: swi +} diff --git a/packageE/pages/user/grow_value/grow_value.js b/packageE/pages/user/grow_value/grow_value.js new file mode 100644 index 0000000..887bb7b --- /dev/null +++ b/packageE/pages/user/grow_value/grow_value.js @@ -0,0 +1,213 @@ +var e = getApp(),os = e.globalData.setting; +var utils = require('../../../../utils/util.js'); +var regeneratorRuntime = require('../../../../utils/runtime.js'); + +Page({ + /*** 页面的初始数据*/ + data: { + color_screen: "#8e8c8d", + val:0, + distance:0, + // 时间组件参数 + isPickerRender: false, + isPickerShow: false, + startTime: "", + endTime: "", + + pickerConfig: { + endDate: true, + column: "", + dateLimit: true, + initStartTime: "2019-01-01 12:32:44", + initEndTime: "2019-12-01 12:32:44", + limitStartTime: "1917-05-06 12:32:44", + limitEndTime: "2055-05-06 12:32:44" + }, + cz_val:0, //成长值 + gradeId:null, //等级ID + gradeEndDate:null, //等级结束时间 + need_money:0, //到下一级需要多少 + + value_list:null, //明细列表 + iurl:os.imghost, + cur_page:1, + is_no_more:0, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + var need_money=options.need_money; + if(need_money>0) + this.setData({need_money:need_money}) + }, + /*** 生命周期函数--监听页面显示*/ + onShow: async function () { + + var gl_data=getApp().globalData,th=this; + var cz_val=0,gradeId=null,gradeEndDate=null,need_money=0,val_list=null,backClass=null; + + //获取成长值 + await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get",{ + data:{ storeId:os.stoid,userId:gl_data.user_id } + }).then(res=>{ + var data=res.data.data; + cz_val=data.GradeSum; + gradeId=data.GradeId; + gradeEndDate=data.gradeEndDate; + }) + + //---如果未传值需要多少钱过来的话--- + if(!th.data.need_money) { + //获取卡类列表,判断到下一级需要多少 + await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", { + data: {storeId: os.stoid} + }).then(res => { + backClass = res.data.data.pageData; + }) + for (var i in backClass) { + var im = backClass[i]; + if (cz_val < im.BuyGradeSum) { + need_money = im.BuyGradeSum; break; + } + } + } + + //--获取明细列表-- + await getApp().request.promiseGet("/api/weshop/users/grade/vipinoutgrade/page", { + data: {storeId: os.stoid,userId:gl_data.user_id,page:1,pageSize:6} + }).then(res => { + if(res.data.data) + val_list= res.data.data.pageData; + }) + + th.setData({cz_val:cz_val,gradeId:gradeId,gradeEndDate:gradeEndDate,need_money:need_money,val_list:val_list}) + + }, + + /*** 页面上拉触底事件的处理函数 */ + onReachBottom: async function () { + if(this.data.is_no_more) return; + var val_list=null,page=++this.data.cur_page, + c_val_list=this.data.val_list,th=this,gl_data=getApp().globalData; + + var d_data={storeId: os.stoid,userId:gl_data.user_id,page:page,pageSize:6}; + if(th.data.startTime && th.data.endTime ){ + d_data.beginDate=th.data.startTime; + d_data.endDate=th.data.endTime; + } + //--获取明细列表-- + await getApp().request.promiseGet("/api/weshop/users/grade/vipinoutgrade/page", { + data: d_data, + }).then(res => { + if(res.data.data) + val_list= res.data.data.pageData; + }) + if(val_list && val_list.length>0 ){ + var dd=[...c_val_list,...val_list]; + th.setData({val_list:dd}) + }else{ + th.data.is_no_more==1; + getApp().my_warnning("没有更多数据",0,th); + } + }, + + pickerShow: function () { + this.setData({ + isPickerShow: true, + isPickerRender: true, + chartHide: true, + color_screen: "#009cfe", + val:180, + distance:15, + is_show:1, + }); + }, + pickerHide: function() { + console.log("555"); + this.setData({ + isPickerShow: false, + chartHide: false, + color_screen: "#8e8c8d", + val: 0, + distance: 0, + }); + }, + bindPickerChange: function (e) { + this.getData(this.data.sensorList[e.detail.value].id); + // let startDate = util.formatTime(new Date(new Date().getTime() - 24 * 60 * 60 * 1000 * 7)); + // let endDate = util.formatTime(new Date()); + this.setData({ + index: e.detail.value, + sensorId: this.data.sensorList[e.detail.value].id + // startDate, + // endDate + }); + }, + //--选择时间-- + setPickerTime: function (val) { + let data = val.detail,gl_data=getApp().globalData,th=this; + this.setData({ + startTime: data.startTime, + endTime: data.endTime, + color_screen: "#8e8c8d", + val: 0, + distance: 0, + }); + + this.data.cur_page=1; + var d_data={storeId: os.stoid,userId:gl_data.user_id,page:1,pageSize:6}; + d_data.beginDate=th.data.startTime; + d_data.endDate=th.data.endTime; + + console.log(d_data); + + //--获取明细列表-- + getApp().request.promiseGet("/api/weshop/users/grade/vipinoutgrade/page", { + data: d_data,isShowLoading:1 + }).then(res => { + var val_list=null; + if(res.data.data) val_list=res.data.data.pageData; + if(val_list && val_list.length>0 ) { + this.setData({val_list:val_list}); + }else{ + this.setData({val_list:null}); + } + }) + + }, + + goto:function(e){ + var index=e.currentTarget.dataset.ind; + switch (index) { + case "0": getApp().goto("/pages/index/index/index");break; + case "1": getApp().goto("/packageD/pages/user/coupons/coupons"); break; + case "2": getApp().goto("/pages/user/userqy/userqy"); break; + } + }, + + reset_data:function(){ + this.data.cur_page = 1; + this.setData({ + startTime: null, + endTime: null,}); + + var gl_data = getApp().globalData; + var d_data = { storeId: os.stoid, userId: gl_data.user_id, page: 1, pageSize: 6 }; + + //--获取明细列表-- + getApp().request.promiseGet("/api/weshop/users/grade/vipinoutgrade/page", { + data: d_data, isShowLoading: 1 + }).then(res => { + var val_list = null; + if (res.data.data) val_list = res.data.data.pageData; + if (val_list && val_list.length > 0) { + this.setData({ val_list: val_list }); + } else { + this.setData({ val_list: null }); + } + }) + } + +}) \ No newline at end of file diff --git a/packageE/pages/user/grow_value/grow_value.json b/packageE/pages/user/grow_value/grow_value.json new file mode 100644 index 0000000..227558a --- /dev/null +++ b/packageE/pages/user/grow_value/grow_value.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "我的成长值", + "usingComponents": { + "timePicker": "/components/timePicker/timePicker", + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageE/pages/user/grow_value/grow_value.wxml b/packageE/pages/user/grow_value/grow_value.wxml new file mode 100644 index 0000000..541c0bd --- /dev/null +++ b/packageE/pages/user/grow_value/grow_value.wxml @@ -0,0 +1,51 @@ + + + + + + 当前成长值 + {{cz_val}} + 距离下一等级会员还需{{need_money-cz_val}}成长值 + + + + + + + + 成长值明细 + + 重置 + 筛选 + + + + + + + + + + + {{item.Remark?item.Remark:"未知"}} + + + {{item.BillDate}} + + + + +{{item.InGrade}} + -{{item.OutGrade}} + + + + 无成长值数据 + + + + + + \ No newline at end of file diff --git a/packageE/pages/user/grow_value/grow_value.wxss b/packageE/pages/user/grow_value/grow_value.wxss new file mode 100644 index 0000000..d5ebb11 --- /dev/null +++ b/packageE/pages/user/grow_value/grow_value.wxss @@ -0,0 +1,91 @@ + .xc-grow-top{ + width: 100%; + height: 528rpx; + border-bottom: 15rpx solid #f2f2f2; + + } + .xc-grow-top .title-img{ + width: 100%; + height: 360rpx; + } + .xc-grow-top .explain-frame{ + top:66rpx; + left:40rpx; + + } + .xc-grow-top .explain-frame .font-grow{ + font-size:30rpx; + } + .xc-grow-top .explain-frame .val{ + font-size:46rpx; + margin-top:5rpx; + } +.xc-grow-top .explain-frame .distance-val{ + margin-top:40rpx; + font-size:26rpx; + +} +.xc-card{ + width: 668rpx; + height: 134rpx; + + left: 40rpx; + bottom:100rpx; + +} +.xc-card .card{ + width: 208rpx; + height: 100%; + border-radius:15rpx; + +} +.xc-screen-frame{ + width: 668rpx; + left: 40rpx; + bottom: 26rpx; + color: #8e8c8d; +} + .box + { + width:0px; + height:0px; + margin-left: 15rpx; + border-top:11rpx solid rgba(0,0,0,0); + border-right:10rpx solid rgba(0,0,0,0); + border-bottom:18rpx solid #8e8c8d; + border-left:10rpx solid rgba(0,0,0,0); + display: inline-block + + } + + .xc-list-frame{ + width: 688rpx; + margin-left:40rpx; + height: 645rpx; + padding-bottom:20rpx; + + } + .xc-list-frame .xc-bills-frame{ + width: 655rpx; + height: 108rpx; + border-top: 2rpx solid #f2f2f2; + border-bottom: 2rpx solid #f2f2f2; + } +.xc-list-frame .xc-bills-frame .word-number{ + font-size:30rpx; + +} + .xc-list-frame .xc-bills-frame .word-time{ + font-size: 26rpx; + } + + .xc-bills-frame .xc-val{ + color: #fe537d; + } + .intro { + margin: 30px; + text-align: center; +} + + .xc-list-frame .no_text{ text-align: center; color: #eee; margin-top: 30rpx; color: #8e8c8d; font-size: 30rpx } + .reset_img{ position: relative; top:2rpx} \ No newline at end of file diff --git a/packageE/pages/user/labels/labels.js b/packageE/pages/user/labels/labels.js new file mode 100644 index 0000000..5666231 --- /dev/null +++ b/packageE/pages/user/labels/labels.js @@ -0,0 +1,298 @@ +var e = getApp(), + a = e.globalData.setting, + os = a, + t = e.request, + d = e.globalData; +Page({ + + /** + * 页面的初始数据 + */ + data: { + url: a.url, //接口网址 + iurl: a.imghost, //图片前缀网址 + interest_lables: [], //兴趣标签 + check_label: [], //用户选中的标签集合 + user_label_val: "", //奖励多少 + user_label_type: "", //奖励类型（1积分，1成长值） + is_modify: 0, //判断是第一次填写还是修改（0填写，1修改） + isread: 0, //是否读取 + is_check: 0, //是否重复提交 + }, + //点击选择兴趣标签把值放到已选中 + click_label: function(e) { + var th = this; + var index = e.currentTarget.dataset.index; //选择兴趣标签的下标 + var labels = th.data.interest_lables; //兴趣标签数组 + var check_label = th.data.check_label; //已选中的数组 + var labels_cid = th.data.interest_lables[index].check; //当前标签是否选中 + var labels_check = 'interest_lables[' + index + '].check'; //用于点击标签把点击状态赋值进去 + if (labels_cid) { + labels_cid = 0; + for (var i = 0; i < check_label.length; i++) { + if (labels[index].id == check_label[i].id) { + check_label.splice(i, 1); + } + } + th.setData({ + [labels_check]: labels_cid, + check_label: check_label + }) + } else { + if (check_label.length > 9) { + getApp().my_warnning("最多可选10个哦", 0, th); + } else { + var check_new = { + lable: labels[index] + }; + labels_cid = 1; + check_label.push(labels[index]); + } + th.setData({ + [labels_check]: labels_cid, + check_label: check_label + }) + } + + }, + //获取配置信息 + get_config: function() { + var th = this; + getApp().getConfig2(function(ee) { + var sms_conf = ee.switch_list; + sms_conf = JSON.parse(sms_conf); + var getuser_label_type = 1; + var getuser_label_val = 0; + if (sms_conf.user_label_type != undefined) { + getuser_label_type = parseInt(sms_conf.user_label_type) + 1; + } + if (sms_conf.user_label_val != undefined) { + getuser_label_val = sms_conf.user_label_val; + } + + + th.setData({ + user_label_val: getuser_label_val, + user_label_type: getuser_label_type + }) + }) + }, + //页面跳转 + goto: function(e) { + var th = this; + wx.navigateBack({ //返回 + delta: 1 + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + var th = this; + var pages = getCurrentPages(); + var prevPage = pages[pages.length - 2]; //上一个页面 + //直接调用上一个页面的setData()方法，把数据存到上一个页面中去 + prevPage.setData({ + is_zy: 1 + }) + th.query_nolabels(); + th.get_config(); + }, + //获取标签集合 + query_nolabels: function() { + var th = this; + var url = "/api/weshop/marketing/holiday/vip/interest/label/page"; + var interest_lables = th.data.interest_lables; //兴趣标签集合 + getApp().request.promiseGet(url, { + data: { + storeId: a.stoid, + pageSize: 50, + page: 1 + } + }).then(res => { + if (res.data.code == 0) { + th.setData({ + interest_lables: res.data.data.pageData, + isread: 1 + }) + th.query_checklabels(); + } else { + getApp().my_warnning("系统繁忙,请稍后再试", 0, th); + th.setData({ + isread: 1 + }) + return false; + } + }) + }, + //查找会员选择的兴趣标签 + query_checklabels: function() { + var th = this; + var url = "/api/weshop/marketing/holiday/vip/interest/label/get"; + var interest_lables = th.data.interest_lables; //兴趣标签 + getApp().request.promiseGet(url, { + data: { + userId: d.user_id, + storeId: a.stoid + } + }).then(res => { + if (res.data.code == 0) { + var data = res.data.data; + var arr = []; + var VipLabelId = []; //通过id标签找到已选择的标签 + var dateList = data.VipLabelId.split(","); + for (var i in dateList) { + VipLabelId = VipLabelId.concat(dateList[i]); + } + if (VipLabelId.length > 0) { + for (var i = 0; i < interest_lables.length; i++) { + for (var ii = 0; ii < VipLabelId.length; ii++) { + if (interest_lables[i].id == VipLabelId[ii]) { + interest_lables[i].check = 1; + arr.push(interest_lables[i]); + } + } + } + } + //如何有之前有选择兴趣标签的话，再进来的话就是修改 + if (data.VipLabelId != '') { + th.setData({ + is_modify: 1 + }) + } + th.setData({ + check_label: arr, + interest_lables: interest_lables + }) + } else { + getApp().my_warnning("系统繁忙，请稍后再试", 0, th); + return false; + } + }) + }, + //更新会员兴趣标签 + update_label: function() { + var th = this; + var is_modify = th.data.is_modify; //是否是修改 + var check_label = th.data.check_label; //用户选择 + var user_label_val = th.data.user_label_val; //选择标签奖励多少 + var remark = "领取"; + var user_label_type = th.data.user_label_type; //赠送类型 + var is_check = th.data.is_check; //是否重复提交 + var i = 0; + if (is_modify) { + user_label_type = 0; + remark = "修改"; + user_label_val = 0; + } + if (is_check==1) { + getApp().my_warnning("请勿重复提交", 0, th); + } + if (is_check == 0) { + if (check_label.length < 1) { + getApp().my_warnning("完成兴趣标签才能" + remark + "哦~", 0, th); + th.setData({ + is_check: 0 + }) + } else { + th.setData({ + is_check: 1 + }) + + var url = "/api/weshop/marketing/holiday/vip/interest/label/update"; //更新标签接口地址 + var nav_url = "/pages/user/userinfo/userinfo"; //领取成功之后跳转页面 + var vipLabel = ""; //选择的标签名称 + var vipLabelId = ""; //选择的标签id + var arr = []; + for (var i = 0; i < check_label.length; i++) { + if (i < check_label.length - 1) { + vipLabelId += check_label[i].id + ","; + vipLabel += check_label[i].LabelName + ","; + arr.push(check_label[i].LabelName); + } else { + vipLabelId += check_label[i].id; + vipLabel += check_label[i].LabelName; + arr.push(check_label[i].LabelName); + } + } + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + remark = "兴趣标签赠送"; + if (is_modify) { + + my_confirm.open_cancel(0); + getApp().request.put(url, { + data: { + "storeId": a.stoid, + "userId": d.user_id, + "vipLabel": vipLabel, + "vipLabelId": vipLabelId, + "type": user_label_type, + "remark": remark, + "value": user_label_val, + "fromType": "REWARD" + }, + success: function(res) { + if (res.data.code == 0) { + getApp().my_warnning("修改成功", 1, th); + setTimeout(function() { + var pages = getCurrentPages(); + var prevPage = pages[pages.length - 2]; //上一个页面 + //直接调用上一个页面的setData()方法，把数据存到上一个页面中去 + prevPage.setData({ + check_label: arr + }) + th.goto(); + }, 2000); + } else { + getApp().my_warnning("系统繁忙,请稍后再试", 0, th); + th.setData({ + is_check: 0 + }) + } + } + }) + + } else { + + getApp().request.put(url, { + data: { + "storeId": a.stoid, + "userId": d.user_id, + "vipLabel": vipLabel, + "vipLabelId": vipLabelId, + "type": user_label_type, + "remark": remark, + "value": user_label_val, + "fromType": "REWARD" + }, + success: function(res) { + if (res.data.code == 0) { + getApp().my_warnning("领取成功", 1, th); + setTimeout(function() { + var pages = getCurrentPages(); + var prevPage = pages[pages.length - 2]; //上一个页面 + //直接调用上一个页面的setData()方法，把数据存到上一个页面中去 + prevPage.setData({ + check_label: arr + }) + th.goto(); + }, 2000); + } else { + getApp().my_warnning("系统繁忙,请稍后再试", 0, th); + th.setData({ + is_check: 0 + }) + } + } + }) + } + } + } + }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { + + } +}) \ No newline at end of file diff --git a/packageE/pages/user/labels/labels.json b/packageE/pages/user/labels/labels.json new file mode 100644 index 0000000..12d96e4 --- /dev/null +++ b/packageE/pages/user/labels/labels.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "兴趣标签", + "usingComponents": { + "warn": "/components/long_warn/long_warn", + "my_confirm": "/components/my_confirm/my_confirm" + } +} \ No newline at end of file diff --git a/packageE/pages/user/labels/labels.wxml b/packageE/pages/user/labels/labels.wxml new file mode 100644 index 0000000..6d46152 --- /dev/null +++ b/packageE/pages/user/labels/labels.wxml @@ -0,0 +1,70 @@ + + + + + + 兴趣标签 + + 关闭 + + + + + + + + + {{item.LabelName}} + + + + + + + + 已选中 + + + + {{it.LabelName}} + + + + + + + + + + 确定选择 + + + 领取{{user_label_val}}积分 + + + 领取{{user_label_val}}成长值 + + + + + + 提交修改 + + + + + + + + + + + + 商家还未设置标签，敬请期待！ + + + + + + + \ No newline at end of file diff --git a/packageE/pages/user/labels/labels.wxss b/packageE/pages/user/labels/labels.wxss new file mode 100644 index 0000000..fcfa1c4 --- /dev/null +++ b/packageE/pages/user/labels/labels.wxss @@ -0,0 +1,98 @@ +page{ + height: 100%; +} +.padding { + padding: 0rpx 65rpx; +} + +.container { + border-top: 6rpx solid rgb(238, 238, 238); + height: 100%; + display: block; +} +.lables{ + height: 50%; +} +.labels_head { + padding-top: 45rpx; + padding-bottom: 25rpx; + border-bottom: 3rpx solid rgb(238, 238, 238); +} + +.skip { + width: 100rpx; + height: 40rpx; + line-height: 45rpx; + border: 2rpx solid rgb(155, 155, 155); + border-radius: 30rpx; + color: rgb(153, 153, 153); +} + +.label_aggregate { + height: 66%; + padding-top: 27rpx; + overflow-y: scroll; +} + +.label { + display: inline-block; + max-width: 200rpx; + height: 46rpx; + line-height: 46rpx; + border: 2rpx solid rgb(204, 204, 204); + border-radius: 30rpx; + padding: 0rpx 30rpx; + margin-right: 25rpx; + margin-bottom: 3%; +} +.click{ + color: rgb(255,255,255); + border: 2rpx solid rgb(255, 138, 160); + background-color: rgb(255, 138, 160); +} +.check_head { + padding-top: 10rpx; + padding-bottom: 25rpx; + border-bottom: 3rpx solid rgb(238, 238, 238); + margin-bottom: 30rpx; +} + +.check_label { + display: inline-block; + max-width: 200rpx; + height: 46rpx; + border: 2rpx solid rgb(255, 138, 160); + line-height: 46rpx; + margin-right: 25rpx; + margin-bottom: 3%; + padding: 0rpx 30rpx; + border-radius: 30rpx; + color: rgb(255, 255, 255); + background-color: rgb(255, 138, 160); +} +.receive{ + position: fixed; + bottom:60rpx; + left: 65rpx; + width: 620rpx; + height: 70rpx; + line-height: 70rpx; + background-color: rgb(255, 138, 160); + color: rgb(255, 255, 255); + border-radius: 40rpx; +} +.check_labels{ + height: 80%; + overflow-y: scroll; +} +.check_item{ + height: 30%; +} +.no_labels{ + width: 290rpx; + height: 220rpx; + margin-bottom:40rpx; +} +.backcolor{ + background-color: rgb(204, 204, 204); +} \ No newline at end of file diff --git a/pages/user/grow_value/filter.wxs b/pages/user/grow_value/filter.wxs deleted file mode 100644 index 00c2b32..0000000 --- a/pages/user/grow_value/filter.wxs +++ /dev/null @@ -1,17 +0,0 @@ -var format = function (text) { - if (!text) { - return - } - var reg = getRegExp('\\\\n', 'g') - return text.replace(reg, '\n') -} - -var swi=function(type){ - if(type==0 || type==null ) return "POS销售"; -} - - -module.exports = { - format: format, - swi: swi -} diff --git a/pages/user/grow_value/grow_value.js b/pages/user/grow_value/grow_value.js deleted file mode 100644 index 9e6556a..0000000 --- a/pages/user/grow_value/grow_value.js +++ /dev/null @@ -1,213 +0,0 @@ -var e = getApp(),os = e.globalData.setting; -var utils = require('../../../utils/util.js'); -var regeneratorRuntime = require('../../../utils/runtime.js'); - -Page({ - /*** 页面的初始数据*/ - data: { - color_screen: "#8e8c8d", - val:0, - distance:0, - // 时间组件参数 - isPickerRender: false, - isPickerShow: false, - startTime: "", - endTime: "", - - pickerConfig: { - endDate: true, - column: "", - dateLimit: true, - initStartTime: "2019-01-01 12:32:44", - initEndTime: "2019-12-01 12:32:44", - limitStartTime: "1917-05-06 12:32:44", - limitEndTime: "2055-05-06 12:32:44" - }, - cz_val:0, //成长值 - gradeId:null, //等级ID - gradeEndDate:null, //等级结束时间 - need_money:0, //到下一级需要多少 - - value_list:null, //明细列表 - iurl:os.imghost, - cur_page:1, - is_no_more:0, - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - var need_money=options.need_money; - if(need_money>0) - this.setData({need_money:need_money}) - }, - /*** 生命周期函数--监听页面显示*/ - onShow: async function () { - - var gl_data=getApp().globalData,th=this; - var cz_val=0,gradeId=null,gradeEndDate=null,need_money=0,val_list=null,backClass=null; - - //获取成长值 - await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get",{ - data:{ storeId:os.stoid,userId:gl_data.user_id } - }).then(res=>{ - var data=res.data.data; - cz_val=data.GradeSum; - gradeId=data.GradeId; - gradeEndDate=data.gradeEndDate; - }) - - //---如果未传值需要多少钱过来的话--- - if(!th.data.need_money) { - //获取卡类列表,判断到下一级需要多少 - await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", { - data: {storeId: os.stoid} - }).then(res => { - backClass = res.data.data.pageData; - }) - for (var i in backClass) { - var im = backClass[i]; - if (cz_val < im.BuyGradeSum) { - need_money = im.BuyGradeSum; break; - } - } - } - - //--获取明细列表-- - await getApp().request.promiseGet("/api/weshop/users/grade/vipinoutgrade/page", { - data: {storeId: os.stoid,userId:gl_data.user_id,page:1,pageSize:6} - }).then(res => { - if(res.data.data) - val_list= res.data.data.pageData; - }) - - th.setData({cz_val:cz_val,gradeId:gradeId,gradeEndDate:gradeEndDate,need_money:need_money,val_list:val_list}) - - }, - - /*** 页面上拉触底事件的处理函数 */ - onReachBottom: async function () { - if(this.data.is_no_more) return; - var val_list=null,page=++this.data.cur_page, - c_val_list=this.data.val_list,th=this,gl_data=getApp().globalData; - - var d_data={storeId: os.stoid,userId:gl_data.user_id,page:page,pageSize:6}; - if(th.data.startTime && th.data.endTime ){ - d_data.beginDate=th.data.startTime; - d_data.endDate=th.data.endTime; - } - //--获取明细列表-- - await getApp().request.promiseGet("/api/weshop/users/grade/vipinoutgrade/page", { - data: d_data, - }).then(res => { - if(res.data.data) - val_list= res.data.data.pageData; - }) - if(val_list && val_list.length>0 ){ - var dd=[...c_val_list,...val_list]; - th.setData({val_list:dd}) - }else{ - th.data.is_no_more==1; - getApp().my_warnning("没有更多数据",0,th); - } - }, - - pickerShow: function () { - this.setData({ - isPickerShow: true, - isPickerRender: true, - chartHide: true, - color_screen: "#009cfe", - val:180, - distance:15, - is_show:1, - }); - }, - pickerHide: function() { - console.log("555"); - this.setData({ - isPickerShow: false, - chartHide: false, - color_screen: "#8e8c8d", - val: 0, - distance: 0, - }); - }, - bindPickerChange: function (e) { - this.getData(this.data.sensorList[e.detail.value].id); - // let startDate = util.formatTime(new Date(new Date().getTime() - 24 * 60 * 60 * 1000 * 7)); - // let endDate = util.formatTime(new Date()); - this.setData({ - index: e.detail.value, - sensorId: this.data.sensorList[e.detail.value].id - // startDate, - // endDate - }); - }, - //--选择时间-- - setPickerTime: function (val) { - let data = val.detail,gl_data=getApp().globalData,th=this; - this.setData({ - startTime: data.startTime, - endTime: data.endTime, - color_screen: "#8e8c8d", - val: 0, - distance: 0, - }); - - this.data.cur_page=1; - var d_data={storeId: os.stoid,userId:gl_data.user_id,page:1,pageSize:6}; - d_data.beginDate=th.data.startTime; - d_data.endDate=th.data.endTime; - - console.log(d_data); - - //--获取明细列表-- - getApp().request.promiseGet("/api/weshop/users/grade/vipinoutgrade/page", { - data: d_data,isShowLoading:1 - }).then(res => { - var val_list=null; - if(res.data.data) val_list=res.data.data.pageData; - if(val_list && val_list.length>0 ) { - this.setData({val_list:val_list}); - }else{ - this.setData({val_list:null}); - } - }) - - }, - - goto:function(e){ - var index=e.currentTarget.dataset.ind; - switch (index) { - case "0": getApp().goto("/pages/index/index/index");break; - case "1": getApp().goto("/packageD/pages/user/coupons/coupons"); break; - case "2": getApp().goto("/pages/user/userqy/userqy"); break; - } - }, - - reset_data:function(){ - this.data.cur_page = 1; - this.setData({ - startTime: null, - endTime: null,}); - - var gl_data = getApp().globalData; - var d_data = { storeId: os.stoid, userId: gl_data.user_id, page: 1, pageSize: 6 }; - - //--获取明细列表-- - getApp().request.promiseGet("/api/weshop/users/grade/vipinoutgrade/page", { - data: d_data, isShowLoading: 1 - }).then(res => { - var val_list = null; - if (res.data.data) val_list = res.data.data.pageData; - if (val_list && val_list.length > 0) { - this.setData({ val_list: val_list }); - } else { - this.setData({ val_list: null }); - } - }) - } - -}) \ No newline at end of file diff --git a/pages/user/grow_value/grow_value.json b/pages/user/grow_value/grow_value.json deleted file mode 100644 index 227558a..0000000 --- a/pages/user/grow_value/grow_value.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "navigationBarTitleText": "我的成长值", - "usingComponents": { - "timePicker": "/components/timePicker/timePicker", - "warn": "/components/long_warn/long_warn" - } -} \ No newline at end of file diff --git a/pages/user/grow_value/grow_value.wxml b/pages/user/grow_value/grow_value.wxml deleted file mode 100644 index 541c0bd..0000000 --- a/pages/user/grow_value/grow_value.wxml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - 当前成长值 - {{cz_val}} - 距离下一等级会员还需{{need_money-cz_val}}成长值 - - - - - - - - 成长值明细 - - 重置 - 筛选 - - - - - - - - - - - {{item.Remark?item.Remark:"未知"}} - - - {{item.BillDate}} - - - - +{{item.InGrade}} - -{{item.OutGrade}} - - - - 无成长值数据 - - - - - - \ No newline at end of file diff --git a/pages/user/grow_value/grow_value.wxss b/pages/user/grow_value/grow_value.wxss deleted file mode 100644 index d5ebb11..0000000 --- a/pages/user/grow_value/grow_value.wxss +++ /dev/null @@ -1,91 +0,0 @@ - .xc-grow-top{ - width: 100%; - height: 528rpx; - border-bottom: 15rpx solid #f2f2f2; - - } - .xc-grow-top .title-img{ - width: 100%; - height: 360rpx; - } - .xc-grow-top .explain-frame{ - top:66rpx; - left:40rpx; - - } - .xc-grow-top .explain-frame .font-grow{ - font-size:30rpx; - } - .xc-grow-top .explain-frame .val{ - font-size:46rpx; - margin-top:5rpx; - } -.xc-grow-top .explain-frame .distance-val{ - margin-top:40rpx; - font-size:26rpx; - -} -.xc-card{ - width: 668rpx; - height: 134rpx; - - left: 40rpx; - bottom:100rpx; - -} -.xc-card .card{ - width: 208rpx; - height: 100%; - border-radius:15rpx; - -} -.xc-screen-frame{ - width: 668rpx; - left: 40rpx; - bottom: 26rpx; - color: #8e8c8d; -} - .box - { - width:0px; - height:0px; - margin-left: 15rpx; - border-top:11rpx solid rgba(0,0,0,0); - border-right:10rpx solid rgba(0,0,0,0); - border-bottom:18rpx solid #8e8c8d; - border-left:10rpx solid rgba(0,0,0,0); - display: inline-block - - } - - .xc-list-frame{ - width: 688rpx; - margin-left:40rpx; - height: 645rpx; - padding-bottom:20rpx; - - } - .xc-list-frame .xc-bills-frame{ - width: 655rpx; - height: 108rpx; - border-top: 2rpx solid #f2f2f2; - border-bottom: 2rpx solid #f2f2f2; - } -.xc-list-frame .xc-bills-frame .word-number{ - font-size:30rpx; - -} - .xc-list-frame .xc-bills-frame .word-time{ - font-size: 26rpx; - } - - .xc-bills-frame .xc-val{ - color: #fe537d; - } - .intro { - margin: 30px; - text-align: center; -} - - .xc-list-frame .no_text{ text-align: center; color: #eee; margin-top: 30rpx; color: #8e8c8d; font-size: 30rpx } - .reset_img{ position: relative; top:2rpx} \ No newline at end of file diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 10463d3..cb9194b 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -822,7 +822,7 @@ Page({ }, jump: function () { - getApp().goto("/pages/user/grow_value/grow_value") + getApp().goto("/packageE/pages/user/grow_value/grow_value") }, // 判断生日营销的页面是不是存在 birthday: function () { diff --git a/pages/user/labels/labels.js b/pages/user/labels/labels.js deleted file mode 100644 index 5666231..0000000 --- a/pages/user/labels/labels.js +++ /dev/null @@ -1,298 +0,0 @@ -var e = getApp(), - a = e.globalData.setting, - os = a, - t = e.request, - d = e.globalData; -Page({ - - /** - * 页面的初始数据 - */ - data: { - url: a.url, //接口网址 - iurl: a.imghost, //图片前缀网址 - interest_lables: [], //兴趣标签 - check_label: [], //用户选中的标签集合 - user_label_val: "", //奖励多少 - user_label_type: "", //奖励类型（1积分，1成长值） - is_modify: 0, //判断是第一次填写还是修改（0填写，1修改） - isread: 0, //是否读取 - is_check: 0, //是否重复提交 - }, - //点击选择兴趣标签把值放到已选中 - click_label: function(e) { - var th = this; - var index = e.currentTarget.dataset.index; //选择兴趣标签的下标 - var labels = th.data.interest_lables; //兴趣标签数组 - var check_label = th.data.check_label; //已选中的数组 - var labels_cid = th.data.interest_lables[index].check; //当前标签是否选中 - var labels_check = 'interest_lables[' + index + '].check'; //用于点击标签把点击状态赋值进去 - if (labels_cid) { - labels_cid = 0; - for (var i = 0; i < check_label.length; i++) { - if (labels[index].id == check_label[i].id) { - check_label.splice(i, 1); - } - } - th.setData({ - [labels_check]: labels_cid, - check_label: check_label - }) - } else { - if (check_label.length > 9) { - getApp().my_warnning("最多可选10个哦", 0, th); - } else { - var check_new = { - lable: labels[index] - }; - labels_cid = 1; - check_label.push(labels[index]); - } - th.setData({ - [labels_check]: labels_cid, - check_label: check_label - }) - } - - }, - //获取配置信息 - get_config: function() { - var th = this; - getApp().getConfig2(function(ee) { - var sms_conf = ee.switch_list; - sms_conf = JSON.parse(sms_conf); - var getuser_label_type = 1; - var getuser_label_val = 0; - if (sms_conf.user_label_type != undefined) { - getuser_label_type = parseInt(sms_conf.user_label_type) + 1; - } - if (sms_conf.user_label_val != undefined) { - getuser_label_val = sms_conf.user_label_val; - } - - - th.setData({ - user_label_val: getuser_label_val, - user_label_type: getuser_label_type - }) - }) - }, - //页面跳转 - goto: function(e) { - var th = this; - wx.navigateBack({ //返回 - delta: 1 - }) - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function(options) { - var th = this; - var pages = getCurrentPages(); - var prevPage = pages[pages.length - 2]; //上一个页面 - //直接调用上一个页面的setData()方法，把数据存到上一个页面中去 - prevPage.setData({ - is_zy: 1 - }) - th.query_nolabels(); - th.get_config(); - }, - //获取标签集合 - query_nolabels: function() { - var th = this; - var url = "/api/weshop/marketing/holiday/vip/interest/label/page"; - var interest_lables = th.data.interest_lables; //兴趣标签集合 - getApp().request.promiseGet(url, { - data: { - storeId: a.stoid, - pageSize: 50, - page: 1 - } - }).then(res => { - if (res.data.code == 0) { - th.setData({ - interest_lables: res.data.data.pageData, - isread: 1 - }) - th.query_checklabels(); - } else { - getApp().my_warnning("系统繁忙,请稍后再试", 0, th); - th.setData({ - isread: 1 - }) - return false; - } - }) - }, - //查找会员选择的兴趣标签 - query_checklabels: function() { - var th = this; - var url = "/api/weshop/marketing/holiday/vip/interest/label/get"; - var interest_lables = th.data.interest_lables; //兴趣标签 - getApp().request.promiseGet(url, { - data: { - userId: d.user_id, - storeId: a.stoid - } - }).then(res => { - if (res.data.code == 0) { - var data = res.data.data; - var arr = []; - var VipLabelId = []; //通过id标签找到已选择的标签 - var dateList = data.VipLabelId.split(","); - for (var i in dateList) { - VipLabelId = VipLabelId.concat(dateList[i]); - } - if (VipLabelId.length > 0) { - for (var i = 0; i < interest_lables.length; i++) { - for (var ii = 0; ii < VipLabelId.length; ii++) { - if (interest_lables[i].id == VipLabelId[ii]) { - interest_lables[i].check = 1; - arr.push(interest_lables[i]); - } - } - } - } - //如何有之前有选择兴趣标签的话，再进来的话就是修改 - if (data.VipLabelId != '') { - th.setData({ - is_modify: 1 - }) - } - th.setData({ - check_label: arr, - interest_lables: interest_lables - }) - } else { - getApp().my_warnning("系统繁忙，请稍后再试", 0, th); - return false; - } - }) - }, - //更新会员兴趣标签 - update_label: function() { - var th = this; - var is_modify = th.data.is_modify; //是否是修改 - var check_label = th.data.check_label; //用户选择 - var user_label_val = th.data.user_label_val; //选择标签奖励多少 - var remark = "领取"; - var user_label_type = th.data.user_label_type; //赠送类型 - var is_check = th.data.is_check; //是否重复提交 - var i = 0; - if (is_modify) { - user_label_type = 0; - remark = "修改"; - user_label_val = 0; - } - if (is_check==1) { - getApp().my_warnning("请勿重复提交", 0, th); - } - if (is_check == 0) { - if (check_label.length < 1) { - getApp().my_warnning("完成兴趣标签才能" + remark + "哦~", 0, th); - th.setData({ - is_check: 0 - }) - } else { - th.setData({ - is_check: 1 - }) - - var url = "/api/weshop/marketing/holiday/vip/interest/label/update"; //更新标签接口地址 - var nav_url = "/pages/user/userinfo/userinfo"; //领取成功之后跳转页面 - var vipLabel = ""; //选择的标签名称 - var vipLabelId = ""; //选择的标签id - var arr = []; - for (var i = 0; i < check_label.length; i++) { - if (i < check_label.length - 1) { - vipLabelId += check_label[i].id + ","; - vipLabel += check_label[i].LabelName + ","; - arr.push(check_label[i].LabelName); - } else { - vipLabelId += check_label[i].id; - vipLabel += check_label[i].LabelName; - arr.push(check_label[i].LabelName); - } - } - var my_confirm = th.selectComponent("#my_confirm"); //组件的id - remark = "兴趣标签赠送"; - if (is_modify) { - - my_confirm.open_cancel(0); - getApp().request.put(url, { - data: { - "storeId": a.stoid, - "userId": d.user_id, - "vipLabel": vipLabel, - "vipLabelId": vipLabelId, - "type": user_label_type, - "remark": remark, - "value": user_label_val, - "fromType": "REWARD" - }, - success: function(res) { - if (res.data.code == 0) { - getApp().my_warnning("修改成功", 1, th); - setTimeout(function() { - var pages = getCurrentPages(); - var prevPage = pages[pages.length - 2]; //上一个页面 - //直接调用上一个页面的setData()方法，把数据存到上一个页面中去 - prevPage.setData({ - check_label: arr - }) - th.goto(); - }, 2000); - } else { - getApp().my_warnning("系统繁忙,请稍后再试", 0, th); - th.setData({ - is_check: 0 - }) - } - } - }) - - } else { - - getApp().request.put(url, { - data: { - "storeId": a.stoid, - "userId": d.user_id, - "vipLabel": vipLabel, - "vipLabelId": vipLabelId, - "type": user_label_type, - "remark": remark, - "value": user_label_val, - "fromType": "REWARD" - }, - success: function(res) { - if (res.data.code == 0) { - getApp().my_warnning("领取成功", 1, th); - setTimeout(function() { - var pages = getCurrentPages(); - var prevPage = pages[pages.length - 2]; //上一个页面 - //直接调用上一个页面的setData()方法，把数据存到上一个页面中去 - prevPage.setData({ - check_label: arr - }) - th.goto(); - }, 2000); - } else { - getApp().my_warnning("系统繁忙,请稍后再试", 0, th); - th.setData({ - is_check: 0 - }) - } - } - }) - } - } - } - }, - /** - * 生命周期函数--监听页面显示 - */ - onShow: function() { - - } -}) \ No newline at end of file diff --git a/pages/user/labels/labels.json b/pages/user/labels/labels.json deleted file mode 100644 index 12d96e4..0000000 --- a/pages/user/labels/labels.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "navigationBarTitleText": "兴趣标签", - "usingComponents": { - "warn": "/components/long_warn/long_warn", - "my_confirm": "/components/my_confirm/my_confirm" - } -} \ No newline at end of file diff --git a/pages/user/labels/labels.wxml b/pages/user/labels/labels.wxml deleted file mode 100644 index 6d46152..0000000 --- a/pages/user/labels/labels.wxml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - 兴趣标签 - - 关闭 - - - - - - - - - {{item.LabelName}} - - - - - - - - 已选中 - - - - {{it.LabelName}} - - - - - - - - - - 确定选择 - - - 领取{{user_label_val}}积分 - - - 领取{{user_label_val}}成长值 - - - - - - 提交修改 - - - - - - - - - - - - 商家还未设置标签，敬请期待！ - - - - - - - \ No newline at end of file diff --git a/pages/user/labels/labels.wxss b/pages/user/labels/labels.wxss deleted file mode 100644 index fcfa1c4..0000000 --- a/pages/user/labels/labels.wxss +++ /dev/null @@ -1,98 +0,0 @@ -page{ - height: 100%; -} -.padding { - padding: 0rpx 65rpx; -} - -.container { - border-top: 6rpx solid rgb(238, 238, 238); - height: 100%; - display: block; -} -.lables{ - height: 50%; -} -.labels_head { - padding-top: 45rpx; - padding-bottom: 25rpx; - border-bottom: 3rpx solid rgb(238, 238, 238); -} - -.skip { - width: 100rpx; - height: 40rpx; - line-height: 45rpx; - border: 2rpx solid rgb(155, 155, 155); - border-radius: 30rpx; - color: rgb(153, 153, 153); -} - -.label_aggregate { - height: 66%; - padding-top: 27rpx; - overflow-y: scroll; -} - -.label { - display: inline-block; - max-width: 200rpx; - height: 46rpx; - line-height: 46rpx; - border: 2rpx solid rgb(204, 204, 204); - border-radius: 30rpx; - padding: 0rpx 30rpx; - margin-right: 25rpx; - margin-bottom: 3%; -} -.click{ - color: rgb(255,255,255); - border: 2rpx solid rgb(255, 138, 160); - background-color: rgb(255, 138, 160); -} -.check_head { - padding-top: 10rpx; - padding-bottom: 25rpx; - border-bottom: 3rpx solid rgb(238, 238, 238); - margin-bottom: 30rpx; -} - -.check_label { - display: inline-block; - max-width: 200rpx; - height: 46rpx; - border: 2rpx solid rgb(255, 138, 160); - line-height: 46rpx; - margin-right: 25rpx; - margin-bottom: 3%; - padding: 0rpx 30rpx; - border-radius: 30rpx; - color: rgb(255, 255, 255); - background-color: rgb(255, 138, 160); -} -.receive{ - position: fixed; - bottom:60rpx; - left: 65rpx; - width: 620rpx; - height: 70rpx; - line-height: 70rpx; - background-color: rgb(255, 138, 160); - color: rgb(255, 255, 255); - border-radius: 40rpx; -} -.check_labels{ - height: 80%; - overflow-y: scroll; -} -.check_item{ - height: 30%; -} -.no_labels{ - width: 290rpx; - height: 220rpx; - margin-bottom:40rpx; -} -.backcolor{ - background-color: rgb(204, 204, 204); -} \ No newline at end of file diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml index cf1af24..163350c 100644 --- a/pages/user/userinfo/userinfo.wxml +++ b/pages/user/userinfo/userinfo.wxml @@ -246,7 +246,7 @@ - + 我的兴趣 ∟ @@ -258,7 +258,7 @@ - + + 标签 diff --git a/pages/user/userqy/userqy.js b/pages/user/userqy/userqy.js index f0f6af4..90bc7ca 100644 --- a/pages/user/userqy/userqy.js +++ b/pages/user/userqy/userqy.js @@ -218,7 +218,7 @@ Page({ }, go_cz:function(){ - getApp().goto("/pages/user/grow_value/grow_value") + getApp().goto("/packageE/pages/user/grow_value/grow_value") }, //获取卡类的gr_id -- libgit2 0.21.4