diff --git a/app.json b/app.json index d96d9ae..b3a082a 100644 --- a/app.json +++ b/app.json @@ -237,7 +237,8 @@ "pages/order/refund_order/refund_order", "pages/payment/payment/payment", "pages/user/my_service/tment_details", - "pages/user/my_service/tment_eval" + "pages/user/my_service/tment_eval", + "pages/user_template/index" ] } ], diff --git a/components/com_top_nav/com_top_nav.js b/components/com_top_nav/com_top_nav.js index a111153..10f442e 100644 --- a/components/com_top_nav/com_top_nav.js +++ b/components/com_top_nav/com_top_nav.js @@ -23,7 +23,7 @@ Component({ }, ready: function() { let height= getApp().globalData.navBarHeight; - let menuInfo = getApp().globalData.menuInfo; + let menuInfo = getApp().globalData.menuInfo || {height:0}; let user_no=''; if(getApp().globalData.userInfo){ user_no=getApp().globalData.userInfo.erpvipno diff --git a/components/diy_user_info/diy_user_info.js b/components/diy_user_info/diy_user_info.js new file mode 100644 index 0000000..5de9714 --- /dev/null +++ b/components/diy_user_info/diy_user_info.js @@ -0,0 +1,183 @@ +const rq = require("../../utils/request.js"); +const ut = require("../../utils/util.js"); +const {qrcode} = require("../../utils/index.js"); +var s = getApp().globalData.setting; +var r=s; +Component({ + properties: { + object: { + type: Object, + value: null + }, + qy_data:{ + type: Object, + value: null + }, + pulscardname:{ + type:String, + value:"--" + }, + rfmName:{ + type:String, + value:"--" + }, + yuer:{ + type:Number, + value:0 + }, + byquan:{ + type:Number, + value:0 + }, + udata:{ + type: Object, + value: null + }, + + }, + data: { + // 这里是一些组件内部数据 + iurl: s.imghost, + defaultAvatar: s.imghost + "/miniapp/images/no-head.jpg", + userInfo:null, + + sys_switch:null, + tc_hide:true, //会员卡的弹出层隐藏 + }, + + ready: function() { + var th=this; + if(getApp().globalData.userInfo){ + this.setData({userInfo:getApp().globalData.userInfo}); + } + /*-------系统是否开通等级卡，会员是等级卡-----*/ + getApp().getConfig2(function (e) { + var t_swi = e.switch_list; + if (t_swi) t_swi = JSON.parse(t_swi) + if (t_swi) { + th.setData({sys_switch: t_swi}); + } + var getuserqy_color=e.userqy_color; + if (getuserqy_color) getuserqy_color = JSON.parse(getuserqy_color) + if(getuserqy_color){ + th.setData({userqy_color:getuserqy_color}) + } + }) + + }, + + pageLifetimes: { + //要处理一下，游客登录后的界面的变化,主要还该是改变会员 + show: function () { + if(!this.data.userInfo && getApp().globalData.userInfo){ + this.setData({userInfo:getApp().globalData.userInfo}); + } + } + }, + + methods: { + //登陆会员 + login_user(){ + getApp().goto('/packageE/pages/togoin/togoin'); + }, + //------卡片的显示和关闭-------- + show_tc: function () { + var that=this; + if (!this.data.userInfo) return false; + var getnowtime; + getApp().request.get("/api/weshop/users/getServerTime", { + success: function (res) { + if (res.data.code == 0) + { + getnowtime=res.data.data; + if (!getnowtime) + { + ut.m_toast("获取服务时间失败"); + return; + } + //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s') + var val = that.data.userInfo.mobile + "|" +getnowtime+"|"+that.data.getusercode_vailtime; + val = "^" + ut.base64_encode(val); + + qrcode('qrcode', val, 480, 480, that); + that.setData({ + tc_hide: false, + }); + } + } + }) + }, + //隐藏会员卡 + hide_tc: function () { + this.setData({ + tc_hide: true, + }); + }, + + //--跳转到预存款页面-- + deposit: function () { + if (!this.data.userInfo) + { + this.login_user(); + return false; + } + wx.navigateTo({ + url: '/packageD/pages/user/deposit/deposit', + }) + }, + //--跳转到余额页面-- + balance: function () { + if (!this.data.userInfo) + { + this.login_user(); + return false; + }; + wx.navigateTo({ + url: '/packageD/pages/user/member/menber', + }) + }, + //--跳转到优惠券-- + coupon: function () { + var th = this; + if (!this.data.userInfo) + { + this.login_user(); + return false; + }; + // th.sendsm(); + wx.navigateTo({ + url: '/packageD/pages/user/coupons/coupons', + }) + }, + //--跳转到积分-- + integral: function () { + if (!this.data.userInfo) + { + this.login_user(); + return false; + } + wx.navigateTo({ + url: '/packageD/pages/user/integral/integral', + }) + }, + + jump: function () { + let isRfm = wx.getStorageSync('isRfm') + //升级为RFM就不跳转成长值详情 + if (!isRfm) { + getApp().goto("/packageE/pages/user/grow_value/grow_value") + } + }, + + //跳转到链接 + goto: function (e) { + console.log(e); + console.log('跳转'); + var url = e.currentTarget.dataset.url; + wx.navigateTo({ url: url }) + + }, + + + } +}) \ No newline at end of file diff --git a/components/diy_user_info/diy_user_info.json b/components/diy_user_info/diy_user_info.json new file mode 100644 index 0000000..9e7089c --- /dev/null +++ b/components/diy_user_info/diy_user_info.json @@ -0,0 +1,3 @@ +{ + "component": true + } \ No newline at end of file diff --git a/components/diy_user_info/diy_user_info.wxml b/components/diy_user_info/diy_user_info.wxml new file mode 100644 index 0000000..ea93ec3 --- /dev/null +++ b/components/diy_user_info/diy_user_info.wxml @@ -0,0 +1,83 @@ + + + + + + s + + + s + + + s + + + + + + + + + + + + + + + + + + + + + + + + + + 加入plus会员预计可省3031元 + + + 立即开通 + + + + + + + + + 加入plus会员预计可省3031元 + + + 立即续费 + + + + + + + + + \ No newline at end of file diff --git a/components/diy_user_info/diy_user_info.wxss b/components/diy_user_info/diy_user_info.wxss new file mode 100644 index 0000000..376e708 --- /dev/null +++ b/components/diy_user_info/diy_user_info.wxss @@ -0,0 +1,234 @@ +@import '../../app.wxss'; +.addplus { + width: 100%; +} +.xc-add-member-farem { + width: 100%; + height: 84rpx; +} +.xc-add-member { + background-size: 100%; + margin-top: 10rpx; + color: rgb(238, 205, 172); + width: 730rpx; + height: 90rpx; + border-radius: 15rpx 15rpx 0 0; + background: url("data:image/jpeg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAABkAAD/4QN6aHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjUtYzAxNCA3OS4xNTE0ODEsIDIwMTMvMDMvMTMtMTI6MDk6MTUgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6MDhlYTAxZTktZGVjMy00MTc1LWE4MzEtNWQ0NjFhNWIzOGRjIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjdEMDAzN0JDRjNBQTExRTk4QjYzRjhEM0E3NkM1REQ0IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjdEMDAzN0JCRjNBQTExRTk4QjYzRjhEM0E3NkM1REQ0IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDQyAoV2luZG93cykiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo4NGY5ODE2MS1mMjVjLWIzNDItOGYxNi1lMTNkY2Q2ZDJiMDgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MDhlYTAxZTktZGVjMy00MTc1LWE4MzEtNWQ0NjFhNWIzOGRjIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3Jk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") no-repeat center; +} +.xc-add-member .xc-icon { + width: 30rpx; + height: 30rpx; +} +.xc-add-member .member { + margin-left: 10rpx; +} + +.xc-opening { + border-radius: 20rpx; + background: rgb(238, 205, 172); + height: 34rpx; + line-height: 34rpx; + color: #000; + padding-left: 15rpx; + padding-right: 17rpx; + padding: 5rpx 18rpx 5rpx 15rpx; +} + + +/*-- 头部 --*/ +.xc-user .xc-head { + height: 380rpx; +} + +.xc-background { + width:100%; + height: 100%; +} + +.xc-user-frame { + width: 83%; + height: 35%; + top: 44rpx; + left: 56rpx; +} +.xc-user-left { + height: 110rpx; + margin-top: 10rpx; + margin-left: 5rpx; +} +.xc-user-img { + width: 110rpx; + height: 110rpx; +} + +/*等级卡有关*/ +.plusMax { + background: linear-gradient(to bottom, #4c3217, #010100); + height: 40rpx; + border-radius: 20rpx; + line-height: 40rpx; + padding-left: 15rpx; + padding-right: 15rpx; + font-size: 20rpx; + position: absolute; + left: 50%; + bottom: -20rpx; + white-space: nowrap; + transform: translate(-50%, 0); + color: #fff; +} +.fuls { + width: 25rpx; + height: 25rpx; + margin-right: 5rpx; +} +.xc-uesr-name { + color: #fff; + font-size: 32rpx; + margin-top: 17rpx; + margin-left: 20rpx; +} +.hvip { + display: inline-block; + font-size: 20rpx; + height: 40rpx; + line-height: 40rpx; + color: #e7bf77; + background: #383838; + padding: 0 15rpx; + border-radius: 20rpx; + margin-left: 5rpx; +} +.vip-mem { + width: 26rpx; + height: 23rpx; + vertical-align: top; + margin-top: 8rpx; + margin-right: 5rpx; +} +.grow-up-val { + /* padding:1rpx 13rpx 1rpx 13rpx; */ + border-radius: 20rpx; + background: #ffbdce; + padding-left: 16rpx; + padding-right: 16rpx; + padding-bottom: 3rpx; + margin-right: 5rpx; +} +.xc-assets { + width: 94%; + bottom: 26rpx; + color: #fff; + line-height: 46rpx; + margin-left: 10rpx; +} + + +.xc-qrcode-frame { + /* border-radius: 10rpx; + border: 5rpx solid #fe9db5; + background: #fe9db5; + width: 70rpx; + height: 70rpx; */ + top: 40rpx; + right: 40rpx; +} + +.xc-qrcode { + border-radius: 10rpx; + border: 5rpx solid #fe9db5; + background: #fe9db5; + width: 70rpx; + height: 70rpx; +} + +/*---弹出层---*/ +.modal-box { + position: fixed; + width: 100%; + height: 100%; + top: 0px; + background: rgba(0, 0, 0, 0.4); + overflow: hidden; +} + +.modal-body { + position: fixed; + top: 0; + bottom: 0; + left: 0; + right: 0; + margin: auto; + z-index: 100; + background: #fff; + /* margin-left: 73rpx; */ + width: 600rpx; + height: 860rpx; + border-radius: 8px; + text-align: center; +} + +.modal-content { + width: 480rpx; + margin: 0 auto; + margin-top: 60rpx; + overflow: hidden; +} + +.modal-content .hd_img { + width: 170rpx; + height: 170rpx; + border-radius: 5px; +} + +.ctent_txt { + margin-left: 30rpx; + text-align: left; +} + +.txt1 { + font-size: 34rpx; + font-weight: bold; +} + +.txt2 { + font-size: 30rpx; + color: #999; + margin-top: 20rpx; +} + +.arrow-right { + width: 20rpx; + height: 40rpx; + position: relative; + top: 13rpx; + margin-left: 20rpx; +} + +.m_ta { + margin-top: 50rpx; +} + +.g_img { + width: 480rpx; + height: 480rpx; +} + +.s_sao { + font-size: 27rpx; + margin-top: 25rpx; +} + +.gr_box { + position: relative; + height: 16rpx; + background-color: #fff; + border-radius: 8rpx; + overflow: hidden; +} +.gr_box_item{ + height: 16rpx; + background-color: #999; +} + + diff --git a/components/diy_user_info/style1.wxml b/components/diy_user_info/style1.wxml new file mode 100644 index 0000000..88bb7a9 --- /dev/null +++ b/components/diy_user_info/style1.wxml @@ -0,0 +1,96 @@ + + + + + + + + + + + + {{pulscardname}} + + + + + + + {{userInfo.nickname}} + + + {{qy_data.GradeName}} + + + + + {{" "}} + {{rfmName}} + {{qy_data.cz_val}} / {{qy_data.need_money}} + + + {{" "}} + + {{rfmName}}{{cz_val}} + + + + + + + + + + + + 请点击注册 + + + + + + + 会员卡 + + + + + + + + + + + + {{yuer?yuer:0}} + 余额 + + + + {{udata.Balance?udata.Balance:0}} + 储值款 + + + + {{udata.Integral?udata.Integral:0}} + 积分 + + + + {{udata.CashCount+byquan?udata.CashCount+byquan:0}} + 优惠券 + + + + + + + \ No newline at end of file diff --git a/components/diy_user_info/style2.wxml b/components/diy_user_info/style2.wxml new file mode 100644 index 0000000..e8c4ac6 --- /dev/null +++ b/components/diy_user_info/style2.wxml @@ -0,0 +1,94 @@ + + + + + + + + + + {{pulscardname}} + + + + + + + + {{userInfo.nickname}} + + + {{qy_data.GradeName}} + + + + + {{" "}} + {{rfmName}} + {{qy_data.cz_val}} / {{qy_data.need_money}} + + + {{" "}} + {{rfmName}} {{cz_val}} + + + + + + + + + + + + 请点击注册 + + + + + + + 会员卡 + + + + + + + + + + + + {{yuer?yuer:0}} + 余额 + + + + {{udata.Balance?udata.Balance:0}} + 储值款 + + + + {{udata.Integral?udata.Integral:0}} + 积分 + + + + {{udata.CashCount+byquan?udata.CashCount+byquan:0}} + 优惠券 + + + + + + + \ No newline at end of file diff --git a/components/diy_user_info/style3.wxml b/components/diy_user_info/style3.wxml new file mode 100644 index 0000000..769e373 --- /dev/null +++ b/components/diy_user_info/style3.wxml @@ -0,0 +1,89 @@ + + + + + {{userInfo.nickname}} + + + + {{qy_data.GradeName}} + + + + + + + 距{{qy_data.nextGradeName}}还有{{qy_data.need_money-qy_data.cz_val}} + + + + + + + + + + + + + + + 请点击注册 + + + + + + + + + + + {{pulscardname}} + + + + + + + + + + + + + + + {{yuer?yuer:0}} + 余额 + + + + {{udata.Balance?udata.Balance:0}} + 储值款 + + + + {{udata.Integral?udata.Integral:0}} + 积分 + + + + {{udata.CashCount+byquan?udata.CashCount+byquan:0}} + 优惠券 + + + + + + + \ No newline at end of file diff --git a/components/diy_user_my_rights/diy_user_my_rights.js b/components/diy_user_my_rights/diy_user_my_rights.js new file mode 100644 index 0000000..4867e23 --- /dev/null +++ b/components/diy_user_my_rights/diy_user_my_rights.js @@ -0,0 +1,61 @@ +var os = getApp().globalData.setting; +Component({ + properties: { + object: { + type: Object, + value: null + }, + qy_data:{ + type: Object, + value: null + }, + b_gift:{ + type: Object, + value: null + }, + }, + data: { + iurl:os.imghost, + qy_list:[] + }, + methods: { + + // + clike_banne: function () { + var th = this; + var actId = th.properties.b_gift.actId; + var giftbagid = th.properties.b_gift.giftbagid; + + if (actId != "" && giftbagid != "") { + getApp().goto("/pages/giftpack/birthdaygift/birthdaygift?actId=" + actId + "&gifbagid=" + giftbagid + "&orderType=" + 3); + } else { + getApp().showWarning("请稍后重试"); + } + }, + + //--跳转到权益页面-- + go_qy: function () { + if (!getApp().globalData.userInfo) return false; + var url = "/pages/user/userqy/userqy"; + getApp().goto(url); + }, + }, + observers: { + // 监听 num1 和 num2 数据的变化 + 'qy_data': function(obj){ + console.log(1111); + console.log(obj); + if(obj){ + //4个4个一组 + let arr = new Array(); + let ater=this.properties.object.show_num; + let arr_data= this.properties.qy_data.old_qy_list + for (let i = 0; i < arr_data.length; i += ater) { + arr.push(arr_data.slice(i, i + ater)); + } + this.setData({qy_list:arr}) + } + } + }, + +}) \ No newline at end of file diff --git a/components/diy_user_my_rights/diy_user_my_rights.json b/components/diy_user_my_rights/diy_user_my_rights.json new file mode 100644 index 0000000..9e7089c --- /dev/null +++ b/components/diy_user_my_rights/diy_user_my_rights.json @@ -0,0 +1,3 @@ +{ + "component": true + } \ No newline at end of file diff --git a/components/diy_user_my_rights/diy_user_my_rights.wxml b/components/diy_user_my_rights/diy_user_my_rights.wxml new file mode 100644 index 0000000..650a414 --- /dev/null +++ b/components/diy_user_my_rights/diy_user_my_rights.wxml @@ -0,0 +1,59 @@ + + + + + + + 我的权益 + + + + 更多 + + + + + + + + + + + + + + + + + + + + + + + {{item.PrivilegeName}} + + + + + + + + + + + + + 未找到数据 + + + + + + + + \ No newline at end of file diff --git a/components/diy_user_my_rights/diy_user_my_rights.wxss b/components/diy_user_my_rights/diy_user_my_rights.wxss new file mode 100644 index 0000000..6071e1c --- /dev/null +++ b/components/diy_user_my_rights/diy_user_my_rights.wxss @@ -0,0 +1,105 @@ +@import '../../app.wxss'; +/* 我的权益 */ +.xc-my-equity-frame { + width: 100%; + height: 248rpx; +} + +.xc-equity-title { + width: 100%; + height: 79rpx; + border-bottom: 1rpx solid #f2f2f2; +} + +.xc-title-frame { + width: 85%; + height: 100%; +} + +.xc-title-img { + width: 50rpx; + height: 50rpx; + margin-left: 20rpx; +} + +.xc-title-content { + height: 100%; +} + +.xc-more { + color: #878787; +} + +.xc-more-frame { + width: 16.1%; + height: 100%; +} + + +.xc-more-click { + width: 15rpx; + height: 15rpx; + margin-left: 10rpx; + color: #898989; +} + +.bg_right.bcolor, +.bg_left.bcolor { + border-color: #333; +} + +.bg_right.mt { + margin-top: -9rpx; +} + +.bg_right.mt2 { + margin-top: -5rpx; +} + + +.xc-specific-more-frame { + width: 100%; + height: 169rpx; + padding-left: 43rpx; +} + +.xc-specific-more-frame .xc-left { + width: 20rpx; + height: 20rpx; +} + +.xc-specific-more-frame .xc-middle { + width: 100%; + margin-left: 2%; + height:100%; + align-items: center; +} +.xc-center-frame { + width: 20%; + margin-right: 5%; +} +.xc-center-img { + width: 60rpx; + height: 60rpx; +} + +/*---生日营销的显示 ---*/ +.banner-img { + width: 95%; + height: 140rpx; + border-radius: 10px 10px 0px 0px; + margin-bottom: -5rpx; + +} + +.banner-frame { + width: 100%; + background: #f2f2f2; + padding-top: 20rpx; +} + +button::after { + border: 0 +} + + diff --git a/components/diy_user_order/diy_user_order.js b/components/diy_user_order/diy_user_order.js new file mode 100644 index 0000000..12c6583 --- /dev/null +++ b/components/diy_user_order/diy_user_order.js @@ -0,0 +1,33 @@ +var os = getApp().globalData.setting; +Component({ + properties: { + object: { + type: Object, + value: null + }, + // 统计相关的 + toji:{ + type: Object, + value: null + }, + + }, + data: { + iurl:os.imghost, + }, + methods: { + + //跳转到订单的优化 + go_order: function (e) { + if (!getApp().globalData.user_id) + { + getApp().goto('/packageE/pages/togoin/togoin'); + return false; + }; + var url = e.currentTarget.dataset.url; + wx.navigateTo({ + url: url, + }) + }, + } +}) \ No newline at end of file diff --git a/components/diy_user_order/diy_user_order.json b/components/diy_user_order/diy_user_order.json new file mode 100644 index 0000000..9e7089c --- /dev/null +++ b/components/diy_user_order/diy_user_order.json @@ -0,0 +1,3 @@ +{ + "component": true + } \ No newline at end of file diff --git a/components/diy_user_order/diy_user_order.wxml b/components/diy_user_order/diy_user_order.wxml new file mode 100644 index 0000000..55249dd --- /dev/null +++ b/components/diy_user_order/diy_user_order.wxml @@ -0,0 +1,64 @@ + + + + + + + 我的订单 + + + 您有{{countDadaOrder}}个同城配送订单 + + + 更多 + + + + + + + + + + + + 待付款 + + + + + + + 待发货 + + + + + + + + 待收货 + + + + + + + + 待评论 + + + + + + + + + 售后/退款 + + + + + + + diff --git a/components/diy_user_order/diy_user_order.wxss b/components/diy_user_order/diy_user_order.wxss new file mode 100644 index 0000000..90c0118 --- /dev/null +++ b/components/diy_user_order/diy_user_order.wxss @@ -0,0 +1,92 @@ +@import '../../app.wxss'; +.xc-after-sale { + width: 100%; +} +.xc-after-sale-left { + width: 96%; + height: 100%; + margin-top: 40rpx; + margin-bottom: 25rpx; +} + +.xc-equity-title { + width: 100%; + height: 79rpx; + border-bottom: 1rpx solid #f2f2f2; +} +.xc-title-img { + width: 50rpx; + height: 50rpx; + margin-left: 20rpx; +} + + +.xc-title-frame { + width: 85%; + height: 100%; +} +.xc-title-content { + height: 100%; +} +.xc-more-frame { + width: 16.1%; + height: 100%; +} +.xc-more { + color: #878787; +} + +.xc-more-click { + width: 15rpx; + height: 15rpx; + margin-left: 10rpx; + color: #898989; +} + + +.bg_right.bcolor, +.bg_left.bcolor { + border-color: #333; +} + +.bg_right.mt { + margin-top: -9rpx; +} + +.bg_right.mt2 { + margin-top: -5rpx; +} + +.xc-no-money { + width: auto; + height: 50rpx; +} + +.xc-send { + width: auto; + height: 50rpx; +} +.xc-await { + width: auto; + height: 50rpx; +} + + +.xc-word-color { + color: #595758; + top: 61rpx; + width: 110rpx; + right: -28rpx; +} +.order-num { + position: absolute; + right: 0rpx; + top: -18rpx; + width: 35rpx; + height: 35rpx; + line-height: 35rpx; + font-size: 22rpx; + border-radius: 50%; + background-color: rgba(217, 81, 99, 0.9); + color: #fff; +} diff --git a/components/diy_user_tools_services/diy_user_tools_services.js b/components/diy_user_tools_services/diy_user_tools_services.js new file mode 100644 index 0000000..4935ff6 --- /dev/null +++ b/components/diy_user_tools_services/diy_user_tools_services.js @@ -0,0 +1,250 @@ +const ut = require("../../utils/util.js"); +var os = getApp().globalData.setting; +Component({ + properties: { + object: { + type: Object, + value: null + }, + f_user_tool: { + type: Object, + value: null + }, + c_list: { + type: Object, + value: null + }, + qy_data: { + type: Object, + value: null + }, + // 这里定义了innerText属性，属性值可以在组件使用时指定 + //-- 是不是初始化了 -- + is_dengji:{ + type:Number, + value:0 + }, + //-- 是不是有助力活动 -- + is_assistance:{ + type:Number, + value:0 + }, + enableMeiye:{ + type:Number, + value:0 + } + }, + + data: { + iurl:os.imghost, + sys_switch:null, + userInfo:null, + hiddenCS: true, + }, + + ready: function() { + + var th=this; + + if(getApp().globalData.userInfo){ + this.setData({userInfo:getApp().globalData.userInfo}); + } + + /*-------系统是否开通等级卡，会员是等级卡-----*/ + getApp().getConfig2(function (e) { + var t_swi = e.switch_list; + if (t_swi) t_swi = JSON.parse(t_swi) + if (t_swi) { + th.setData({sys_switch: t_swi}); + } + }) + let img_host=this.data.iurl; + + }, + + methods: { + // 这里是一个自定义方法 + goto_nav: function (e) { + var th = this; + var url = e.currentTarget.dataset.url; + if (th.data.userInfo != null) { + console.log('跳转'); + getApp().goto(url); + } else { + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + } + }, + //跳转到链接 + goto: function (e) { + console.log(e); + console.log('跳转'); + var url = e.currentTarget.dataset.url; + wx.navigateTo({ url: url }) + // getApp().goto(url); + }, + //--跳转到权益页面-- + go_qy: function () { + if (!this.data.userInfo) return false; + var url = "/pages/user/userqy/userqy"; + getApp().goto(url); + }, + + openCS() { + let self=this; + // 判断会员状态 + let user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) { + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + return false; + }; + // csType/在线客服设置： + // 0关闭（如果有设置热线电话，则显示拨打热线电话）、 + // 1小程序客服、 + // 2企业微信客服 + if (this.data.sys_switch) { + let csType = this.data.sys_switch.weapp_customertype; + if (csType == 0) { + // 拨打电话号码 + this.contactService(); + } else { + this.getTel() + .then(() => { + self.setData({ + hiddenCS: false, + }); + }); + } + } + }, + + //---------联系客服------------ + contactService: function () { + getApp().com_call(this); + }, + + //关闭客服操作菜单 + closeCS() { + this.setData({ + hiddenCS: true, + }); + }, + + //添加卡包 + addcard: function () { + var res = this.data.add_card_data; + if (!res) return false; + + var arr = new Array(6) + arr[0] = res.code; + arr[1] = res.timestamp; + arr[2] = res.jsapiTicket; + arr[3] = res.openid; + arr[4] = res.cardid; + arr[5] = res.nonceStr; + var c = arr.sort(); + var newstr = ""; + for (var i = 0; i < c.length; i++) { + newstr += c[i]; + } + + var sh1 = ut.sha1(newstr); + wx.addCard({ + cardList: [ + { + cardId: res.cardid, + cardExt: '{"code": "' + res.code + '", "openid": "' + res.openid + '","timestamp": "' + res.timestamp + '","nonce_str":"' + res.nonceStr + '","outer_str":"web", "signature":"' + sh1 + '"}' + } + + ], + success: function (res) { }, + cancel: function (res) { } + }); + }, + + // 获取客服热线 + getTel() { + var self = this; + return new Promise((resolve, reject) => { + var s = getApp(); + s.getConfig(function (t) { + if (t.store_tel == undefined) { + getApp().request.get("/api/weshop/store/get/" + os.stoid, { + isShowLoading: 1, + data: {}, + success: function (rs) { + getApp().globalData.config = rs.data.data; + if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) { + getApp().showWarning("商家未设置电话"); + return false; + } else { + self.setData({ + store_tel: rs.data.data.store_tel, + }); + // s.confirmBox("客服热线：" + rs.data.data.store_tel); + }; + + } + }) + } else { + self.setData({ + store_tel: t.store_tel, + }); + // s.confirmBox("客服热线：" + t.store_tel); + } + resolve(); + }); + }); + }, + + + + }, + + observers: { + // 监听 num1 和 num2 数据的变化 + 'f_user_tool': function(obj){ + console.log(1111); + console.log(obj); + if(obj){ + var f_user_tool=JSON.parse(JSON.stringify(obj)); + var list=this.properties.object.list; + + if(list && list.length) { + //进行循环 + for (let iu = 0; iu < list.length; iu++) { + let fd = f_user_tool.find(function (e) { + return e.id == list[iu].id; + }) + if (fd) { + list[iu].icoimg = fd.icoimg; + list[iu].new_weappurl = fd.new_weappurl; + } else { + list.splice(iu, 1); + iu--; + } + } + }else{ + list=[]; + } + //-- 如果是有新的tool要添加进去 -- + for (let ig = 0; ig + + + + 工具与服务 + + + + + + + + + + + + + + PLUS会员 + + + + + + 助力活动 + + + + + + 我的权益 + + + + + + 套盒商品 + + + + + + + {{item.name}} + + + + + + + {{item.name}} + + + + + + + + + + 联系客服 + + + + + + + 收入卡包 + + + + + + + + + + \ No newline at end of file diff --git a/components/diy_user_tools_services/diy_user_tools_services.wxss b/components/diy_user_tools_services/diy_user_tools_services.wxss new file mode 100644 index 0000000..6810495 --- /dev/null +++ b/components/diy_user_tools_services/diy_user_tools_services.wxss @@ -0,0 +1,42 @@ +@import '../../app.wxss'; +.xc-center-img { + width: 60rpx; + height: 60rpx; +} + +/* 工具与服务 */ +.xc-tool-service { + width: 100%; + border-bottom: 20rpx solid #f2f2f2; + padding-bottom: 30rpx; +} + +.xc-tool-service .xc-tool-service-title { + width: 100%; + height: 90rpx; + +} + + +.xc-tool-service-img { + width: 38rpx; + height: 38rpx; + margin-left: 30rpx; +} + +.xc-tool-service-word { + margin-left: 10rpx; +} + +.xc-project-frame { + width: 100%; +} + +.xc-project-frame .item { + width: 25%; + margin-top: 30rpx; + display: inline-block; + line-height: 40rpx; + margin-left: 0 !important; + margin-right: 0 !important; +} \ No newline at end of file diff --git a/packageG/pages/user_template/index.js b/packageG/pages/user_template/index.js new file mode 100644 index 0000000..7ca1dca --- /dev/null +++ b/packageG/pages/user_template/index.js @@ -0,0 +1,630 @@ +var t = getApp(), + a = t.request, + os = t.globalData.setting, + ut = require("../../../utils/util.js"), + com = require("../../../utils/common.js"); +var regeneratorRuntime = require('../../../utils/runtime.js'); +const rq = require("../../../utils/request.js"); +var appd = getApp().globalData; + +Page({ + data: { + url: os.imghost, + temp_id: 0, + goodsGroupArr: [], + pulscardname: '', + rfmName: '成长值', + + byquan: 0, + yuer: 0, + udata: {}, + + is_assistance: 0, //助力活动 + b_gift:null, //生日礼包 + toji: null, //统计相关 + + userInfo:null, + enableMeiye:null, + + is_show_recommend:false, + }, + + onLoad: function (e) { + var th = this; + this.data.temp_id = e.scene; + if (!this.data.temp_id) wx.showModal({title: "未读取到模板ID",}) + + var first_leader = e.first_leader; + if (first_leader) { + //-- user_id代过来免登录 -- + getApp().globalData.first_leader = first_leader; + //调用接口判断是不是会员 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id = res.data.data.pickup_id + } + }) + } + //判断有没有登陆 + setTimeout(() =>{ + if (!getApp().globalData.userInfo) { + getApp().goto('/packageE/pages/togoin/togoin'); + } + },1500) + + }, + + async onShow() { + getApp().check_can_share(); + var th = this; + + if(!th.data.userInfo){ + this.data.userInfo =getApp().globalData.userInfo; + } + + /*-----统计-----*/ + getApp().request.get("/api/weshop/order/waitlist", { + isShowLoading: 0, + data: { + user_id: getApp().globalData.user_id,isdel:0 + }, + success: function (su) { + th.setData({ + toji: su.data.data, + }); + } + }) + + /*-------系统是否开通等级卡，会员是等级卡-----*/ + getApp().getConfig2(function (e) { + var t_swi = e.switch_list; + if (t_swi) t_swi = JSON.parse(t_swi) + if (t_swi) { + th.setData({sys_switch: t_swi}); + var user_tool = []; + if (t_swi.usertool) user_tool = JSON.parse(t_swi.usertool); + th.setData({c_list: user_tool}); + + if (parseInt(t_swi.rank_switch) == 2) { + var userInfo = th.data.userInfo; + if (userInfo && userInfo.card_field != null && userInfo.card_field != undefined && userInfo.card_field != "") { + var now = ut.gettimestamp(); + var str = userInfo.card_expiredate; + var end = new Date(str); + end = Date.parse(end) / 1000; + //---判断是不是有过期--- + if (now < end) { + th.setData({ + is_dengji: 1 + }) + } else { + th.setData({ + is_dengji: 3 + }) + } + } else { + th.setData({ + is_dengji: 2 + }) + } + } + } + }) + + //--我的权益初始化是否有打勾,-- + getApp().request.get("/api/weshop/users/grade/vip/init/get", { + data: { + storeId: os.stoid + }, + success: function (rs) { + if (rs.data.code == 0 && rs.data.data.isBool) { + th.setData({is_init: 1}); + /*-----获取会员权益列表-----*/ + rq.get("/api/weshop/users/grade/vipprivilegeinfo/page", { + isShowLoading: 0, + data: { + storeId: os.stoid, + pageSize: 100 + }, + success: async function (res) { + + //判断有没有值，没有值返回 + if (!ut.ajax_ok(res)) return false; + + var arr_data = res.data.data.pageData; + var gid = null, + g_qy_list = null, + cz_vals = 0, + need_money = 0, + backClass = null, + GradeName = ''; + + var app_d = getApp().globalData; + + //获取成长值 + await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get", { + data: { + storeId: os.stoid, + userId: app_d.user_id + } + }).then(res => { + if (res.data.code == 0 && res.data.data) { + gid = res.data.data.GradeId; + var cz_val = res.data.data.GradeSum; + cz_vals = parseInt(cz_val); + GradeName = res.data.data.GradeName; + } + //th.setData({ cz_val: cz_vals, GradeName: res.data.data.GradeName, is_init: is_init, gradeId: gid}); + }) + var obj = { + cz_val: cz_vals, + GradeName: GradeName, + gradeId: gid, + is_grad_get: 1 + }; + + // 获取最大值 + await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", { + data: { + storeId: os.stoid + } + }).then(res => { + if (res.data.data) + backClass = res.data.data.pageData; + if (backClass) { + var full_cz_val = backClass[backClass.length - 1].BuyGradeSum; + obj.full_cz_val = full_cz_val + } + }) + + //--会员权益中心页的修改-- + for (var i in backClass) { + var im = backClass[i]; + if (cz_vals < im.BuyGradeSum && need_money == 0) { + need_money = im.BuyGradeSum; + obj.need_money = need_money; + obj.nextGradeName=im.GradeName; + break; + } + } + + //获取当前等级的特权 + await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page", { + data: { + storeId: os.stoid, + GradeId: gid, + userId: app_d.user_id, + pageSize: 100 + } + }).then(res => { + if (res.data.data) + g_qy_list = res.data.data.pageData; + }); + + for (var i in arr_data) { + var item = arr_data[i]; + var FromId = th.check_is_has_qy(item, g_qy_list); + arr_data[i].ishas = 0; + if (FromId) { + arr_data[i].ishas = 1; + arr_data[i].FromId = FromId; + } + } + arr_data.sort(function (a, b) { + return b.ishas - a.ishas + }) + + //4个4个一组 + var arr = new Array(); + for (var i = 0; i < arr_data.length; i += 4) { + arr.push(arr_data.slice(i, i + 4)); + } + //th.setData({ qy_list: arr, need_money: need_money}); + obj.qy_list = arr; + obj.old_qy_list = arr_data; + th.setData(obj); + obj.is_init = 1; + th.setData({qy_data: obj}) + } + }) + } + } + }) + + this.puls_user(); + this.getVison(); + + //-----获取线下会员的预存款和优惠券的数量----- + getApp().request.get("/api/weshop/users/getinfo/" + os.stoid + "/" + getApp().globalData.user_id, { + isShowLoading: 0, + success: function (su) { + if (su.data.code == 0 && su.data.data) { + var data = su.data.data; + if (!data) data = {}; + data.cashcount = parseInt(data.cashcount); + th.setData({ + udata: data, + }); + } + } + }) + + //-----获取会员提现金额----- + getApp().request.get("/api/weshop/withdrawals/summoney", { + isShowLoading: 0, + data: { + user_id: getApp().globalData.user_id, + store_id: os.stoid, + status: 0 + }, + success: function (su) { + if (su.data.code == 0) { + + let user = getApp().globalData.userInfo; + var yuer = parseFloat(user.user_money - user.frozen_money - su.data.data.summoney).toFixed(2); + th.setData({ + txmon: su.data.data.summoney, + yuer: yuer + }); + } + } + }) + + /*-----获取会员包邮券的数量-----*/ + getApp().request.get("/api/weshop/userfeemail/page", { + isShowLoading: 0, + data: { + user_id: getApp().globalData.user_id, + store_id: os.stoid, + pageSize: 1, + isuse: 0 + }, + success: function (su) { + if (su.data.code == 0) { + th.setData({ + byquan: parseInt(su.data.data.total) + }); + } + } + }); + + + // 判断是否开启美业 + getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => { + if (res.data.code == 0) { + th.setData({ + enableMeiye: res.data.data.EnableMeiye, + }); + }; + }); + + //判断一下是不是助力活动 + this.is_assistance(); + //获取工具 + await this.init_user_tool(); + //获取一下生日相关 + this.birthday(); + + //获取自定义模板 + await this.init_load(); + + //自定义组件一定要等到页面加载完了，才来调用selectComponnent + setTimeout(function () { + + th.setData({ is_show_recommend:true }) + if (getApp().globalData.user_id) getApp().requestCardNum(th); + var goods_list = th.selectComponent("#goods_recommend"); //组件的id + + if(goods_list){ + goods_list.init(); + goods_list.get_list(); + } + + }, 1500) + + }, + + //获取商品模块实例 + newGoodsGroup() { + let arr = [] + if (this.data.template_arr.length == 0) { + return + } + this.data.template_arr.map((item, index) => { + if (item.ename == 'goodsGroup') { + arr.push(`goodsGroup${index}`) + } + }) + if (arr.length > 0) { + this.setData({ + goodsGroupArr: arr + }) + arr.map(item => { + let a = '.' + item + this[item] = this.selectComponent(a); + }) + } + }, + //当隐藏的时候就关闭计时器 + onHide: function () { + + }, + //同步初始加载 + async init_load() { + var th = this; + //因为营销版本的功能包含了自定义模板的功能，是同时的 + //读取全局是否有弄自定义模板 + await getApp().request.promiseGet("/api/weshop/store_module/get/" + th.data.temp_id + "/8", {1: 1}).then(res => { + var data = res.data.data; + if (data) { + var temp_data = data; + wx.setNavigationBarTitle({ + title: temp_data.page_title, + }); + var t_arr = JSON.parse(temp_data.json_str); + + let obj={ + share_title: temp_data.page_title, + template_arr: t_arr, + isTemplate: 1, + bgcolor_t: temp_data.bkcolor + }; + + setTimeout(() => { + th.newGoodsGroup() + }, 1000) + + //---如果有设定顶部的颜色的时候-- + if (temp_data.top_color && temp_data.top_color != 'null') { + var top_w_color = "#ffffff"; + if (temp_data.top_word_color) { + top_w_color = temp_data.top_word_color + } + wx.setNavigationBarColor({ + frontColor: top_w_color, // 必写项 + backgroundColor: temp_data.top_color, // 必写项 + }) + obj.topwColor=top_w_color; + obj.topbgColor=temp_data.top_color; + } + + th.setData(obj); + + } + }) + }, + + onPullDownRefresh: function (e) { + + }, + + + onShareAppMessage: async function (e) { + var th = this; + getApp().globalData.no_clear = 1; + getApp().getConfig(await function (e) { + th.setData({ + store_config: e + }) + }.bind(this)) + + var url = `pages/template/index?sence=` + this.data.temp_id; + var userInfo = getApp().globalData.userInfo; + //是分销商才带 + if (userInfo) { + url += "&first_leader=" + userInfo.user_id; + } + + var ob = { + title: this.data.share_title, + path: url, + //imageUrl:this.data.url+this.data.store_config.store_logo, + }; + return ob; + }, + + /** + * 用户分享朋友圈 + */ + async onShareTimeline() { + + var th = this; + getApp().globalData.no_clear = 1; + getApp().getConfig(await function (e) { + th.setData({ + store_config: e + }) + }.bind(this)) + var {share_title, temp_id, store_config} = this.data; + var url = `sence=${temp_id}`; + + var userInfo = getApp().globalData.userInfo; + //是分销商才带 + if (userInfo) { + url += "&first_leader=" + userInfo.user_id; + } + + var ob = { + title: share_title, + query: url, + //imageUrl:this.data.url+store_config.store_logo, + }; + console.log(ob); + return ob; + }, + + //---加载更多是靠这个函数---- + onReachBottom: function () { + if (getApp().globalData.func_list) { + for (let i in getApp().globalData.func_list) { + let item = getApp().globalData.func_list[i]; + item.re_show(); + } + } + + //自定义时商品自动加载更多 + let goodsGroupArr = this.data.goodsGroupArr + if (this.data.isTemplate && goodsGroupArr.length > 0) { + goodsGroupArr.map(item => { + this[item].automore() + }) + } + + var e = getApp().globalData.userInfo; + if (e != undefined && e != null && e.mobile) { + var goods_list = this.selectComponent("#goods_recommend"); //组件的id + goods_list.init(); + setTimeout(function () { + goods_list.get_list(); + }, 300) + } + + }, + + //-----Plus会员获取----------- + puls_user: function () { + var th = this; + getApp().request.get("/api/weshop/plus/vip/mem/list", { + data: { + storeId: os.stoid, + userId: getApp().globalData.user_id, + }, + success: function (su) { + if (su.data.code == 0) { + var cardname = su.data.data[0].MemCardName; + th.setData({ + pulscardname: cardname + }); + } + } + }); + }, + + //判断会员是后有改服务项目 + check_is_has_qy: function (item, g_qy_list) { + if (!g_qy_list) return false; + + for (var i in g_qy_list) { + var iter = g_qy_list[i]; + if (iter.FormId == item.Id) return g_qy_list[i].FormId; + } + return false; + }, + + //获取会员权益等级是否升级 + getVison() { + let isRfm = wx.getStorageSync('isRfm') + if (isRfm) { + this.setData({ + rfmName: '综合分' + }) + } else { + rq.get(`/api/weshop/users/grade/vip/getSysPara?storeId=${os.stoid}&classInfo=IsUpRMF`, { + success: (res) => { + console.log('会员权益等级升级查询-------'); + console.log(res); + if (res.data.code == 0 && res.data.data && res.data.data.IsBool) { + this.setData({ + rfmName: '综合分' + }) + wx.setStorageSync('isRfm', true) + } + } + }) + } + }, + + + //-- 初始话按钮图标,服务与工具的优化 --- + init_user_tool: async function () { + var d_list = null; + //读取user_tool按钮图标 + await getApp().promiseGet("/api/weshop/userTool/page?pageSize=100&store_id=" + os.stoid, {}).then(res => { + if (ut.ajax_ok(res)) { + d_list = res.data.data.pageData; + } + }) + + if (!d_list) return false; + //过滤掉分销关闭的 + let distribut_end_time = await getApp().user_tools_endTime(2);//过滤掉分销到期的 + await getApp().promiseGet("/api/weshop/storeDistribut/get/" + os.stoid, {}).then(rs => { + if (rs.data.code == 0 || !rs.data.data) { + var is_ok = 1; + + if (!distribut_end_time) { + is_ok = 0; + } else if (!rs.data.data) { + is_ok = 0; + } else { + var dis = rs.data.data; + if (!dis || dis.switch == 0) { + is_ok = 0; + } + } + + for (var i in d_list) { + if (d_list[i].name == '我的分销' && !is_ok) { + d_list.splice(i, 1); + } + } + } + }) + + //判断有没有开AI测肤 + await getApp().promiseGet("/api/weshop/wx/weappSkin/get/" + os.stoid, {}).then(rs => { + if (rs.data.code != 0 || !rs.data.data) { + for (var i in d_list) { + if (d_list[i].name == 'AI测肤') { + d_list.splice(i, 1); + } + } + } + }) + this.setData({user_tool: d_list}); + }, + + // 判断助力活动是不是存在 + is_assistance: function () { + var th = this, r = Math.random() * 100; + getApp().promiseGet("/api/weshop/marketing/help/act/judge", { + data: { + storeId: os.stoid, + userId: getApp().globalData.user_id, + r: r, + } + }).then(res => { + var code = res.data.code; + if (code == 0) { + th.setData({ + is_assistance: 1 + }); + } else { + th.setData({ + is_assistance: 0 + }); + } + }) + }, + + // 判断生日营销的页面是不是存在 + birthday: function () { + var th = this; + getApp().request.get("/api/weshop/marketing/birthday/act/judge", { + data: { storeId: os.stoid, userId: getApp().globalData.user_id }, + success: function (res) { + var code = res.data.code; + if (code == 0) { + var giftbagid = res.data.data.giftBagId; + var actId = res.data.data.id; + var actImg = res.data.data.actImg; + th.setData({ b_gift:{ giftbagid: giftbagid, actId: actId, actImg: actImg } }); + } + + } + }) + }, + + +}); \ No newline at end of file diff --git a/packageG/pages/user_template/index.json b/packageG/pages/user_template/index.json new file mode 100644 index 0000000..812fa47 --- /dev/null +++ b/packageG/pages/user_template/index.json @@ -0,0 +1,18 @@ +{ + "navigationBarBackgroundColor": "#ff7295", + "navigationBarTextStyle": "white", + "usingComponents": { + "advertising":"/components/diy_advertising/diy_advertising", + "assist":"/components/diy_assist/diy_assist", + "diy_user_info":"/components/diy_user_info/diy_user_info", + "diy_user_order":"/components/diy_user_order/diy_user_order", + "diy_user_my_rights":"/components/diy_user_my_rights/diy_user_my_rights", + "diy_user_tools_services":"/components/diy_user_tools_services/diy_user_tools_services", + "com_top_nav": "/components/com_top_nav/com_top_nav", + "goods_recommend": "/components/goods_list/goods_list" + }, + "enablePullDownRefresh": false, + "onReachBottomDistance":300, + "navigationStyle": "custom", + "navigationBarTitleText": "会员中心" +} \ No newline at end of file diff --git a/packageG/pages/user_template/index.wxml b/packageG/pages/user_template/index.wxml new file mode 100644 index 0000000..dc62b9f --- /dev/null +++ b/packageG/pages/user_template/index.wxml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 为你推荐 + + + + + + + + + + + + + diff --git a/packageG/pages/user_template/index.wxss b/packageG/pages/user_template/index.wxss new file mode 100644 index 0000000..4c24611 --- /dev/null +++ b/packageG/pages/user_template/index.wxss @@ -0,0 +1,940 @@ +.pink-b { + background: #ff7295; +} + +.search-box { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 88rpx; + z-index: 10; +} + +.classify-img { + width: 50rpx; + height: 45rpx; +} + +.logo { + width: 48rpx; + height: 48rpx; + margin: 0 18rpx; + border-radius: 50%; + overflow: hidden; +} + +.search-inner { + display: flex; + align-items: center; + margin: 20rpx 25rpx; + width: 566rpx; + height: 58rpx; + border-radius: 29rpx; + background-color: #fff; + justify-content: center; +} + +.search-img { + width: 30rpx; + height: 30rpx; + margin-left: 36rpx; + display: flex; + align-items: center; + position: absolute; + left: 10%; +} + +.search-cont { + height: 58rpx; + width: 530rpx; + padding-left: 12rpx; + line-height: 58rpx; + font-size: 24rpx; + color: #666; + margin-left: 56rpx; +} + +.search-fixed { + background: #ff7295; +} + +.swiper_box { + width: 100%; + height: auto; +} + +.s_prom { + width: 100%; + height: 340rpx; +} + +.s_proms { + width: 100%; + height: 590rpx; +} + +.slide-image { + width: 100%; + display: inline-block; + overflow: hidden; + border-radius: 14rpx; + height: auto; +} + +.venues_box { + background-color: #fff; + padding: 20rpx 10rpx; +} + +.venues_item { + display: block; + float: left; + width: 20%; + text-align: center; + margin: 25rpx 0; +} + +.venues_item image { + vertical-align: middle; + width: 90rpx; + height: 90rpx; + border: 0; +} + +.venues_item view { + font-size: 26rpx; + margin-top: 10rpx; +} + +.choice_box { + font-size: 14px; +} + +.choice_box .choice_list .choice_item { + width: 368rpx; + float: left; + margin: 2rpx; + background-color: #fff; +} + +.choice_box .choice_list image { + width: 100%; + height: auto; +} + +.title-img { + margin-top: 110rpx; + margin-bottom: 15rpx; + height: auto; +} + +.choice_box .choice_list .title { + height: 36rpx; + line-height: 36rpx; + /* font-weight: bold; */ + text-align: left; + color: #333; + margin-left: 20rpx; + font-size: 30rpx; +} + +.choice_box .choice_list .choice_footer { + display: block; + margin-top: 20rpx; + margin-left: 15rpx; + position: relative; + height: 74rpx; + line-height: 17rpx; +} + +.choice_box .choice_list .choice_footer .price { + color: #f23030; + height: 10px; +} + +.choice_box .choice_list .choice_footer .similer { + position: absolute; + bottom: 0; + right: 0; + text-align: center; + color: #686868; + width: fit-content; + line-height: 30rpx; + border: 1rpx solid #bfbfbf; + padding: 1rpx 6rpx; + border-radius: 5rpx; +} + +.section { + margin-top: 20rpx; + background-color: #fff; +} + +.section-title { + padding-top: 30rpx; + height: 54rpx; + line-height: 54rpx; + font-size: 36rpx; + font-weight: 700; + color: #333; + text-align: center; + letter-spacing: 3rpx; +} + +.section-subtitle { + line-height: 0; + width: 340rpx; + height: 16rpx; + padding-bottom: 20rpx; + margin: 0 auto; +} + +.seckill { + margin-top: 20rpx; + background-color: #fff; + padding-bottom: 30rpx; +} + +.seckill-time { + display: flex; + justify-content: space-between; + padding: 0 30rpx; + align-items: center; + height: 72rpx; + color: #333; + margin-bottom: 20rpx; +} + +.sk-tips { + font-size: 36rpx; + font-weight: bold; + margin-right: 20rpx; +} + +.sk-time { + position: relative; + display: inline-block; + font-size: 24rpx; + width: 36rpx; + line-height: 36rpx; + background-color: #333; + margin-right: 20rpx; + color: #fff; + text-align: center; +} + +.sk-time::before { + content: ':'; + position: absolute; + right: -13rpx; + top: 0; + color: #333; + font-weight: bold; +} + +.sk-time:last-child::before { + content: ''; +} + +.seckill-time>navigator { + font-size: 28rpx; +} + +.sk-pic { + width: 28rpx; + height: 28rpx; + vertical-align: top; +} + +.seckill-list { + overflow: hidden; +} + +/* .seckill-list navigator { + width: 236rpx; margin-right: 10rpx; position: relative; +} */ + +.seckill-list view { + height: 62rpx; + padding: 0 10rpx; + line-height: 33rpx; + overflow: hidden; + font-size: 28rpx; + width: 203rpx; +} + +.seckill-list view.imgview { + width: 203rpx; + height: 210rpx; + position: relative; + overflow: hidden; +} + +.imgview image { + width: 203rpx; + height: 203rpx; + border-radius: 10rpx; +} + +.seckill-list view.djs_view { + background: rgba(9, 9, 9, 0.5); + color: #fff; + font-size: 20rpx; + width: 216rpx; + height: 36rpx; + line-height: 36rpx; + position: absolute; + bottom: 0; + left: 10rpx; + z-index: 5; + text-align-last: center; +} + +.seckill-list image.status_img { + width: 100rpx; + height: 35rpx; + position: absolute; + top: 0rpx; + left: 10rpx; + z-index: 5; +} + +.seckill-list view.status_view { + width: 60rpx; + height: 60rpx; + text-align: center; + line-height: 60rpx; + position: absolute; + background: #e9030d; + color: #fff; + font-size: 18rpx; + top: 5rpx; + right: 10rpx; + z-index: 5; + border-radius: 50%; + padding: 0; +} + +.xiafa { + text-decoration: line-through; + font-size: 10px; + color: #999; + margin-left: 10rpx; +} + +.shelue { + /* text-overflow: -o-ellipsis-lastline; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; */ + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; +} + +.meiz { + padding: 0 10rpx; + background: #c4182e; + color: #fff; + height: 18px; + line-height: 18px; + margin-top: -10rpx; + border-radius: 10rpx; +} + +.dengj { + padding: 0 10rpx; + background: #ffd700; + color: #fff; + height: 18px; + line-height: 18px; + margin-top: -10rpx; + border-radius: 10rpx; +} + +.kongge { + width: 20rpx; +} + +.choice_footer .ys { + color: #999; + margin-top: 20rpx; + font-size: 11px; + margin-left: 5rpx; +} + +.p_swiper { + display: flex; +} + +.p_swiper .un_line { + text-decoration: line-through; + font-size: 22rpx; + color: #b2a2c2; +} + +.seckill-list view.co-red2 { + font-size: 22rpx; + color: #c2aebb; + margin-top: -8rpx; +} + +.seckill-list view.cantuan { + width: 72rpx; + height: 36rpx; + text-align: center; + line-height: 36rpx; + position: absolute; + background: #e9030d; + color: #fff; + font-size: 18rpx; + bottom: 30rpx; + right: 10rpx; + z-index: 5; + border-radius: 5rpx; + padding: 0; +} + +.arrow-right { + width: 24rpx; + height: 24rpx; +} + +.pd-view { + height: 80rpx; +} + +.xc-grow-ups { + margin-left: 8rpx; + margin-top: 6rpx; +} + +.xc-top-img { + width: 100%; + top: -1rpx; + height: 315rpx; +} + +.classify-frame { + line-height: 25rpx; +} + +.slide-image-frame { + width: 95%; + margin: auto; + border-radius: 10rpx; +} + +.xc-hook { + width: 52rpx; + height: 52rpx; +} + +.margin-left { + margin-left: 10rpx; +} + +.xc-class-img { + width: 83rpx; + height: 83rpx; +} + +.xc-class-frame { + line-height: 40rpx; + margin-top: 40rpx; + margin-bottom: 20rpx; +} + +.xc-title-img { + height: 220rpx; + width: 100%; + border-radius: 15rpx; +} + +.title-img-frame { + width: 94%; + margin: auto; + margin-top: 30rpx; + padding-bottom: 10rpx; +} + +.seckill-list { + line-height: 24rpx; +} + +.seckill-lists { + line-height: 30rpx; +} + +.xc-marfin-right { + margin-right: 8rpx; +} + +.classname .clock-img { + width: 36rpx; + height: 36rpx; + margin-right: 10rpx; +} + +.classname .seckill-ttitle-img { + width: 150rpx; + height: 40rpx; +} + +.seckill-ttitle-img.height { + height: 35rpx; +} + +.split-line { + width: 100%; + height: 10rpx; + background: #eee; +} + +.mar-top10 { + margin-top: 10rpx; +} + +.classname .user-img { + width: 30rpx; + height: 30rpx; + margin-left: 20rpx; + margin-right: 10rpx; +} + +.user-frame { + /* border-left: 5rpx solid #eee; */ + height: 35rpx; + line-height: 35rpx; + margin-left: 10rpx; +} + +.user-name { + width: 66rpx; + border-left: 5rpx solid #eee; +} + +/* 团购列表 */ + +.kill-item { + display: flex; + justify-content: space-between; + background-color: #fff; + padding: 10rpx 10rpx; + margin-bottom: 10rpx; + border-radius: 10rpx; + height: 249rpx; + align-items: center; +} + +.kill-pic { + width: 215rpx; + height: 215rpx; + position: relative; +} + +.teamheight { + height: 289rpx; + border-bottom: 6rpx solid #eee; +} + +.kill-cont { + width: 440rpx; + height: 215rpx; + margin-left: 16rpx; +} + +.goods-name { + max-height: 60rpx; + font-size: 24rpx; + color: #555; + line-height: 55rpx; +} + +.xc-team-img { + width: 38rpx; + height: 45rpx; + left: -1rpx; + top: -16rpx; +} + +.tneirong { + color: #fff; + font-size: 20rpx; + border-radius: 20rpx; + padding-left: 32rpx; + padding-right: 15rpx; + padding-bottom: 2rpx; + height: 28rpx; + line-height: 28rpx; + white-space: nowrap; +} + +.xc-people-val-frame { + border: 3rpx solid #d60021; + border-radius: 8rpx; + white-space: nowrap; + height: 28rpx; +} + +.xc-people-val-frame .val-img { + width: 33rpx; + height: 28rpx; + border-radius: 8rpx; + margin-left: -2rpx; +} + +.people-img { + width: 20rpx; + height: 20rpx; +} + +.goods-num { + height: 50rpx; + display: flex; + justify-content: space-between; + margin-top: 10rpx; + font-size: 24rpx; + color: #999; +} + +.xc-top15 { + padding-top: 15rpx; + margin-top: 25rpx; +} + +.underline { + text-decoration: line-through; + color: #999; + font-size: 20rpx; + margin-left: 5rpx; + margin-top: 5rpx; +} + +.navigator.navwidth { + width: 100%；; +} + +.view.left { + padding: 0 5rpx; +} + +/* 热门好物 */ + +.title .China { + width: 100%; + margin-top: 10rpx; + margin-bottom: 10rpx; + line-height: 0rpx; +} + +.title .China .line view { + width: 2rpx; +} + +.title .China .line { + height: 40rpx; + color: rgb(51, 51, 51); +} + +.title .China .line view { + border-left: 3rpx solid #000; + margin-left: 5rpx; +} + +.title .China .line .one { + height: 23rpx; +} + +.title .China .line .two { + height: 15rpx; +} + +.title .China .line .three { + height: 18rpx; +} + +.title .China .Recommend { + margin: 0rpx 20rpx; + font-size: 28rpx; + line-height: 39rpx; + font-weight: bold; +} + +.title .english .silk { + width: 214rpx; + height: 2rpx; + background-color: #000; +} + +.title .english .esh { + margin: 0rpx 15rpx; +} + +.collects { + margin-top: 40rpx; +} + +.hang { + width: 100%; + margin: auto; + padding-left: 21rpx; +} + +.hang .collect { + width: 347rpx; + height: 571rpx; + border-radius: 25rpx; + border: 1rpx solid rgb(214, 214, 214); + overflow: hidden; + margin-right: 14rpx; + margin-bottom: 5rpx; +} + +.collect .bottom { + padding: 0rpx 20rpx; +} + +.collect .sp { + width: 100%; + height: 326rpx; +} + +.collect .money { + margin-top: 60rpx; + margin-bottom: 18rpx; + line-height: 28rpx; + align-items: baseline; +} + +.collect .money view { + line-height: 28rpx; +} + +.collect .money .flex { + font-weight: bold; +} + +.collect .money .flex .fs24 { + padding-top: 5rpx; +} + +.collect .Discount { + width: 156rpx; + height: 28rpx; + border-radius: 20rpx; + background-color: rgb(56, 56, 56); + font-size: 18rpx; + color: rgb(255, 255, 255); +} + +.collect .Discount image { + height: 18rpx; + width: 18rpx; + line-height: 28rpx; + margin-right: 3rpx; +} + +.collect.ml20 { + margin-left: 13rpx; +} + +.fs24.dollar { + padding: 0rpx; +} + +.money .price { + margin-left: 12rpx; + text-decoration: line-through; + line-height: 23rpx; +} + +.province { + line-height: 26rpx; +} + +.nothing { + height: 75rpx; + width: 100%; +} + +.nothing .no_content { + margin: 0rpx 11rpx; + color: rgb(138, 138, 138); +} + +.nothing .Foil { + width: 80rpx; + height: 2rpx; + background-color: rgb(138, 138, 138); +} + +.goods_name { + height: 70rpx; + margin-top: 6rpx; +} + +.seckill-list view.translation { + width: 108rpx; + height: 20rpx; + border-radius: 20rpx; + background: #dfdfdf; + margin: auto; + line-height: 20rpx; +} + +.seckill-list view.spot { + width: 10rpx; + height: 10rpx; + padding: 0rpx; +} + +.spot { + width: 10rpx; + height: 10rpx; + padding: 0rpx; +} + +.translation { + width: 108rpx; + height: 20rpx; + border-radius: 20rpx; + background: #e0e0e0; + line-height: 20rpx; + bottom: 45rpx; + left: 43%; +} + +.translation { + width: 108rpx; + height: 20rpx; + border-radius: 20rpx; + background: #b8d1d6; + line-height: 20rpx; + bottom: 12rpx; + left: 43%; +} + +.translations { + width: 108rpx; + height: 20rpx; + border-radius: 20rpx; + background: #dfdfdf; + line-height: 20rpx; + bottom: 25rpx; + left: 43%; +} + +.mar-top { + margin-top: 20rpx; +} + +.mar-tops { + margin-top: 10rpx; +} + +.pt_active { + animation: sport 0.5s; +} + +@keyframes sport { + 0% { + transform: translateY(80rpx); + opacity: 0; + } + + 100% { + transform: translateY(0rpx); + opacity: 1; + } +} + +.m-left { + margin-left: 18rpx; +} + +.martop4 { + margin-top: 4rpx; +} + +.time-blue { + margin-left: 10rpx; +} + +.is_seckill_height { + height: 40rpx; + line-height: 32rpx; +} + +.assemble-top-border { + border-top: 10rpx solid #eee; + padding-top: 20rpx; + margin-top: 0rpx; +} + +.gonju { + max-width: 120rpx; +} + +.disgraceful { + position: fixed; + width: 100%; + height: 100%; + left: 0rpx; + bottom: 0rpx; + background-color: rgba(182, 174, 174, 0.753); + z-index: 10; +} + +.newreceive { + position: fixed; + width: 100%; + height: 100%; + z-index: 11; +} + +.receive { + width: 570rpx; + height: 750rpx; +} +.close{ + width: 70rpx; + height: 70rpx; + margin-top: 30rpx; +} +.swiper{ + height: 250rpx; + padding-bottom:30rpx; +} +.container{ overflow: hidden;} + +.xc-recommend-goods { + width: 100%; + height: 73rpx; + margin: auto; +} + +.xc-small { + width: 10rpx; + height: 10rpx; + background: #ff5f80; + margin-top: 6rpx; +} + +.xc-zhong { + width: 15rpx; + height: 15rpx; + background: #ff5f80; + margin-left: 12rpx; + margin-top: 2rpx; +} + +.xc-big { + width: 17rpx; + height: 17rpx; + background: #ff5f80; + margin-left: 15rpx; +} \ No newline at end of file diff --git a/pages/user/index/index.js b/pages/user/index/index.js index d005bde..74c75bd 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -52,8 +52,9 @@ Page({ has_rj:0, rfmName:'成长值', - is_close_chuzhi:0 + is_close_chuzhi:0, + pshow:0 }, goto_nav: function (e) { @@ -118,8 +119,11 @@ Page({ */ onShow: function () { + var _that=this; + this.init_load() + //-- 看一下隐私政策要不要显示 -- var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id if (privacy_pop) { @@ -200,7 +204,6 @@ Page({ if (e != undefined && e != null && e.mobile) { - if (e.card_field != '' && e.card_field != null && e.card_field != undefined && e.card_expiredate) { var now = ut.gettimestamp(); var str = e.card_expiredate.replace(/-/g, '/');; @@ -438,6 +441,8 @@ Page({ if (cz_vals < im.BuyGradeSum && need_money == 0) { need_money = im.BuyGradeSum; obj.need_money = need_money; + obj.nextGradeName=im.GradeName; + break; } } @@ -475,6 +480,9 @@ Page({ //th.setData({ qy_list: arr, need_money: need_money}); obj.qy_list = arr; th.setData(obj); + obj.is_init=1; + obj.old_qy_list = arr_data; + th.setData({qy_data:obj}) } }) } @@ -528,7 +536,7 @@ Page({ //自定义组件一定要等到页面加载完了，才来调用selectComponnent setTimeout(function () { - th.setData({ is_show_recommend:true }) + th.setData({ is_show_recommend:true,pshow:1 }) if (getApp().globalData.user_id) getApp().requestCardNum(th); var goods_list = th.selectComponent("#goods_recommend"); //组件的id @@ -537,13 +545,14 @@ Page({ goods_list.get_list(); } - }, 1000) - } + }, 1200) + } }, + //获取会员权益等级是否升级 getVison(){ let isRfm = wx.getStorageSync('isRfm') @@ -940,7 +949,7 @@ Page({ var giftbagid = res.data.data.giftBagId; var actId = res.data.data.id; var actImg = res.data.data.actImg; - th.setData({ giftbagid: giftbagid, actId: actId, actImg: actImg }); + th.setData({ giftbagid: giftbagid, actId: actId, actImg: actImg, b_gift:{ giftbagid: giftbagid, actId: actId, actImg: actImg } }); th.setData({ is_banner: 1 }); } @@ -1171,6 +1180,45 @@ Page({ }); }, + //同步初始加载 + async init_load() { + var th = this; + //因为营销版本的功能包含了自定义模板的功能，是同时的 + //读取全局是否有弄自定义模板 + await getApp().request.promiseGet("/api/weshop/store_module/gets/"+os.stoid+"/1/8", {1: 1}).then(res => { + var data = res.data.data; + if (data && data.length) { + var temp_data = data[0]; + var t_arr = JSON.parse(temp_data.json_str); + + let obj={ + share_title: temp_data.page_title, + template_arr: t_arr, + isTemplate: 1, + bgcolor_t: temp_data.bkcolor, + pshow:1 + }; + + //---如果有设定顶部的颜色的时候-- + if (temp_data.top_color && temp_data.top_color != 'null') { + var top_w_color = "#ffffff"; + if (temp_data.top_word_color) { + top_w_color = temp_data.top_word_color + } + wx.setNavigationBarColor({ + frontColor: top_w_color, // 必写项 + backgroundColor: temp_data.top_color, // 必写项 + }) + obj.topwColor=top_w_color; + obj.topbgColor=temp_data.top_color; + } + + th.setData(obj); + + } + }) + }, + diff --git a/pages/user/index/index.json b/pages/user/index/index.json index 6b8a9e0..0e1c893 100644 --- a/pages/user/index/index.json +++ b/pages/user/index/index.json @@ -3,7 +3,14 @@ "pop_txt": "/components/userqy_pop_up/userqy_pop_up", "goods_recommend": "/components/goods_list/goods_list", "privacy_pop": "/components/privacy_pop/privacy_pop", - "com_top_nav": "/components/com_top_nav/com_top_nav" + "com_top_nav": "/components/com_top_nav/com_top_nav", + "advertising":"/components/diy_advertising/diy_advertising", + "assist":"/components/diy_assist/diy_assist", + "diy_user_info":"/components/diy_user_info/diy_user_info", + "diy_user_order":"/components/diy_user_order/diy_user_order", + "diy_user_my_rights":"/components/diy_user_my_rights/diy_user_my_rights", + "diy_user_tools_services":"/components/diy_user_tools_services/diy_user_tools_services" + }, "navigationBarTitleText": "会员中心", "navigationStyle": "custom" diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml index fb52e1a..9ce3b3f 100644 --- a/pages/user/index/index.wxml +++ b/pages/user/index/index.wxml @@ -5,387 +5,463 @@ - - - - - - - - - - - - {{pulscardname}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 为你推荐 + + + + + + + + + + + + + + + + + + + 提供技术支持 + + + + + + + + + + + + + + + + + {{pulscardname}} + + - - - - - {{userInfo.nickname}} - - {{GradeName}} + + + {{userInfo.nickname}} + + {{GradeName}} + + + + + + + + + {{" "}} + {{rfmName}} + {{cz_val}} / {{need_money}} + + + {{" "}} + {{rfmName}} {{cz_val}} + + + + + + 请点击注册 + + + + + + 会员卡 + + + 0/0 + + + {{yuer?yuer:0}} + 余额 + + + + {{udata.Balance?udata.Balance:0}} + 储值款 + + - - - 请点击注册 - + {{udata.Integral?udata.Integral:0}} + 积分 + + {{udata.CashCount+byquan?udata.CashCount+byquan:0}} + 优惠券 + + + - - - - 会员卡 - - - - {{yuer?yuer:0}} - 余额 + + + + + + + + 我的订单 + + + 您有{{countDadaOrder}}个同城配送订单 - - - {{udata.Balance?udata.Balance:0}} - 储值款 + + 更多 + + + + + + + + 待付款 + - - {{udata.Integral?udata.Integral:0}} - 积分 + + + 待发货 + - {{udata.CashCount+byquan?udata.CashCount+byquan:0}} - 优惠券 + + + 待收货 + + + + + 待评论 + + + + + + 售后/退款 + - - - - - - - - - 加入plus会员预计可省3031元 - - - 立即开通 - - + - - - - - 加入plus会员预计可省3031元 - - - 立即续费 - - - - - - - - - - - - 我的订单 + + + + + + + + 我的权益 + + + + 更多 + + + + + - - 您有{{countDadaOrder}}个同城配送订单 - - - 更多 - - - - - - - - 待付款 - - - - - 待发货 - - + + + - - - 待收货 - - - - - 待评论 - - - - - - 售后/退款 - - + + + - - + - + + - - - - - - - 我的权益 - - - - 更多 - - - - - - + + + + {{item.PrivilegeName}} + + + - - - + - - + + + + + + + 未找到数据 + - - - - - - - {{item.PrivilegeName}} - - - - - - - - + + + + - - 未找到数据 - - - - - - - - - - - - - - - - - 工具与服务 - - - - - - - - - - - - - - PLUS会员 - - - - - - 助力活动 - - - - - - 我的权益 - - - - - - 套盒商品 - - - - - - {{item.name}} - - - - - - - {{item.name}} - + + + + + 工具与服务 + + + + + + + + + + + + + + PLUS会员 + + + + + + 助力活动 + + + + + + 我的权益 + + + + + + 套盒商品 + + + + + + + {{item.name}} + + + + + + + {{item.name}} + + + + + + + + + + + 联系客服 + + + + + + + 收入卡包 + + + - - - - - - - - 联系客服 - + - - - - - 收入卡包 - - - - - + - - - - - - + + + - - - - - - - 为你推荐 - - - + + + + + + + 为你推荐 + + + + + + + + - - + + + + + + + + + + 提供技术支持 + - - - - - - - - - - - 提供技术支持 - - - - -