diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js index 6caf01a..aef9210 100644 --- a/components/goods_list/goods_list.js +++ b/components/goods_list/goods_list.js @@ -70,7 +70,7 @@ Component({ //--- 判断是等级会员，且在有效期范围内 --- if (user.card_field && now < end) { var card_name = ob.name_map.get(user.card_field); - if (card_name.length > 4) card_name = card_name.substring(0, 8); + if (card_name && card_name.length > 4) card_name = card_name.substring(0, 8); th.setData({ card_field: user.card_field, card_name: card_name, diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js index 21074d0..0c085b7 100644 --- a/packageA/pages/cart2_ser/cart2_ser.js +++ b/packageA/pages/cart2_ser/cart2_ser.js @@ -478,7 +478,6 @@ Page({ return false; } - if (gg.prom_type == 1 && gg.is_pd_normal == 0) { // 秒杀活动购买 var goods = { @@ -502,8 +501,11 @@ Page({ 'pickup_keyid': list[i].keyid, }; } - + if(getApp().globalData.skinface_id){ + goods.skinface_id=getApp().globalData.skinface_id; + } + //--导购分享过来的id-- if (gg.guide_id) { @@ -543,6 +545,10 @@ Page({ goods.price = this.data.postdata.prom_price; }; + if(getApp().globalData.skinface_id){ + goods.skinface_id=getApp().globalData.skinface_id; + } + //--导购分享过来的id-- if (gg.guide_id) { goods.guide_id = gg.guide_id; diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 07c43dc..e51efb2 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -228,33 +228,9 @@ Page({ th = ee, gid = t.goods_id, first_leader=t.first_leader; - - - //-- 自定义海报 -- - // getApp().request.promiseGet("/api/weshop/goods/poster/page", { - // data:{store_id:os.stoid, type:1, is_use:1} - // }).then(res=>{ - // if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]){ - // var poster_data=res.data.data.pageData[0]; - // var json_str=poster_data.jsonStr; - // if(json_str){ - // var json_data=JSON.parse(json_str); - // if(json_data.bg_img){ - // //-- 把图片那到本地 -- - // wx.getImageInfo({ - // src:json_data.bg_img, - // success: function(res) { - // var path= res.path; - // th.setData({share_b_img:path}) - // }, - // fail: function(res) {} - // }); - // } - // th.setData({poster:json_data}) - // } - // } - // }) - + + //检查测肤 + getApp().check_skin_face(t,1,gid); //---获取手机地址坐标-- //--如果tg_id是空的话，分享回来-- @@ -376,7 +352,7 @@ Page({ }); //获取用户的默认门店 - getApp().get_user_store(function(e) { + getApp().get_user_store(function(e) { if(!e) { th.data.fir_def_store={}; //赋值空对象 return false; @@ -384,7 +360,9 @@ Page({ var ee=JSON.parse(JSON.stringify(e)); //--定时器推迟一下-- setTimeout(function () { - if(!th.data.data) return false; + if(!th.data.data){ + return false; + } var ser_card=th.data.data; //--如果默认门店不在等级卡的默认们店以内 if(ser_card.storageId!=null && ser_card.storageId!="" && ser_card.storageId.indexOf(ee.keyid)==-1){ @@ -452,7 +430,7 @@ Page({ } } }, 500) - },700) + },1500) }); diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index 37147cf..6cee44d 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -684,6 +684,9 @@ Page({ if(user){ self.setData({user:user}) } + + var is_back=t.is_back; + if(is_back) this.data.is_back=1; }, @@ -856,7 +859,15 @@ Page({ success: function(res) { if (res.data.code == 0) { getApp().my_warnning("修改成功", 1, th); - getApp().goto("/pages/user/index/index"); + + setTimeout(function () { + if(th.data.is_back){ + wx.navigateBack({ delta: 1}) //返回上一页 + }else{ + getApp().goto("/pages/user/index/index"); + } + },1000) + } else { getApp().my_warnning("系统繁忙,请稍后再试", 0, th); } @@ -1152,8 +1163,12 @@ Page({ data: data, success: function(res) { if (res.data.code == 0) { - getApp().my_warnning("保存成功", 1, self); - getApp().goto("/pages/user/index/index"); + getApp().my_warnning("保存成功", 1, self); + if(th.data.is_back){ + wx.navigateBack({ delta: 1}) //返回上一页 + }else{ + getApp().goto("/pages/user/index/index"); + } } else { getApp().my_warnning(res.data.msg, 0, self); }; diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js index 56db163..dc20cad 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js @@ -2234,6 +2234,10 @@ Page({ 'prom_id': th.data.bn_goods.prom_id, //促销活动id }; + if(getApp().globalData.skinface_id){ + goods.skinface_id=getApp().globalData.skinface_id; + } + //-- 把导购的信息填入-- if (gg.guide_id) { goods.guide_id = gg.guide_id; diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js index 579e944..0eb3a1d 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -774,6 +774,9 @@ Page({ 'prom_id': th.data.param.group_id, //促销活动id }; + if(getApp().globalData.skinface_id){ + goods.skinface_id=getApp().globalData.skinface_id; + } //--导购分享过来的id-- if (gg.guide_id) { goods.guide_id = gg.guide_id; diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 585a295..4811e5b 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -295,7 +295,6 @@ Page({ }; - var ee = this, that = ee, th = ee, @@ -315,8 +314,8 @@ Page({ }); } - - + //检查测肤 + getApp().check_skin_face(t,0,gid); //---获取手机地址坐标-- //--如果tg_id是空的话，分享回来-- diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index 6814d4a..cd3c262 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -1044,6 +1044,10 @@ Page({ 'prom_id': th.data.bn_goods.prom_id, //促销活动id }; + if(getApp().globalData.skinface_id){ + goods.skinface_id=getApp().globalData.skinface_id; + } + //-- 把导购的信息填入-- if (gg.guide_id) { goods.guide_id = gg.guide_id; diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js index 9223c31..a4eb6ea 100644 --- a/packageC/pages/presell/cart/cart2_pre.js +++ b/packageC/pages/presell/cart/cart2_pre.js @@ -497,6 +497,10 @@ Page({ 'prom_id': th.data.bn_goods.prom_id, //促销活动id }; + if(getApp().globalData.skinface_id){ + goods.skinface_id=getApp().globalData.skinface_id; + } + //--导购分享过来的id-- if (gg.guide_id) { goods.guide_id = gg.guide_id; diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index b91693d..3ea477b 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -264,6 +264,8 @@ Page({ first_leader = t.first_leader, room_id = t.room_id, room_user_share = t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id + //检查测肤 + getApp().check_skin_face(t,0,gid); //-- 自定义海报 -- getApp().request.promiseGet("/api/weshop/goods/poster/page", { diff --git a/packageD/components/diy_login/login.js b/packageD/components/diy_login/login.js new file mode 100644 index 0000000..6533841 --- /dev/null +++ b/packageD/components/diy_login/login.js @@ -0,0 +1,385 @@ +var t = require("../../../utils/common.js"); +const app=getApp(); +var os = app.globalData.setting; +var regeneratorRuntime = require('../../../utils/runtime.js'); + +Component({ + + properties: { + // 这里定义了innerText属性，属性值可以在组件使用时指定 + object:{ + type:Object, + value:null + }, + }, + + data: { + user:null, + show_bind:0, + imghots: os.imghost, + store_logo:'', + first_leader:'', //-- 邀请人 -- + config2:null, + show_no:1, + }, + ready: function () { + + var set=this.properties.object; + if(set && set.hasOwnProperty('show_no')){ + this.setData({show_no:set.show_no}); + } + + if (wx.getUserProfile) { + this.setData({ + canIUseGetUserProfile: true + }) + } + var th=this; + app.getConfig(function (e) { + var logo=th.data.imghots+e.store_logo; + th.setData({ store: e,store_logo:logo}); + }) + + //判断注册的条件 + app.getConfig2(function (e) { + if(e.reg_type==1){ + var arr=JSON.parse(e.reg_info); + if(arr['name_state']==1) th.data.name_need_go=1; + if(arr['birthday_state']==1) th.data.birth_need_go=1; + if(arr['idcard_state']==1) th.data.idcard_need_go=1; + if(arr['address_state']==1) th.data.address_need_go=1; + if(arr['pick_state']==1) th.data.pick_need_go=1; + if(arr['sex_state']==1) th.data.sex_need_go=1; + if(arr['introducer_state']==1) th.data.introducer_need_go=1; + } + },1) + + getApp().promiseGet("/api/wx/weappSendlist/page", { + data: { + store_id: os.stoid, + typeid: "1007" + }}).then(res=>{ + if (res.data.code == 0 && res.data.data.pageData.length > 0) { + var template_id = res.data.data.pageData[0].template_id; + th.setData({template_id:template_id}); + } + }) + }, + + methods: { + + //绑定手机号 + getphone: function (e) { + //接下来写业务代码登录 + e = e.detail; + if (e.encryptedData == undefined) { + this.setData({show_bind: 0}) + return app.my_warnning("登录需要授权手机号码！", 0, this); + return false; + } + var sessionKey = getApp().globalData.sessionKey; + var openid = getApp().globalData.openid; + var r = getApp().globalData.getu; + this.save_the_data(r, e, sessionKey, openid) + }, + + + //-- 会员授权 -- + bindGetUserInfo: function (ee) { + if (!this.data.isAgree) { + wx.showToast({ + title: '请您先阅读和勾选指定的内容', + icon: 'none', + }); + return false; + } + var that = this; + //-- 点击授权 -- + that.getUserProfile(function (res) { + var user = res; + //--拿下code-- + wx.login({ + success: function (o) { + var dd = { + js_code: o.code, + store_id: os.stoid, + nickname: app.clear_word(app.globalData.getu.nickName), + head_pic: app.clear_word(app.globalData.getu.avatarUrl) + }; + //-- 导购会员ID -- + if (getApp().globalData.guide_id) { + dd.guide_id = getApp().globalData.guide_id; + } + + getApp().request.get("/api/weshop/users/openidandkey", { + data: dd, + success: function (e) { + if (e.data.code == 0) { + that.setData({user: user}) + //如果有会员的话,没有sessionKey + if (!e.data.data.sessionKey) { + getApp().showWarning("登录成功"); + getApp().globalData.userInfo = e.data.data; + getApp().globalData.user_id = e.data.data.user_id; + getApp().globalData.openid = e.data.data.weapp_openid; + //把会员的信息存在内存 + wx.setStorageSync("userinfo", e.data.data); + + setTimeout(function () { + getApp().globalData.login_back = 1; + that.cancle_bind(); //关闭 + }, 1000) + } else { + getApp().globalData.sessionKey = e.data.data.sessionKey; + getApp().globalData.openid = e.data.data.openid; + that.setData({show_bind: 1}); + } + } else { + getApp().confirmBox(e.data.msg); + } + } + }); + } + }) + + }) + }, + + //-- 调整后的获取会员信息 -- + getUserProfile: function (func) { + var that = this; + wx.getUserProfile({ + desc: '获取用户相关信息', + success: res => { + console.log("getUserProfile", res); + //此处授权得到userInfo + getApp().globalData.getu = res.userInfo; + func(res.userInfo); + } + }); + }, + + //暂不登录，返回上一页 + cancle_bind: function () { + var item={}; + this.triggerEvent('cancle_lg',item)//通过triggerEvent将参数传给父组件 + }, + + close_pop: function () { + this.setData({show_bind: 0}) + }, + show_bind_mobile: function () { + let th = this; + th.sendsm(function () { + th.setData({show_bind: 1}) + }) + }, + + + save_the_data: async function (r, e, sessionKey, openid) { + var app = getApp(), a = app, th = this; + var dd = { + oauth: "miniapp", + nickname: a.clear_word(r.nickName), + head_pic: r.avatarUrl, + sex: r.gender, + terminal: "miniapp", + sessionKey: sessionKey, + openid: openid, + encryptedData: e.encryptedData, + iv: e.iv, + store_id: getApp().globalData.setting.stoid, + }; + //--如果有邀请人的时候-- + if (th.data.first_leader) { + //判断一下分享人是不是分享商 + await app.request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + th.data.first_leader, {}).then(res => { + if (res.data.code == 0) { + var user = res.data.data; + if (user.is_distribut == 1) { + dd.first_leader = th.data.first_leader; + } + } + }) + } + //-- 导购会员ID -- + if (getApp().globalData.guide_id) { + dd.guide_id = getApp().globalData.guide_id; + } + + //门店的扫描识别码 + if (getApp().globalData.store_number) { + dd.SunCode = encodeURIComponent(getApp().globalData.store_number.trim()); + } + + console.log("-----会员注册的信息-------"); + console.log(dd); + app.request.get("/api/weshop/users/thirdLogin", { + data: dd, + success: function (e) { + + if (e.data.code == 0) { + app.globalData.user_id = e.data.data.user_id; + } else { + return app.showWarning("授权登入失败！" + e.data.msg); + } + + + var need_go = 0; + var t_user = e.data.data; + + + getApp().globalData.login_back = 1; + wx.setStorageSync("userinfo", e.data.data); + wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic); + + //如果有需要完善的信息没有完善，就需要跳转 + if (!t_user['vipname'] && th.data.name_need_go) { + need_go = 1; + } + if (!t_user['birthday'] && th.data.birth_need_go) { + need_go = 1; + } + if (!t_user['idcard'] && th.data.idcard_need_go) { + need_go = 1; + } + if (!t_user['address'] && th.data.address_need_go) { + need_go = 1; + } + if (!t_user['pickup_id'] && th.data.pick_need_go) { + need_go = 1; + } + if (!t_user['sex'] && th.data.sex_need_go) { + need_go = 1; + } + if (!t_user['fromuser_id'] && th.data.introducer_need_go) { + need_go = 1; + } + + if (need_go) { + getApp().goto("/packageA/pages/profile/profile?is_back=1"); + } else { + that.cancle_bind();//关闭 + } + + }, + failStatus: function (t) { + return app.my_warnning("授权登入失败,请稍后再试!", 0, that); + }, + fail: function (t) { + return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; + } + }); + }, + + bind_bnerr: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = this.data.imghots + "/miniapp/images/logo.png"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + }, + + //-- 会员授权 -- + bindUserInfo: function (ee) { + var that = this; + var user = ee.detail.userInfo; + //此处授权得到userInfo + getApp().globalData.getu = user; + + //--拿下code-- + wx.login({ + success: function (o) { + var dd = { + js_code: o.code, + store_id: os.stoid, + nickname: app.clear_word(app.globalData.getu.nickName), + head_pic: app.clear_word(app.globalData.getu.avatarUrl) + }; + //-- 导购会员ID -- + if (getApp().globalData.guide_id) { + dd.guide_id = getApp().globalData.guide_id; + } + + getApp().request.get("/api/weshop/users/openidandkey", { + data: dd, + success: function (e) { + if (e.data.code == 0) { + that.setData({user: user}) + //如果有会员的话,没有sessionKey + if (!e.data.data.sessionKey) { + getApp().showWarning("登录成功"); + getApp().globalData.userInfo = e.data.data; + getApp().globalData.user_id = e.data.data.user_id; + getApp().globalData.openid = e.data.data.weapp_openid; + //把会员的信息存在内存 + wx.setStorageSync("userinfo", e.data.data); + + setTimeout(function () { + //getApp().globalData.login_back = 1; + that.cancle_bind(); //关闭 + }, 1000) + } else { + getApp().globalData.sessionKey = e.data.data.sessionKey; + getApp().globalData.openid = e.data.data.openid; + that.setData({show_bind: 1}); + } + } else { + getApp().confirmBox(e.data.msg); + } + } + }); + } + }) + + + }, + + + close_pop_back: function () { + this.close_pop(); + wx.navigateBack({delta: 1}) + }, + + + // 是否同意协议 + isAgree(e) { + let isAgree = null; + if (e.detail.value[0]) { + isAgree = true; + } else { + isAgree = false; + } + ; + // this.data.isAgree = isAgree; + this.setData({ + isAgree, + }); + }, + + + //通过路径跳转到其他页面 + goto: function (e) { + console.log('xxxx', e); + var url = e.currentTarget.dataset.url; + getApp().goto(url); + }, + + //订阅消息提醒 + sendsm: function (func) { + var template_id = this.data.template_id; + // //授权订阅 + wx.requestSubscribeMessage({ + tmplIds: [template_id], + success(res) { + func(); + }, + fail(res) { + func(); + } + }) + + }, + } + + +}) diff --git a/packageD/components/diy_login/login.json b/packageD/components/diy_login/login.json new file mode 100644 index 0000000..23b89bc --- /dev/null +++ b/packageD/components/diy_login/login.json @@ -0,0 +1,6 @@ +{ + "navigationBarTitleText": "授权登录", + "usingComponents": { + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageD/components/diy_login/login.wxml b/packageD/components/diy_login/login.wxml new file mode 100644 index 0000000..31de3dd --- /dev/null +++ b/packageD/components/diy_login/login.wxml @@ -0,0 +1,418 @@ + + + + + + + + + {{store.store_name}} + + + + + + + + + + + + + 我已阅读同意 《用户使用协议》与《隐私政策》 + + + + + + + + + + + + + + + + + + 暂不登录 + + + + + + + + + + + + 登录手机号，同步会员信息以及订单记录 + + + 暂不授权 + + + + + + + + + + + + + + + + + + + + + + + {{user.nickname}} + + + + + + + + + + + + + + 推荐人: + + + + +{{reg_info.introducer}}积分 + +{{reg_info.introducer}}成长值 + + + + + + 姓名: + + + +{{reg_info.name}}积分 + +{{reg_info.name}}成长值 + + + + + 性别: + + + + + + + + + 男 + + + + + + + + + 女 + + + + + +{{reg_info.sex}}积分 + +{{reg_info.sex}}成长值 + + + + + 出生日期: + + + + + + + {{datet?datet:"请选择时间"}}∟ + + + + + + + + +{{reg_info.birthday}}积分 + +{{reg_info.birthday}}成长值 + + + + + + 身份证: + + + +{{reg_info.idcard}}积分 + +{{reg_info.idcard}}成长值 + + + + + + 地址: + + + +{{reg_info.address}}积分 + +{{reg_info.address}}成长值 + + + + + + + 所属门店: + + {{stoname?stoname:'请选择门店'}} + ∟ + + + + +{{reg_info.pick}}积分 + +{{reg_info.pick}}成长值 + + + + + + + + + + 我的兴趣 + ∟ + + + + + + {{label}} + + + + + + + 标签 + + + + + + + + + + + + 我已阅读同意 《用户使用协议》与《隐私政策》 + + + + + + + + 保存 + 保存成功即可获得一张{{couponInfo}} + + + + + + + + + + + + + {{choice_sort_store==0?'附近的门店':region_name}} + + + + + + {{choice_sort_store==0?'更多门店':'返回'}} + + + + + + + + + + + + + + + Г + + + + + + + + {{item.pickup_name}} + + + + 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}} + + + 地址:{{item.fulladdress}} + + + + + + + + + + Г + + + + + + + + + {{item.pickup_name}} + + + 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}} + + + + 地址:{{item.fulladdress}} + + + + + + + + + + + + Г + + + + + + + + + {{item.pickup_name}} + + + 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}} + + + 地址:{{item.fulladdress}} + + + + + + + + + + + 确定 + + + + + + + + + + 门店分类选择 + + + + + + + + + + + {{item.name}} + + + + + + + + + + + diff --git a/packageD/components/diy_login/login.wxss b/packageD/components/diy_login/login.wxss new file mode 100644 index 0000000..9ef1954 --- /dev/null +++ b/packageD/components/diy_login/login.wxss @@ -0,0 +1,79 @@ +@import '/app.wxss'; + +.fir_view{ + position: fixed;top:0;left:0; width: 100%; height: 100%; + background-color: #fff;z-index: 1000; +} +.logins { + width: 100%; + /* padding-bottom: 130rpx; */ + background-position: center; + background-repeat: no-repeat; + background-size: cover +} + +.login_img { + width: 192rpx; + height: 192rpx; + border-radius: 50%; +} +.phones{ + margin-bottom: 48rpx; +} +.getPhoneNumber { + width: 600rpx; + height: 94rpx; + line-height: 94rpx; + background-color: #57b837; + border-radius: 48rpx; + color: rgb(255,255,255); + font-size: 32rpx; + margin-top: 40rpx; +} +.we_chat{ + width: 55rpx; + height: 45rpx; + margin-right: 15rpx; +} +.userlongin{ + color: #767f8e; +} +button{ + border:none; +} +.login_img_back{ width: 100%;} +.p_content{ + margin: 10%; + width: 80%; + height:340rpx; + top:50%; + margin-top: -180rpx; + background-color: #fff; + z-index: 12; + position: fixed; +} + +.btn_view { height: 120rpx; line-height: 120rpx; border-top:1rpx solid #e9e9e9;} +.p_title{ height:220rpx; padding: 0 40rpx; line-height: 50rpx;} +.g_mobile{ background: none;line-height: normal;} +.b_right{border-right:1rpx solid #e9e9e9;} + +.ali-c{align-items: center;} +.flex-center2{ justify-content: center;} +.f2 { + flex: 2 0; +} + +.middle_view{ + position: absolute; left: 0; width: 100%; text-align: center; +} + +/*checkbox 选项框大小 */ +checkbox .wx-checkbox-input { + width: 30rpx; + height: 30rpx; +} + +.gray { + color: #767f8e; +} diff --git a/packageD/pages/AI-test-skin/success_result/acne/acne.js b/packageD/pages/AI-test-skin/success_result/acne/acne.js index 30c043e..adfa97e 100644 --- a/packageD/pages/AI-test-skin/success_result/acne/acne.js +++ b/packageD/pages/AI-test-skin/success_result/acne/acne.js @@ -16,7 +16,7 @@ module.exports = { }) var re_word=set.join(','); //-- 服务卡 -- - var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ th.setData({acne_fuwu:res.data.data.pageData}) @@ -24,7 +24,7 @@ module.exports = { }) //-- 商品 -- - var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ th.setData({acne_goods:res.data.data.pageData}) @@ -32,7 +32,7 @@ module.exports = { }) // 优惠券 - var url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ var arr=res.data.data.pageData; diff --git a/packageD/pages/AI-test-skin/success_result/blackhead/blackhead.js b/packageD/pages/AI-test-skin/success_result/blackhead/blackhead.js index 3d31a69..9c249eb 100644 --- a/packageD/pages/AI-test-skin/success_result/blackhead/blackhead.js +++ b/packageD/pages/AI-test-skin/success_result/blackhead/blackhead.js @@ -11,7 +11,8 @@ module.exports = { }) var re_word=set.join(','); //-- 服务卡 -- - var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code=" + +r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ th.setData({blackhead_fuwu:res.data.data.pageData}) @@ -19,7 +20,8 @@ module.exports = { }) //-- 商品 -- - var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/goods/page?orderField=RAND()&recommend_code=" + +r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ th.setData({blackhead_goods:res.data.data.pageData}) @@ -27,7 +29,7 @@ module.exports = { }) // 优惠券 - var url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ var arr=res.data.data.pageData; diff --git a/packageD/pages/AI-test-skin/success_result/dark/dark.js b/packageD/pages/AI-test-skin/success_result/dark/dark.js index 9cebafa..9ce215f 100644 --- a/packageD/pages/AI-test-skin/success_result/dark/dark.js +++ b/packageD/pages/AI-test-skin/success_result/dark/dark.js @@ -16,7 +16,7 @@ module.exports = { //获取黑眼圈的类型 var re_word= arr.join(',') //-- 服务卡 -- - var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ th.setData({dark_fuwu:res.data.data.pageData}) @@ -24,14 +24,14 @@ module.exports = { }) //-- 商品 -- - var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ th.setData({dark_goods:res.data.data.pageData}) } }) // 优惠券 - var url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ var arr=res.data.data.pageData; diff --git a/packageD/pages/AI-test-skin/success_result/fuwu.wxml b/packageD/pages/AI-test-skin/success_result/fuwu.wxml index 23b7d6d..4d75016 100644 --- a/packageD/pages/AI-test-skin/success_result/fuwu.wxml +++ b/packageD/pages/AI-test-skin/success_result/fuwu.wxml @@ -1,4 +1,4 @@ - + diff --git a/packageD/pages/AI-test-skin/success_result/goods.wxml b/packageD/pages/AI-test-skin/success_result/goods.wxml index 2f76e90..51e23af 100644 --- a/packageD/pages/AI-test-skin/success_result/goods.wxml +++ b/packageD/pages/AI-test-skin/success_result/goods.wxml @@ -1,4 +1,4 @@ - + diff --git a/packageD/pages/AI-test-skin/success_result/pore/pore.js b/packageD/pages/AI-test-skin/success_result/pore/pore.js index 92609e4..83d9246 100644 --- a/packageD/pages/AI-test-skin/success_result/pore/pore.js +++ b/packageD/pages/AI-test-skin/success_result/pore/pore.js @@ -13,7 +13,7 @@ module.exports = { }) var re_word=set.join(','); //-- 服务卡 -- - var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ th.setData({pore_fuwu:res.data.data.pageData}); @@ -21,7 +21,7 @@ module.exports = { }) //-- 商品 -- - var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ th.setData({pore_goods:res.data.data.pageData}); @@ -29,7 +29,7 @@ module.exports = { }) // 优惠券 - var url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ var arr=res.data.data.pageData; diff --git a/packageD/pages/AI-test-skin/success_result/s_filter.wxs b/packageD/pages/AI-test-skin/success_result/s_filter.wxs index ffeb466..70c172f 100644 --- a/packageD/pages/AI-test-skin/success_result/s_filter.wxs +++ b/packageD/pages/AI-test-skin/success_result/s_filter.wxs @@ -9,17 +9,17 @@ var get_dark_type = function(column) { } //跳转的接口 -var get_goods_url=function(item){ - var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id +var get_goods_url=function(item,skinface_id){ + var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&skinface_id="+skinface_id; if(item.prom_type == 9) { - url1 = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id; + url1 = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id+"&skinface_id="+skinface_id; } if(item.prom_type==8){ - url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id + url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&skinface_id="+skinface_id; } if(item.prom_type==1 && item.prom_id>0 ){ - url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1"; + url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1&skinface_id="+skinface_id; } return url1; } @@ -42,6 +42,7 @@ var dryoil_check=function(skin_dryoil_check){ case 0:return '干性'; case 1:return '中性'; case 2:return '油性'; + case 3:return '混合性'; } return ''; } diff --git a/packageD/pages/AI-test-skin/success_result/sensitive/sensitive.js b/packageD/pages/AI-test-skin/success_result/sensitive/sensitive.js index 5c00212..03588e9 100644 --- a/packageD/pages/AI-test-skin/success_result/sensitive/sensitive.js +++ b/packageD/pages/AI-test-skin/success_result/sensitive/sensitive.js @@ -11,7 +11,7 @@ module.exports = { }) var re_word = set.join(','); //-- 服务卡 -- - var url = "/api/weshop/serviceCard/page?orderField=RAND()&recommend_code=" + r_code + "&store_id=" + stoid + "&recommend_word=" + re_word + "&pageSize=2"; + var url = "/api/weshop/serviceCard/page?orderField=RAND()&recommend_code=" + r_code + "&store_id=" + stoid + "&recommend_word=" + re_word + "&pageSize=2"+"&skinface_id="+th.data.id; getApp().request.promiseGet(url, {}).then(res => { if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) { th.setData({ sensitive_fuwu: res.data.data.pageData }) @@ -19,14 +19,14 @@ module.exports = { }) //-- 商品 -- - var url = "/api/weshop/goods/page?orderField=RAND()&recommend_code=" + r_code + "&store_id=" + stoid + "&recommend_word=" + re_word + "&pageSize=2"; + var url = "/api/weshop/goods/page?orderField=RAND()&recommend_code=" + r_code + "&store_id=" + stoid + "&recommend_word=" + re_word + "&pageSize=2"+"&skinface_id="+th.data.id; getApp().request.promiseGet(url, {}).then(res => { if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) { th.setData({ sensitive_goods: res.data.data.pageData }) } }) // 优惠券 - var url = "/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code=" + r_code + "&store_id=" + stoid + "&recommend_word=" + re_word + "&pageSize=2"; + var url = "/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code=" + r_code + "&store_id=" + stoid + "&recommend_word=" + re_word + "&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res => { if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) { var arr=res.data.data.pageData; diff --git a/packageD/pages/AI-test-skin/success_result/speckle/speckle.js b/packageD/pages/AI-test-skin/success_result/speckle/speckle.js index 2adfa99..b5a2edb 100644 --- a/packageD/pages/AI-test-skin/success_result/speckle/speckle.js +++ b/packageD/pages/AI-test-skin/success_result/speckle/speckle.js @@ -17,7 +17,7 @@ module.exports = { }) var re_word=set.join(','); //-- 服务卡 -- - var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ th.setData({speckle_fuwu:res.data.data.pageData}) @@ -25,7 +25,7 @@ module.exports = { }) //-- 商品 -- - var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ th.setData({speckle_goods:res.data.data.pageData}) @@ -33,7 +33,7 @@ module.exports = { }) // 优惠券 - var url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ var arr=res.data.data.pageData; diff --git a/packageD/pages/AI-test-skin/success_result/success_result.js b/packageD/pages/AI-test-skin/success_result/success_result.js index 07effe0..3775f98 100644 --- a/packageD/pages/AI-test-skin/success_result/success_result.js +++ b/packageD/pages/AI-test-skin/success_result/success_result.js @@ -60,6 +60,9 @@ Page({ acne_num2: 0, //痘印 acne_num3: 0, //脓包 acne_num4: 0, //结节 + + + login_set:{show_no:0} }, onReady: function () { @@ -95,7 +98,8 @@ Page({ } } - this.data.id=id; + //this.data.id=id; + this.setData({id:id}) if (first_leader) { console.log("log---".first_leader); getApp().globalData.first_leader = first_leader; @@ -123,6 +127,7 @@ Page({ var bi1 = (th.data.cHeight * 0.8 * 0.8) / (th.data.cWidth * 0.8); th.get_data(function (json, json1, img) { + var key_arr=[]; //-- 数据先存着 -- var face_data = th.data.face_data = json.face_list[0]; var face_data1 = th.data.face_data1 = json1.face_list[0]; @@ -146,7 +151,14 @@ Page({ if (dark_type1 > dark_type) { dark_type = dark_type1; } + + key_arr.push(35); var skin_sensitive_check = parseInt(face_data.skinquality.skin_sensitive_check[0]); + switch(skin_sensitive_check){ + case 0: key_arr.push(36); break;//耐受 + case 1: key_arr.push(37); break;//中性 + case 2: key_arr.push(38); break;//敏感 + } var skin_dryoil_check = face_data.skinquality.skin_dryoil_check; var location = face_data.location; @@ -176,6 +188,7 @@ Page({ else if (skin_dryoil_check_arr.length == 1) skin_dryoil_check_type = parseInt(skin_dryoil_check_arr[0]); else skin_dryoil_check_type = 3; + var wrinkle_types = face_data.wrinkle.wrinkle_types; var w_arr = wrinkle_types.filter(function (e) { return e == 1; @@ -222,26 +235,63 @@ Page({ return e.type == 3; }) th.data.acne_num4 = a_arr.length; + let tab_arr = [{ id: 'zong_he', name: '综合肤质' }]; if (pore_num) { tab_arr.push({ id: 'mao_kong', name: '毛孔' }); + key_arr.push(30); } if (blackhead_num) { tab_arr.push({ id: 'hei_tou', name: '黑头' }); + key_arr.push(26); } if (speckle_num) { tab_arr.push({ id: 'se_ban', name: '色斑' }); + key_arr.push(13); } if (wrinkle_num) { tab_arr.push({ id: 'zhou_wen', name: '皱纹' }); + key_arr.push(2); } if (dark_type > -1) { tab_arr.push({ id: 'hei_yan_quan', name: '黑眼圈' }); + key_arr.push(18); + + switch(dark_type){ + case 0: key_arr.push(19); break;//黑眼圈-色素型 + case 1: key_arr.push(20); break;//黑眼圈-阴影型 + case 2: key_arr.push(21); break;//黑眼圈-血管型 + } + } if (acne_num) { tab_arr.push({ id: 'cuo_chuang', name: '痤疮' }); + key_arr.push(9); } tab_arr.push({ id: 'min_gan_du', name: '敏感度' }); + + if(th.data.wrinkle_num1){ key_arr.push(3); } //抬头纹 + if(th.data.wrinkle_num2){ key_arr.push(4); } //川字纹 + if(th.data.wrinkle_num3){ key_arr.push(5); } //眼周细纹 + if(th.data.wrinkle_num4){ key_arr.push(6); } //鱼尾纹 + if(th.data.wrinkle_num5){ key_arr.push(7); } //法令纹 + if(th.data.wrinkle_num6){ key_arr.push(8); } //口周纹 + if(th.data.acne_num1) { key_arr.push(10); } //粉刺 + if(th.data.acne_num2) { key_arr.push(11); } //痘印 + if(th.data.acne_num3) { key_arr.push(12); } //脓包 + if(th.data.acne_num4) { key_arr.push(39); } //结节 + + if(!th.data.skin_key){ + getApp().request.promisePut('/api/weshop/face/storeSkinface/update', { + is_json:1, + data: { + id:th.data.id, + skin_key:key_arr.join(","), + store_id:setting.stoid + }, + }); + } + th.setData({ acne_num: acne_num, speckle_num: speckle_num, @@ -279,29 +329,10 @@ Page({ acne_num3: th.data.acne_num3, //脓包 acne_num4: th.data.acne_num4, //结节 }) - var sort = 1; - //-- 调用毛孔的推荐函数 -- - if (pore_num > 0) - pore.get_goods(th, setting.stoid, sort++); - //-- 调用黑头的推荐函数 -- - if (blackhead_num > 0) - blackhead.get_goods(th, setting.stoid, sort++); - //-- 调用色斑的推荐函数 -- - if (speckle_num > 0) - speckle.get_goods(th, setting.stoid, sort++); - //-- 调用皱纹的推荐函数 -- - if (wrinkle_num > 0) - wrinkle.get_goods(th, setting.stoid, sort++); - //-- 黑眼圈 -- - if (dark_type > -1) - dark.get_goods(th, setting.stoid, sort++); - //-- 黑眼圈 -- - if (acne_num > -0) - acne.get_goods(th, setting.stoid, sort++); - sensitive.get_goods(th, setting.stoid, sort++); - //-- 获取一下分享要用的图片 -- - th.set_share_img(); - acne.get_goods(th, setting.stoid); + + //调用推荐 + if(getApp().globalData.user_id) th.recommend(); + // let { heightRecord, tab } = th.data; // tab.forEach(item => { @@ -342,9 +373,50 @@ Page({ }) } }) + + //未登陆要显示登陆 + if(!getApp().globalData.user_id){ + wx.showToast({ + title: "您还未登陆，请先登陆", + icon: 'none', + duration: 3000 + }) + setTimeout(function () { + th.setData({show_login:1}) + },1000) + + } + }, + recommend:function () { + var th=this; + var sort = 1; + //-- 调用毛孔的推荐函数 -- + if (th.data.pore_num > 0) + pore.get_goods(th, setting.stoid, sort++); + //-- 调用黑头的推荐函数 -- + if (th.data.blackhead_num > 0) + blackhead.get_goods(th, setting.stoid, sort++); + //-- 调用色斑的推荐函数 -- + if (th.data.speckle_num > 0) + speckle.get_goods(th, setting.stoid, sort++); + //-- 调用皱纹的推荐函数 -- + if (th.data.wrinkle_num > 0) + wrinkle.get_goods(th, setting.stoid, sort++); + //-- 黑眼圈 -- + if (th.data.dark_type > -1) + dark.get_goods(th, setting.stoid, sort++); + //-- 黑眼圈 -- + if (th.data.acne_num > -0) + acne.get_goods(th, setting.stoid, sort++); + sensitive.get_goods(th, setting.stoid, sort++); + //-- 获取一下分享要用的图片 -- + th.set_share_img(); + //acne.get_goods(th, setting.stoid); + }, + //-- 初始等级卡 -- init: function () { var th = this; @@ -398,12 +470,14 @@ Page({ }, //-- 获取json数据 -- get_data: function (func) { + var th=this; var url = "/api/weshop/face/storeSkinface/get/" + setting.stoid + "/" + this.data.id; getApp().request.promiseGet(url, {}).then(res => { if (res.data.code == 0) { var json = JSON.parse(res.data.data.resultjson); var json1 = JSON.parse(res.data.data.detectjson); func(json, json1, res.data.data.img) + if(res.data.data.skin_key) th.data.skin_key=res.data.data.skin_key; } else { getApp().showWarning("获取数据失败"); } @@ -428,6 +502,17 @@ Page({ } }) + var path4= th.data.iurl + "/miniapp/images/skinimg/m_logo.png"; + wx.getImageInfo({ + src: path4, + success: function (res) { + //获取到二维码的图片 + th.data.share_logo = res.path; + } + }) + + + }, scroll_view(e) { let scrollTop = e.detail.scrollTop; @@ -756,7 +841,7 @@ Page({ //--定义的保存图片方法，分享团--- saveImageToPhotosAlbum: function () { var th = this; - var rpx = this.data.cWidth / 750 * 1.35; //基础单位， + var rpx = this.data.cWidth / 750 * 4; //基础单位， //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { @@ -788,7 +873,7 @@ Page({ src: path3, success: function (res) { - var b = 1.1; + var b = 0.9; //获取到二维码的图片 var vpath = res.path; var context = wx.createCanvasContext('share'); @@ -796,59 +881,61 @@ Page({ context.fillStyle = '#ebf6f8'; // 灰色实心矩形 // 1. 语法： x坐标, y坐标, 宽度, 高度 - context.fillRect(0, 0, 750 * rpx, 1320 * rpx); + context.fillRect(0, 0, 750 * rpx, 1093 * rpx); + + context.drawImage(th.data.share_logo, 31 * b * rpx, 20 * b * rpx, 242 * b * rpx, 34 * b * rpx); - context.setFontSize(20 * rpx) context.setFillStyle("#00d8e9") - context.fillText("官方检测认证", 32 * b * rpx, 80 * b * rpx); + context.setFontSize(12 * rpx) + context.fillText("官方检测认证", 32 * b * rpx, 90 * b * rpx); //两个底部颜色 context.fillStyle = '#a7ecf5'; - context.fillRect(32 * b * rpx, 136 * b * rpx, 262 * b * rpx, 18 * b * rpx); - context.fillRect(32 * b * rpx, 194 * b * rpx, 262 * b * rpx, 18 * b * rpx); + context.fillRect(31 * b * rpx, 130 * b * rpx, 196 * b * rpx, 18 * b * rpx); + context.fillRect(31 * b * rpx, 174 * b * rpx, 196 * b * rpx, 18 * b * rpx); - context.setFontSize(42 * b * rpx) + context.setFontSize(31 * b * rpx) context.setFillStyle("#070609") - context.fillText("我的肌底强韧", 32 * b * rpx, 140 * b * rpx); - context.fillText("肌肤鲜活润泽", 32 * b * rpx, 196 * b * rpx); + context.fillText("我的肌底强韧", 32 * b * rpx, 134 * b * rpx); + context.fillText("肌肤鲜活润泽", 32 * b * rpx, 180 * b * rpx); //先画一个圆形 - th.circle(context, 110 * b * rpx, 280 * b * rpx, 140 * b * rpx, "#e7f3f8"); - th.circle(context, 130 * b * rpx, 300 * b * rpx, 120 * b * rpx, "#c8f2fa"); + th.circle(context, 98 * b * rpx, 230 * b * rpx, 140 * b * rpx, "#e7f3f8"); + th.circle(context, 118 * b * rpx, 250 * b * rpx, 120 * b * rpx, "#c8f2fa"); //绘制人脸 - context.drawImage(th.data.share_head, 132 * b * rpx, 310 * b * rpx, 230 * b * rpx, 230 * b * rpx); + context.drawImage(th.data.share_head, 122 * b * rpx, 266 * b * rpx, 225 * b * rpx, 225 * b * rpx); //左右俩个框并填充文字 - th.darwRoundRect(38 * b * rpx, 340 * b * rpx, 120 * b * rpx, 34 * b * rpx, 17 * b * rpx, context); - th.darwRoundRect(324 * b * rpx, 340 * b * rpx, 120 * b * rpx, 34 * b * rpx, 17 * b * rpx, context); + th.darwRoundRect(38 * b * rpx, 290 * b * rpx, 120 * b * rpx, 34 * b * rpx, 17 * b * rpx, context); + th.darwRoundRect(324 * b * rpx, 290 * b * rpx, 120 * b * rpx, 34 * b * rpx, 17 * b * rpx, context); context.setFontSize(18 * b * rpx) context.setFillStyle("black") - context.fillText("黑眼圈 重度", 50 * b * rpx, 363 * b * rpx); - context.fillText("毛孔 " + th.data.pore_num, 340 * b * rpx, 363 * b * rpx); + context.fillText("黑眼圈 重度", 50 * b * rpx, 313 * b * rpx); + context.fillText("毛孔 " + th.data.pore_num, 340 * b * rpx, 313 * b * rpx); //左右俩个框并填充文字 - th.darwRoundRect(40 * b * rpx, 412 * b * rpx, 116 * b * rpx, 34 * b * rpx, 17 * b * rpx, context); - th.darwRoundRect(348 * b * rpx, 412 * b * rpx, 116 * b * rpx, 34 * b * rpx, 17 * b * rpx, context); + th.darwRoundRect(40 * b * rpx, 362 * b * rpx, 90 * b * rpx, 34 * b * rpx, 17 * b * rpx, context); + th.darwRoundRect(348 * b * rpx, 362 * b * rpx, 100 * b * rpx, 34 * b * rpx, 17 * b * rpx, context); context.setFillStyle("black") - context.fillText("黑头 " + th.data.blackhead_num, 60 * b * rpx, 434 * b * rpx); - context.fillText("色斑 " + th.data.speckle_num, 362 * b * rpx, 434 * b * rpx); + context.fillText("黑头 " + th.data.blackhead_num, 60 * b * rpx, 384 * b * rpx); + context.fillText("色斑 " + th.data.speckle_num, 362 * b * rpx, 384 * b * rpx); //左右俩个框并填充文字 - th.darwRoundRect(60 * b * rpx, 484 * b * rpx, 116 * b * rpx, 34 * b * rpx, 17 * b * rpx, context); - th.darwRoundRect(328 * b * rpx, 484 * b * rpx, 116 * b * rpx, 34 * b * rpx, 17 * b * rpx, context); + th.darwRoundRect(50 * b * rpx, 440 * b * rpx, 116 * b * rpx, 34 * b * rpx, 17 * b * rpx, context); + th.darwRoundRect(318 * b * rpx, 440 * b * rpx, 116 * b * rpx, 34 * b * rpx, 17 * b * rpx, context); context.setFillStyle("black") - context.fillText("皱纹 " + th.data.wrinkle_num, 74 * b * rpx, 506 * b * rpx); - context.fillText("痤疮 " + th.data.acne_num, 350 * b * rpx, 506 * b * rpx); + context.fillText("皱纹 " + th.data.wrinkle_num, 74 * b * rpx, 462 * b * rpx); + context.fillText("痤疮 " + th.data.acne_num, 350 * b * rpx, 462 * b * rpx); //底部的绘制 - th.darwRoundRect(38 * b * rpx, 650 * b * rpx, 430 * b * rpx, 160 * b * rpx, 10 * b * rpx, context); + th.darwRoundRect(38 * b * rpx, 532 * b * rpx, 412 * b * rpx, 150 * b * rpx, 10 * b * rpx, context); //绘制二维码 - context.drawImage(vpath, 60 * b * rpx, 672 * b * rpx, 120 * b * rpx, 120 * b * rpx); + context.drawImage(vpath, 60 * b * rpx, 547 * b * rpx, 116 * b * rpx, 116 * b * rpx); context.setFillStyle("black") context.setFontSize(27 * b * rpx) - context.fillText("美肤管家AI测肤", 200 * b * rpx, 726 * b * rpx); + context.fillText("美肤管家AI测肤", 200 * b * rpx, 600 * b * rpx); context.setFontSize(19 * b * rpx) - context.fillText("科学了解皮肤的真实状态", 200 * b * rpx, 766 * b * rpx); + context.fillText("科学了解皮肤的真实状态", 200 * b * rpx, 640 * b * rpx); //把画板内容绘制成图片，并回调 画板图片路径 context.draw(false, function () { @@ -857,9 +944,9 @@ Page({ x: 0, y: 0, width: 750, - height: 1320, - destWidth: 1.4 * 750 * 750 / th.data.screenWidth, - destHeight: 1.4 * 750 * 750 / th.data.screenWidth, + height: 1093, + destWidth: 5 * 750, + destHeight: 5 * 1093, canvasId: 'share', success: function (res) { that.setData({ @@ -1093,6 +1180,19 @@ Page({ wx.hideLoading(); if (res.data.code == 0) { app.my_warnning("领取成功", 1, th); + + //点击量的保存 + getApp().request.promisePost("/api/weshop/face/skinGoodsBrowse/save",{ + data:{ + store_id:setting.stoid, + goods_id:cid, + user_id:getApp().globalData.user_id, + addtime:ut.gettimestamp(), + skinface_id:th.data.id, + goods_type:2 + } + }).then(res=>{}) + lq_num++; var text = q_word + "[" + index + "].lqnum"; var text2 = q_word + "[" + index + "].linging"; @@ -1112,5 +1212,12 @@ Page({ }, + clos_login:function () { + this.setData({show_login:0}); + //调用推荐 + if(getApp().globalData.user_id) this.recommend(); + } + + }) \ No newline at end of file diff --git a/packageD/pages/AI-test-skin/success_result/success_result.json b/packageD/pages/AI-test-skin/success_result/success_result.json index f89c370..b012b13 100644 --- a/packageD/pages/AI-test-skin/success_result/success_result.json +++ b/packageD/pages/AI-test-skin/success_result/success_result.json @@ -1,6 +1,7 @@ { "usingComponents": { - "warn": "/components/long_warn/long_warn" + "warn": "/components/long_warn/long_warn", + "login": "../../../components/diy_login/login" }, "disableScroll": true, "navigationBarTitleText": "测肤报告" diff --git a/packageD/pages/AI-test-skin/success_result/success_result.wxml b/packageD/pages/AI-test-skin/success_result/success_result.wxml index ae358c7..370048e 100644 --- a/packageD/pages/AI-test-skin/success_result/success_result.wxml +++ b/packageD/pages/AI-test-skin/success_result/success_result.wxml @@ -378,12 +378,12 @@ - + @@ -416,4 +416,7 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/packageD/pages/AI-test-skin/success_result/success_result.wxss b/packageD/pages/AI-test-skin/success_result/success_result.wxss index 3093e14..7c844c3 100644 --- a/packageD/pages/AI-test-skin/success_result/success_result.wxss +++ b/packageD/pages/AI-test-skin/success_result/success_result.wxss @@ -744,15 +744,15 @@ page { .sh_close { position: absolute; right: 34rpx; - top: 36rpx; - width: 65rpx; - height: 65rpx; + top: 28rpx; + width: 60rpx; + height: 60rpx; display: flex; justify-content: center; align-items: center; - font-size: 26rpx; + font-size: 32rpx; border-radius: 50%; - background-color: grey; + background-color: #B1B9BB; color: #fff } diff --git a/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.js b/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.js index 83c68b2..261ee14 100644 --- a/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.js +++ b/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.js @@ -17,7 +17,7 @@ module.exports = { }) var re_word=set.join(','); //-- 服务卡 -- - var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/serviceCard/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ th.setData({wrinkle_fuwu:res.data.data.pageData}) @@ -25,7 +25,7 @@ module.exports = { }) //-- 商品 -- - var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/goods/page?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ th.setData({wrinkle_goods:res.data.data.pageData}) @@ -33,7 +33,7 @@ module.exports = { }) // 优惠券 - var url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"; + var url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2"+"&skinface_id="+th.data.id+"&user_id="+getApp().globalData.user_id; getApp().request.promiseGet(url, {}).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ var arr=res.data.data.pageData; diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 71546a4..0ecd251 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -43,6 +43,9 @@ Page({ ladder_map:{}, //阶梯促销需要的map + promgoods_map:{}, + promgoods_list:{} + }, onLoad: function () { var a = this, @@ -161,6 +164,8 @@ Page({ onHide() { this.data.zuhe_map = {}; + this.data.promgoods_map={}; + this.data.promgoods_list={}; }, onUnLoad() { getApp().globalData.cart_zh_act = null; @@ -226,7 +231,7 @@ Page({ th.data.in_zhact_gdmap={}; th.data.ladder_map={}; var rd = Math.random().toString(36).substr(2, 15); - var user_id = getApp().globalData.userInfo.user_id; + var user_id = getApp().globalData.user_id; getApp().request.get("/api/weshop/cart/list", { data: { user_id: app.globalData.user_id, @@ -2828,6 +2833,7 @@ Page({ //检查莫个门店下的商品是不是优惠活动，有的话，看要不要送礼品，同时有没有倍增 check_prom_activity: async function (cindex) { var make_up_arr = new Array(); + var send_gift_arr = new Array(); var th = this; var map = new Map(); var list = JSON.parse(JSON.stringify(this.data.requestData[cindex])); @@ -2888,33 +2894,25 @@ Page({ [rq_text2]:null, }) + var gift_text = "requestData[" + cindex + "].send_gift_arr"; + this.setData({ + [gift_text]:null, + }) + return false; } - /*-- - var map2=new Map(); - //请那些是赠品，但是优惠活动并没有被选中的商品要删除，同时满足条件的要放到map2， - for(var i in list.goods){ - var item=list.goods[i]; - if(item.is_gift){ - if(map.has(item.prom_id+"")){ - if(!map2.has(item.prom_id+"")){ - map2.set(item.prom_id+"",i) - } - }else{ - var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; - list.goods.splice(i,1); - getApp().request.delete(url, {}); - } - } - }--*/ - - var t_prom_list = new Array(); + //-- 循环判断活动 -- for (let p_item of map.entries()) { var prom = null; - await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + p_item[0], {}).then(res => { - if (res.data.code == 0) { - prom = res.data.data; - } - }) + //使用缓存，减少接口的调用 + if(th.data.promgoods_map[p_item[0]]){ + prom=th.data.promgoods_map[p_item[0]]; + }else{ + await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + p_item[0], {}).then(res => { + if (res.data.code == 0) { + prom = res.data.data; + } + }) + } //如果活动已经结束 if (!prom || prom.is_end || prom.end_time < ut.gettimestamp()) { for (var ii in list.goods) { @@ -2928,89 +2926,182 @@ Page({ continue; } - t_prom_list.push(prom); + if(!th.data.promgoods_map[p_item[0]]) th.data.promgoods_map[p_item[0]]=prom; //---读取打折的详情--- var ob = p_item[1]; var discount = null; - await getApp().request.promiseGet("/api/weshop/goods/getDiscount", { - data: { - price: ob.price, - prom_id: p_item[0], - goods_num: ob.num, - user_id: getApp().globalData.user_id, - is_bz: prom.is_bz - } - }).then(res => { - if (res.data.code == 0) discount = res.data.data; - }) - //---如果有打折的信息，赠送的信息,赠送的时候要判断是不是限购数量--- - if (discount && discount['goods_id'] && discount.limit_num >= discount.bs && discount.gift_storecount >= discount.bs) { - //如果这礼品超了情况下 - if (no_gift_arr.indexOf(discount.gift_id) != -1) continue; - var o = discount.goodsinfo; - var newd = { - goods_id: o.goods_id, - goods_num: discount.bs, - pick_id: list.pid, - user_id: app.globalData.user_id, - store_id: os.stoid, - goods_price: 0, - guide_id:ob.guide_id?ob.guide_id:0, - guide_type:ob.guide_type?ob.guide_type:0, - member_goods_price: 0, - goods_name: o.goods_name, - goods_sn: o.goods_sn, - sku: o.sku, - is_gift: 1, - prom_id: p_item[0], - prom_type: 3, - selected: 1, - gift_id: discount.gift_id, - original_img: th.data.imgUrl + o.original_img - }; + //看一下是不是多赠品，如果是多赠品 + var promgoods_list=null; + if(th.data.promgoods_list[p_item[0]]){ + promgoods_list=th.data.promgoods_list[p_item[0]]; + }else{ + //-- 获取凑单提示 -- + await getApp().request.promiseGet("/api/weshop/promgoodslist/list", { + data: { + prom_id: prom.id + } + }).then(res => { + if (res.data.code == 0) { + promgoods_list = res.data.data; + } + }) + if(!promgoods_list) continue; + th.data.promgoods_list[p_item[0]]=promgoods_list; + } - list2.goods.push(newd); - var all_num = 0; - var all_limit_num = 0; - - for (var i in alllist) { - var list_item = alllist[i]; - for (var j in list_item.goods) { - //如果赠品的ID一样，要进行统计数量 - if (list_item.goods[j].is_gift == 1 && list_item.goods[j].gift_id == newd.gift_id) { - all_num += list_item.goods[j].goods_num; + var is_duo_gift=0; + for (var i in promgoods_list) { + var item = promgoods_list[i]; + if (item.prom_type == 0) { + if (ob.price < item.condition) { + var elem = { + prom_id: prom.id, + diff_type: item.prom_type, + diff: (item.condition - ob.price).toFixed(2), + content: JSON.parse(item.preferential_type) } - if (list_item.goods[j].is_gift == 1 && list_item.goods[j].gift_id == newd.gift_id && list_item.goods[j].prom_id == p_item[0]) { - all_limit_num += list_item.goods[j].goods_num; + make_up_arr.push(elem); + break; + }else{ + var json=JSON.parse(item.preferential_type); + json.prom_id=prom.id; + json.prom_name=prom.name; + if(json.is_gift){ + + var idx=send_gift_arr.findIndex(function (e) { + return e.prom_id==prom.id; + }) + if(idx!=-1){ + send_gift_arr[idx]=json; + }else { + send_gift_arr.push(json); + } + } + } + } else { + if (ob.num < item.condition) { + var elem = { + prom_id: prom.id, + diff_type: item.prom_type, + diff: (item.condition - ob.num).toFixed(2), + content: JSON.parse(item.preferential_type) + } + make_up_arr.push(elem); + break; + }else{ + var json=JSON.parse(item.preferential_type); + json.prom_id=prom.id; + json.prom_name=prom.name; + if(json.is_gift){ + var idx=send_gift_arr.findIndex(function (e) { + return e.prom_id==prom.id; + }) + if(idx!=-1){ + send_gift_arr[idx]=json; + }else { + send_gift_arr.push(json); + } } - } } + } - //-- 赠品的数量超出库存数量和会员的限制,这里是保证所有的赠品部会超出 -- - if (discount.gift_storecount < all_num || discount.limit_num < all_limit_num) { - no_gift_arr.push(discount.gift_id); - //--进入下一个循环 -- - continue; - } + //找到要送的活动 + var idx=send_gift_arr.findIndex(function (e) { + return e.prom_id==prom.id; + }) + if(idx!=-1){ + var cur_json=send_gift_arr[idx]; + if(parseInt(cur_json.zp_mode)==1) is_duo_gift=1; + } + + //-- 只有在单赠品的时候，才要进行计算 -- + if(!is_duo_gift && idx>-1) { + await getApp().request.promiseGet("/api/weshop/goods/getDiscount", { + data: { + price: ob.price, + prom_id: p_item[0], + goods_num: ob.num, + user_id: getApp().globalData.user_id, + is_bz: prom.is_bz + } + }).then(res => { + if (res.data.code == 0) discount = res.data.data; + }) + if(!discount.zp_num || parseInt(discount.zp_num)==0) discount.zp_num=1; + //---如果有打折的信息，赠送的信息,赠送的时候要判断是不是限购数量--- + if (discount && discount['goods_id'] && discount.limit_num >= discount.bs*discount.zp_num + && discount.gift_storecount >= discount.bs*discount.zp_num) { + //如果这礼品超了情况下 + if (no_gift_arr.indexOf(discount.gift_id) != -1) continue; + var o = discount.goodsinfo; + //-- 默认等于1，兼容旧的活动 -- + + var newd = { + goods_id: o.goods_id, + goods_num: discount.bs*discount.zp_num, //是赠品的翻倍 + pick_id: list.pid, + user_id: app.globalData.user_id, + store_id: os.stoid, + goods_price: 0, + guide_id: ob.guide_id ? ob.guide_id : 0, + guide_type: ob.guide_type ? ob.guide_type : 0, + member_goods_price: 0, + goods_name: o.goods_name, + goods_sn: o.goods_sn, + sku: o.sku, + is_gift: 1, + prom_id: p_item[0], + prom_type: 3, + selected: 1, + gift_id: discount.gift_id, + original_img: th.data.imgUrl + o.original_img + }; - var url = "/api/weshop/cart/delGift?store_id=" + newd.store_id + "&user_id=" + - newd.user_id + "&goods_id=" + newd.goods_id + "&is_gift=1&pick_id=" + newd.pick_id + "&prom_id=" + newd.prom_id - await getApp().request.promiseDelete(url, {}) + list2.goods.push(newd); + var all_num = 0; + var all_limit_num = 0; - var add_data = null; - await getApp().request.promisePost("/api/weshop/cart/save", { - data: newd - }).then(res => { - if (res.data.code == 0) { - add_data = res.data.data; + for (var i in alllist) { + var list_item = alllist[i]; + for (var j in list_item.goods) { + //如果赠品的ID一样，要进行统计数量 + if (list_item.goods[j].is_gift == 1 && list_item.goods[j].gift_id == newd.gift_id) { + all_num += list_item.goods[j].goods_num; + } + if (list_item.goods[j].is_gift == 1 && list_item.goods[j].gift_id == newd.gift_id && list_item.goods[j].prom_id == p_item[0]) { + all_limit_num += list_item.goods[j].goods_num; + } + + } + } + + //-- 赠品的数量超出库存数量和会员的限制,这里是保证所有的赠品部会超出 -- + if (discount.gift_storecount < all_num || discount.limit_num < all_limit_num) { + no_gift_arr.push(discount.gift_id); + //--进入下一个循环 -- + continue; + } + + + var url = "/api/weshop/cart/delGift?store_id=" + newd.store_id + "&user_id=" + + newd.user_id + "&goods_id=" + newd.goods_id + "&is_gift=1&pick_id=" + newd.pick_id + "&prom_id=" + newd.prom_id + await getApp().request.promiseDelete(url, {}) + + var add_data = null; + await getApp().request.promisePost("/api/weshop/cart/save", { + data: newd + }).then(res => { + if (res.data.code == 0) { + add_data = res.data.data; + } + }) + if (add_data) { + newd.id = add_data.id; + list.goods.push(newd); } - }) - if (add_data) { - newd.id = add_data.id; - list.goods.push(newd); } } @@ -3021,50 +3112,6 @@ Page({ [rq_text]: list }); - if (!t_prom_list || t_prom_list.length == 0) return false; - - //-- 提示凑单的，放在最后显示 -- - for (let prid in t_prom_list) { - var prom = t_prom_list[prid]; - //-- 获取凑单提示 -- - await getApp().request.promiseGet("/api/weshop/promgoodslist/list", { - data: { - prom_id: prom.id - } - }).then(res => { - if (res.data.code == 0) { - var list = res.data.data; - for (var i in list) { - var item = list[i]; - if (item.prom_type == 0) { - if (ob.price < item.condition) { - var elem = { - prom_id: prom.id, - diff_type: item.prom_type, - diff: (item.condition - ob.price).toFixed(2), - content: JSON.parse(item.preferential_type) - } - make_up_arr.push(elem); - break; - } - } else { - if (ob.num < item.condition) { - var elem = { - prom_id: prom.id, - diff_type: item.prom_type, - diff: (item.condition - ob.num).toFixed(2), - content: JSON.parse(item.preferential_type) - } - make_up_arr.push(elem); - break; - } - } - } - } - }) - } - - var diff_text = "requestData[" + cindex + "].make_up_arr"; //-- 如果有凑单的话 -- if (make_up_arr.length > 0) { @@ -3076,8 +3123,23 @@ Page({ [diff_text]: null }); } - }, + send_gift_arr=send_gift_arr.filter(function (e) { + return e.zp_mode==="1"; + }) + var gift_text = "requestData[" + cindex + "].send_gift_arr"; + //-- 如果有凑单的话 -- + if (send_gift_arr.length > 0) { + this.setData({ + [gift_text]: send_gift_arr + }); + } else { + this.setData({ + [gift_text]: null + }); + } + + }, //去凑单 go_cou_dang: function (e) { var prom_id = e.currentTarget.dataset.prom_id; @@ -3152,13 +3214,14 @@ Page({ } }) }, - - - - - - - + //赠品提示 + show_gift_toast:function () { + wx.showToast({ + title: "请点击结算至提交订单页选择赠品", + icon: 'none', + duration: 2000 + }); + } }); \ No newline at end of file diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml index aff939d..7a6e0bd 100644 --- a/pages/cart/cart/cart.wxml +++ b/pages/cart/cart/cart.wxml @@ -1,12 +1,4 @@ - - - - - - - - - - + + + + 送赠品 + {{item.prom_name}}> + + + diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 14ed292..1da7322 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -130,6 +130,8 @@ Page({ ladder_map: {}, //阶梯促销的map表 is_no_past: 1, state: 0, //阶梯促销的的立即购买也走购物车流程state=1 + show_duo_gift:0, + send_gf:{}, //多赠品的计算 }, onLoad: function (t) { wx.setNavigationBarTitle({ title: "填写订单", }) @@ -168,7 +170,8 @@ Page({ this.setData({ isget_by_quan: {}, is_no_by: {}, - is_by: {} + is_by: {}, + send_gf:{} }) }, @@ -188,7 +191,6 @@ Page({ console.log("getuser_addr") console.log(ie) - //地址切换要把包邮券清空 if (!th.data.user_addr || !ie || th.data.user_addr.address_id != ie.address_id) { var using_quan = th.data.using_quan; @@ -323,11 +325,7 @@ Page({ a.get("/api/weshop/useraddress/page", { data: { user_id: to.globalData.user_id, store_id: oo.stoid, pageSize: 600, t: Math.random() }, success: function (su) { - /*--- - var user_addr=[ - { 'address_id': 882, 'user_id': 2661, 'consignee': '测试测试测', 'province': 3102, 'city': 3431, 'district': 3466, - 'address': 'ed', 'more_address': '山西-长治市-襄垣县-虎（音si）亭镇', 'mobile': 13012345678,'is_default':1}, - ];---*/ + var item = null; if (su.data.code == 0 && su.data.data && su.data.data.pageData) { var user_addr = su.data.data.pageData; @@ -356,7 +354,6 @@ Page({ //----------------展示页面,是再获取用户信息之后-------------- show_page: function () { var th = this, ta = this.data.param; - //th.setData({ userinfo: getApp().globalData.userInfo,}); //这个余额被缓存了 //会员的信息，要获取最新 var user = getApp().globalData.userInfo; @@ -920,10 +917,10 @@ Page({ //如果是优惠活动，就要调用活动，计算价格 th.buy_now_prom_goods(gg.prom_id, t.data.data, function (data) { //判断一下购买商品的数量是不是超过 - if (data.gift_goods_id) { - var num = 1; + if (data.gift_goods_id && (!data.zp_mode || parseInt(data.zp_mode)==0) ) { + var num =data.zp_num?data.zp_num:1; if (data.is_bz == 1) { - num = data.bs; + num = num*data.bs; if (num > data.gift_limit_num) num = 0; } //如果赠品数量超出礼品库存，就取消 @@ -946,7 +943,9 @@ Page({ ob.exp_sum_type = data.gift_exp_sum_type; //商品的物流计算方式 ob.uniform_exp_sum = data.gift_uniform_exp_sum //统一运费的金额 - th.setData({ buy_now_gift_goods: ob }); + var arr_gf=[]; + arr_gf.push(ob); + th.setData({ buy_now_gift_goods: arr_gf}); } } @@ -1175,6 +1174,7 @@ Page({ }, calc_per: async function (c_arr) { + var send_gf={}; var th = this; //-- 循环处理 -- for (var i in c_arr) { @@ -1230,6 +1230,13 @@ Page({ //专享礼包 item_map.zx_libao = get_data.zxlibao; item_map.zx_lb_num = get_data.zxlb_num; + + if(parseInt(get_data.zp_mode)==1){ + if(!send_gf[pickid]) send_gf[pickid]=[]; + send_gf[pickid].push({ + pickup_id:pickid,giftsinfo:get_data.giftsinfo,zp_num:get_data.zp_num, + gf_pr_name:item_map.name,prom_id:item_map.prom_id}); + } } }) } @@ -1349,6 +1356,18 @@ Page({ } } } + + + var arr = Object.keys(send_gf); + var arr2 = Object.keys(th.data.send_gf); + if(arr2.length>0) return false; + + if(arr.length>0){ + th.setData({send_gf:send_gf}) + }else{ + th.setData({send_gf:{}}) + } + }, //-------------------计算订单价格------------------- @@ -1356,10 +1375,7 @@ Page({ var th = this; to.getConfig2(function (ee) { to.getwuliuprice(async function (rs) { - wx.showLoading({ - title: "处理中." - }) - + wx.showLoading({ title: "处理中." }) //是不是区域包邮 th.data.is_area_by=0; //当不是区域不包邮的时候，没有不包邮商品的时候 @@ -1383,7 +1399,6 @@ Page({ var freight_free = ee.freight_free; //全场满多少包邮 var free1=freight_free; - var weight_free = ee.weight_free; //多少kg内包邮 var no_ex_id = ee.no_ex_id; var no_ex_good = null; @@ -1573,7 +1588,6 @@ Page({ - var is_in_no_ex_goods_arr=0; var by_g_weight=0; //--------循环计算商品总物流----------- @@ -1710,11 +1724,7 @@ Page({ if (no_ex_good) { is_good_no_by = th.check_by_goods(no_ex_good, item[j].goods_id); } - //如果达到全场包邮的条件，同时，没有地区不包邮，或者商品不包邮 并且没有超出重量 - /*-- - if (o_price - quan_price >= freight_free && freight_free > 0 && !is_good_no_by && th.data.is_no_by[pickid] != 1 && out_of_weight >=0 ) { - continue; - }--*/ + //--如果是包邮券使用的情况下，如果商品是包邮的，那么就不进行计算-- if (th.data.using_quan[pickid] && th.data.using_quan[pickid].isby == 1 && !is_good_no_by) { continue; @@ -2335,10 +2345,17 @@ Page({ success(res) { let itemSettings = res.subscriptionsSetting.itemSettings; if (itemSettings && itemSettings[template_id] == "accept") { - th.submit_func(); + //要检查一下赠品有可以足够 + th.sub_check_gift(function () { + th.submit_func(); + }) + } else { th.sendsm(function () { - th.submit_func(); + //要检查一下赠品有可以足够 + th.sub_check_gift(function () { + th.submit_func(); + }) }) } } @@ -2479,6 +2496,10 @@ Page({ 'prom_id': th.data.bn_goods.prom_id, //促销活动id }; + if(getApp().globalData.skinface_id){ + goods.skinface_id=getApp().globalData.skinface_id; + } + //-- 把导购的信息填入-- if (gg.guide_id) { goods.guide_id = gg.guide_id; @@ -2756,6 +2777,10 @@ Page({ 'store_id': oo.stoid, }; + if(getApp().globalData.skinface_id){ + goods.skinface_id=getApp().globalData.skinface_id; + } + //-- 线下取价也要写入,组合购的商品不能去线下价格 -- if (g_item.offline_price && t_item.is_offline == 1 && g_item.prom_type != 7) { goods.goods_price = g_item.offline_price; @@ -3992,8 +4017,10 @@ Page({ }, //立即购买获取优惠活动的内容 buy_now_prom_goods: function (prom_id, arr, func) { + var th=this; var price = arr.shop_price * arr.goods_num; var prom = null; + var gg = to.get_b_now(); getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + prom_id, {}).then(res => { if (res.data.code == 0) { prom = res.data.data; @@ -4020,8 +4047,11 @@ Page({ arr.s_intValue = get_data.intValue; arr.s_coupon_id = get_data.coupon_id; arr.s_coupon_num = get_data.coupon_num; + arr.zp_mode = get_data.zp_mode; + arr.zp_num = get_data.zp_num; + //-- 看是不是有赠品 -- - if (get_data.gift_id) { + if (get_data.gift_id && parseInt(get_data.zp_mode)!=1){ arr.gift_id = get_data.gift_id; arr.gift_goods_id = get_data.goods_id; arr.gift_goods_name = get_data.goods_name; @@ -4042,6 +4072,16 @@ Page({ arr.zx_lb_num = get_data.zxlb_num; arr.prom_id = prom_id; + + var send_gf={}; + var pickid=gg.pick_id; + if(parseInt(get_data.zp_mode)==1){ + if(!send_gf[pickid]) send_gf[pickid]=[]; + send_gf[pickid].push({ + pickup_id:pickid,giftsinfo:get_data.giftsinfo,zp_num:get_data.zp_num, + gf_pr_name:prom.name,prom_id:prom.prom_id}); + th.setData({send_gf:send_gf}); + } } func(arr); }) @@ -4085,6 +4125,7 @@ Page({ }) var ob = {}; ob.prom_id = item.prom_id; + ob.name = prom.name; ob.price = item.goods_price * item.goods_num; ob.goods_num = item.goods_num; ob.is_bz = prom.is_bz; @@ -4102,6 +4143,7 @@ Page({ } }) ob.prom_id = item.prom_id; + ob.name = prom.name; ob.price = item.goods_price * item.goods_num; ob.goods_num = item.goods_num; ob.is_bz = prom.is_bz; @@ -4118,8 +4160,9 @@ Page({ //计算立即购买赠品的物流费用 get_now_gift_goods_wuliu: function (code, o_shipping_price, user_addr, gift_freight_free, out_of_weight, allpice, rs, shipping_price, no_by_data, goods_weight1, goods_piece1) { - var good = this.data.buy_now_gift_goods; + var good_arr = this.data.buy_now_gift_goods; var goods_weight = -1, goods_piece = -1; + var gift_shipping_price = 0; if (shipping_price) { @@ -4127,31 +4170,6 @@ Page({ } var th = this; var out_of_weight = null; - switch (good['exp_sum_type']) { - case 1: - //统一运费 - gift_shipping_price += good['uniform_exp_sum']; - gift_shipping_price += o_shipping_price; - break; - case 2: - if (goods_weight < 0) goods_weight = 0; - //累积商品重量 每种商品的重量 * 数量 - goods_weight += good['weight'] * parseInt(good['buynum']); - if (goods_weight1 > 0) { - out_of_weight = gift_weight_free - goods_weight; - //不能调换位置 下面goods_weight会变大 - goods_weight += goods_weight1; - } - break; - case 3: - if (goods_piece < 0) goods_piece = 0; - //累积商品数量 - goods_piece += parseInt(good['buynum']); - if (goods_piece1) { - goods_piece += goods_piece1; - } - break; - } //如果有设置不包邮区域的时候 @@ -4162,12 +4180,42 @@ Page({ th.data.is_no_by[th.data.bn_pick] = 1; } } - //如果有设置不包邮商品 - if (no_by_data && no_by_data.goods_list && gift_freight_free) { - if (th.check_by_goods(no_by_data.goods_list, good.goods_id)) { - gift_freight_free = 0; - // out_of_weight = 0 - th.data.is_no_by[th.data.bn_pick]=1; + + for(var i in good_arr) { + var good=good_arr[i]; + switch (good['exp_sum_type']) { + case 1: + //统一运费 + gift_shipping_price += parseFloat(good['uniform_exp_sum']); + gift_shipping_price += o_shipping_price; + break; + case 2: + if (goods_weight < 0) goods_weight = 0; + //累积商品重量 每种商品的重量 * 数量 + goods_weight += good['weight'] * parseInt(good['buynum']); + if (goods_weight1 > 0) { + out_of_weight = gift_weight_free - goods_weight; + //不能调换位置 下面goods_weight会变大 + goods_weight += goods_weight1; + } + break; + case 3: + if (goods_piece < 0) goods_piece = 0; + //累积商品数量 + goods_piece += parseInt(good['buynum']) ; + if (goods_piece1) { + goods_piece += goods_piece1; + } + break; + } + + //如果有设置不包邮商品 + if (no_by_data && no_by_data.goods_list && gift_freight_free) { + if (th.check_by_goods(no_by_data.goods_list, good.goods_id)) { + gift_freight_free = 0; + // out_of_weight = 0 + th.data.is_no_by[th.data.bn_pick]=1; + } } } @@ -4293,18 +4341,6 @@ Page({ }); }, - // set_hid_inp:function (e) { - // var index = e.currentTarget.dataset.index; - // var txt = "cartlist[" + index + "].focus"; - // this.setData({[txt]:1}) - // }, - // - // clear_hid_inp:function (e) { - // var index = e.currentTarget.dataset.index; - // var txt = "cartlist[" + index + "].focus"; - // this.setData({[txt]:0}) - // }, - go_url: function (e) { var url = e.currentTarget.dataset.url; getApp().goto(url); @@ -4398,9 +4434,7 @@ Page({ }) }, - - - + setexptype2: function(e) { this.debounce(this.setexptype.bind(this, e),400)(); }, @@ -4418,4 +4452,361 @@ Page({ }, + //-- 判断是不是选中 -- + check_th_item:function (e) { + var th=this; + var idx=e.currentTarget.dataset.item; + var check=e.currentTarget.dataset.check; + var txt="giftsinfo["+idx+"].selected"; + var gift_item=this.data.giftsinfo[idx]; + + if(check){ + th.setData({[txt]:0}); + }else{ + + var is_true=th.check_out_num_cart(gift_item,this.data.gift_pkid,gift_item.goods_num); + if(!is_true){ return false; } + + th.setData({[txt]:1}); + } + }, + + addNum:function (e) { + var th=this; + var idx=e.currentTarget.dataset.item; + var txt="giftsinfo["+idx+"].goods_num"; + var num=th.data.giftsinfo[idx].goods_num+1; + var gift_item=this.data.giftsinfo[idx]; + var is_true=th.check_out_num_cart(gift_item,this.data.gift_pkid,num); + if(!is_true){ return false; } + th.setData({[txt]:num}); + }, + + subNum:function (e) { + var th=this; + var idx=e.currentTarget.dataset.item; + var txt="giftsinfo["+idx+"].goods_num"; + var num=th.data.giftsinfo[idx].goods_num-1; + var gift_item=this.data.giftsinfo[idx]; + var is_true=th.check_out_num_cart(gift_item,this.data.gift_pkid,num); + if(!is_true){ + return false; + } + if(num<1) return false; + th.setData({[txt]:num}); + }, + + //-- 点击选中赠品 -- + show_sele_gift:function (e) { + var index=e.currentTarget.dataset.index; + var pk=e.currentTarget.dataset.pk; + var giftsinfo=this.data.send_gf[pk][index].giftsinfo; + + for(let i in giftsinfo){ + let item=giftsinfo[i]; + if(!item.goods_num) giftsinfo[i].goods_num=1; + } + + this.setData({ + show_duo_gift:1, + giftsinfo:giftsinfo, + gf_pr_name:this.data.send_gf[pk][index].gf_pr_name, + zp_num:this.data.send_gf[pk][index].zp_num, + gift_pkid:pk, + gf_prom_id:this.data.send_gf[pk][index].prom_id, + send_gf_index:index + }) + }, + + close_sele_gift:function () { + this.setData({show_duo_gift:0}) + }, + + //购物车赠品有咩有超出库存。有灭有超出限购 + check_out_num_cart:function(discount,pick_id,num) { + var prom_id= discount.prom_id; + var alllist=this.data.cartlist; + var all_num=num; + var all_limit_num=num; + var gift_id=discount.gift_id; + for (var i in alllist) { + var list_item = alllist[i]; + //-- 门店相同，活动相同的时候 -- + if(pick_id==list_item.pickup_id && prom_id==list_item.prom_id) continue; + for (var j in list_item.goods) { + //如果赠品的ID一样，要进行统计数量 + if (list_item.goods[j].is_gift == 1 && + list_item.goods[j].gift_id == gift_id) { + all_num += list_item.goods[j].goods_num; + } + if (list_item.goods[j].is_gift == 1 && list_item.goods[j].gift_id ==gift_id && list_item.goods[j].prom_id == prom_id) { + all_limit_num += list_item.goods[j].goods_num; + } + } + } + //-- 赠品的数量超出库存数量和会员的限制, + // 这里是保证所有的赠品部会超出 -- + if (discount.gift_storecount < all_num ) { + wx.showToast({ + title: "礼包库存不足", + icon: 'none', + duration: 2000 + }); + return false; + } + if (discount.limit_num < all_limit_num) { + wx.showToast({ + title:"超出赠品限购", + icon: 'none', + duration: 2000 + }); + return false; + } + return true; + }, + + //-- 确定赠品 -- + sure_this_gift:async function () { + var th = this; + var gf_pickup_id = this.data.gift_pkid; + + var zp_num = this.data.zp_num; + var giftsinfo = this.data.giftsinfo; + var all_num = 0; + for (let i in giftsinfo) { + let item = giftsinfo[i]; + if (!item.selected) continue; + all_num += item.goods_num; + } + if (all_num > zp_num) { + wx.showToast({ + title: "超出活动赠品赠送的数量" + zp_num + "件", + icon: 'none', + duration: 2000 + }); + return false; + } + if (all_num < zp_num) { + wx.showToast({ + title: "您还可以加" + (zp_num - all_num) + "件", + icon: 'none', + duration: 2000 + }); + return false; + } + + //-- 当是购物车购买的时候 -- + if(this.data.cartlist && this.data.cartlist.length>0){ + var alllist = this.data.cartlist; + var index = alllist.findIndex(function (e) { + return e.pickup_id == gf_pickup_id + }); + var pk_list_goods = alllist[index].goods; + + var url = "/api/weshop/cart/delGift?store_id=" + os.stoid + "&user_id=" + + getApp().globalData.user_id + "&is_gift=1&pick_id=" + this.data.gift_pkid + "&prom_id=" + this.data.prom_id; + await getApp().request.promiseDelete(url, {}); + + var new_pk_list_goods = []; + for (let i in pk_list_goods) { + let item = pk_list_goods[i]; + if (item.is_gift && item.prom_id == this.data.gf_prom_id) { + continue; + } + new_pk_list_goods.push(item) + } + + //-- 循环把赠品添加进去 -- + for (var i = 0; i < giftsinfo.length; i++) { + var gf_item = giftsinfo[i]; + if (!gf_item.selected) continue; + var add_data = null; + var newd = { + goods_id: gf_item.goodsinfo.goods_id, + goods_num: gf_item.goods_num, + pick_id: gf_pickup_id, + user_id: app.globalData.user_id, + store_id: os.stoid, + goods_price: 0, + member_goods_price: 0, + goods_name: gf_item.goodsinfo.goods_name, + goods_sn: gf_item.goodsinfo.goods_sn, + sku: gf_item.goodsinfo.sku, + is_gift: 1, + prom_id: th.data.gf_prom_id, + prom_type: 3, + selected: 1, + gift_id: gf_item.gift_id, + original_img: th.data.imgUrl + gf_item.goodsinfo.original_img, + exp_sum_type: gf_item.goodsinfo.exp_sum_type, + is_free_shipping: gf_item.goodsinfo.is_free_shipping, + weight: gf_item.goodsinfo.weight, + uniform_exp_sum: gf_item.goodsinfo.uniform_exp_sum, + goods_spec: gf_item.goodsinfo.goods_spec, + goods_color: gf_item.goodsinfo.goods_color, + }; + + await getApp().request.promisePost("/api/weshop/cart/save", { + data: newd + }).then(res => { + if (res.data.code == 0) { + add_data = res.data.data; + } + }) + if (add_data) { + newd.id = add_data.id; + new_pk_list_goods.push(newd); + } + } + + var set_data = this.data.send_gf[gf_pickup_id][this.data.send_gf_index]; + set_data.selected = 1; + var txt9 = "cartlist[" + index + "].goods"; + var txt1 = "send_gf[" + gf_pickup_id + "][" + this.data.send_gf_index + "]"; + th.setData({[txt9]: new_pk_list_goods, [txt1]: set_data}); + this.data.old_cartlist[index].goods = new_pk_list_goods; + + th.calculatePrice(); + }else{ + var new_pk_list_goods=[]; + //-- 当是立即购买的时候 -- + for (var i = 0; i < giftsinfo.length; i++) { + var gf_item = giftsinfo[i]; + if (!gf_item.selected) continue; + var newd = { + goods_id: gf_item.goodsinfo.goods_id, + buynum: gf_item.goods_num, + pick_id: gf_pickup_id, + user_id: app.globalData.user_id, + store_id: os.stoid, + goods_price: 0, + member_goods_price: 0, + goods_name: gf_item.goodsinfo.goods_name, + goods_sn: gf_item.goodsinfo.goods_sn, + sku: gf_item.goodsinfo.sku, + is_gift: 1, + prom_id: th.data.gf_prom_id, + prom_type: 3, + selected: 1, + gift_id: gf_item.gift_id, + original_img: th.data.imgUrl + gf_item.goodsinfo.original_img, + exp_sum_type: gf_item.goodsinfo.exp_sum_type, + is_free_shipping: gf_item.goodsinfo.is_free_shipping, + weight: gf_item.goodsinfo.weight, + uniform_exp_sum: gf_item.goodsinfo.uniform_exp_sum, + uniform_exp_sum: gf_item.goodsinfo.uniform_exp_sum, + goods_spec: gf_item.goodsinfo.goods_spec, + goods_color: gf_item.goodsinfo.goods_color, + }; + new_pk_list_goods.push(newd); + } + var set_data = this.data.send_gf[th.data.bn_pick][this.data.send_gf_index]; + set_data.selected = 1; + var txt1 = "send_gf[" + gf_pickup_id + "][" + this.data.send_gf_index + "]"; + + th.setData({buy_now_gift_goods:new_pk_list_goods,[txt1]:set_data}); + th.calculatePrice2(); + + } + th.close_sele_gift(); + }, + + //获取输入 + getInput:function (e) { + this.data.gift_sear=e.detail.value; + }, + //-- 搜索赠品 -- + submitSearch:function () { + var giftsinfo=this.data.giftsinfo; + if(!this.data.gift_sear){ + for(let i in giftsinfo){ + let item=giftsinfo[i]; + item.hide_div=0; + } + }else{ + for(let i in giftsinfo){ + let item=giftsinfo[i]; + item.hide_div=0; + if(item.goods_name.indexOf(this.data.gift_sear)==-1){ + item.hide_div=1; + } + } + } + this.setData({giftsinfo:giftsinfo}) + + }, + + //-- 赠品的验证 -- + sub_check_gift(func){ + var th=this; + if(th.data.send_gf){ + var error_arr=[]; + for(let io in th.data.send_gf){ + let item_arr=th.data.send_gf[io]; + for(let ip in item_arr){ + var gf_pr_name=item_arr[ip].gf_pr_name; + var zp_num=item_arr[ip].zp_num; + var giftsinfo=item_arr[ip].giftsinfo; + var limit_all=0; + var stock_all=0; + for(let iu in giftsinfo){ + let gf_item=giftsinfo[iu]; + limit_all+=gf_item.limit_num; + stock_all+=gf_item.gift_storecount; + } + if(limit_all - @@ -32,7 +31,6 @@ - - + - @@ -195,10 +192,32 @@ + + + + + + + + 赠{{iter.name}} 可选赠品{{iter.zp_num}}个 + + + 已选择 + + + + 未选择 + + + + + 留言 @@ -207,10 +226,6 @@ data-index="{{pidx}}" value="{{user_note[pidx]}}" class="word-box" maxlength="100" name="user_note_{{item.pickup_id}}" /> - - - - @@ -243,12 +258,10 @@ - {{bn_pickname}} - @@ -260,11 +273,6 @@ {{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}} - - - - - @@ -277,27 +285,29 @@ - + + - + - - {{buy_now_gift_goods.goods_name}} + + {{item.goods_name}} - {{filters.show_gui_ge(buy_now_gift_goods.goods_spec,buy_now_gift_goods.goods_color)}} + {{filters.show_gui_ge(item.goods_spec,item.goods_color)}} ￥0 - x{{buy_now_gift_goods.buynum}} + x{{item.buynum}} + @@ -373,6 +383,29 @@ + + + + + + + 赠{{iter.name}} 可选赠品{{iter.zp_num}}个 + + + + 已选择 + + + + 未选择 + + + + + + 留言 @@ -398,7 +431,6 @@ - @@ -678,3 +710,68 @@ + + + + + + + + + + + + + + + + + {{gf_pr_name}}，可以获赠一下任意{{zp_num}}件商品 + + + + + + + + + + + + + diff --git a/pages/cart/cart2/cart2.wxss b/pages/cart/cart2/cart2.wxss index fd3dca2..101a74b 100644 --- a/pages/cart/cart2/cart2.wxss +++ b/pages/cart/cart2/cart2.wxss @@ -20,14 +20,12 @@ } page { - /* background-color: #FAFAFA; */ background-color: #F0F0F0; padding: 0 22rpx; box-sizing: border-box; } .container { background-color: #F0F0F0; - /* padding-top: 28rpx; */ padding-bottom: 120rpx; } @@ -61,24 +59,17 @@ page { background-color: #fff; font-size: 32rpx; color: #444; - /* margin-top: 28rpx; */ border-radius: 14rpx; padding: 20rpx 70rpx 20rpx 20rpx; } -.user-contact { - /* padding: 24rpx 26rpx; - font-weight: 600; */ -} +.user-contact { } .location { position: relative; - /* padding: 0 70rpx 24rpx; */ + } .pos-icon { - /* position: absolute; */ - /* left: 28rpx; - top: 6rpx; */ width: 20rpx; height: 24rpx; display: inline-block; @@ -154,21 +145,15 @@ page { .set-mes{ background-color: #fff; - /* margin-top: 20rpx; */ } .use-item{ display: flex; align-items: center; - /* height: 80rpx; */ - /* border-bottom: 1px solid #ddd; */ font-size: 26rpx; - /* width:95%; -margin:auto; */ padding: 20rpx; } .use-item>view{ display: flex; - /* margin-right: 12rpx; */ } .use-item.bfff{ background-color: #fff; @@ -176,8 +161,7 @@ margin:auto; */ .use-item .dp{ display: block; width: 40rpx; - height: 40rpx; - /* margin-left: -6rpx; */ + height: 40rpx; } .set-item { @@ -208,13 +192,9 @@ margin:auto; */ } .coupon-mes { - /* box-sizing: border-box; */ - /* height:95rpx; */ padding: 20rpx; background-color: #fff; font-size: 30rpx; - /* color: #444; */ - /* width: 100%; */ border-radius: 14rpx; margin-top: 20rpx; margin-bottom: 20rpx; @@ -250,17 +230,9 @@ margin:auto; */ flex-grow: 1; align-items: center; height: 50rpx; - /* width: 500rpx; */ } -.word-box { - font-size: 26rpx; - width: 100%; - /* width: 600rpx; */ - /* padding: 10rpx; - height: 28rpx; - line-height: 40rpx; */ -} +.word-box { font-size: 26rpx;width: 100%;} .max-word { position: absolute; @@ -268,20 +240,13 @@ margin:auto; */ bottom: 0; } -.information { - /* padding: 20rpx; */ - background-color: #fff; - /* margin-bottom: 120rpx; */ -} +.information { background-color: #fff; } .information .item { display: flex; justify-content: space-between; - /* height: 60rpx; - line-height: 60rpx; */ font-size: 24rpx; - /* color: #333; */ - padding: 20rpx; + padding: 20rpx; } .btn-wrap { @@ -299,14 +264,6 @@ margin:auto; */ } .tips-btn { - /* float: right; - width: 200rpx; - height: 100rpx; - line-height: 100rpx; - text-align: center; - font-size: 30rpx; - color: #fff; - background-color: #f23030; */ color: white; background-color: #FE4445; height: 72rpx; @@ -317,14 +274,7 @@ margin:auto; */ margin-right: 0; } -.pay-amount { - /* float: right; - display: flex; - align-items: center; - height: 100rpx; - font-size: 26rpx; - margin-right: 40rpx; */ -} +.pay-amount { } .payable { color: #444; @@ -378,7 +328,6 @@ margin:auto; */ margin-right: 15rpx;vertical-align: middle;} .yu_er{ margin-left: 10rpx; - /* margin-right: 60rpx; */ } .wuliu{margin-left: 20rpx;} @@ -420,7 +369,6 @@ margin:auto; */ position:fixed; bottom:0; left: 0; - /* padding-bottom: 25rpx; */ } .cx-popup .top{ @@ -681,10 +629,8 @@ width:100%; top:-37rpx; } .coupon-right{ - /* width:490rpx; */ height: 99%; border-top: 1rpx solid #eaeaea; - /* //border-bottom: 1rpx solid #eaeaea; */ border-right: 1rpx solid #eaeaea; flex-grow: 1; } @@ -763,17 +709,11 @@ display: flex; align-items: center; } .xc-jiantou{ - /* width: 9rpx; - height: 9rpx; */ - /* border-top: 2rpx solid #fff; - border-right: 2rpx solid #fff; */ transform: rotate(-90deg); color: #fff; font-size: 15rpx; - /* display:inline-block; - margin-top: 6.5rpx; */ text-align: center; -width: 24rpx; + width: 24rpx; } .xc-buttom{ box-sizing: border-box; @@ -964,13 +904,6 @@ margin-left: 20rpx; margin-right: 8rpx; } -/* .card_bg .card_name { - max-width: 76rpx; - width: auto; - overflow: hidden; - white-space: nowrap; -} */ - .card_name { position: relative; top: -4rpx; @@ -1005,3 +938,207 @@ margin-left: 20rpx; color: #fff; line-height: 37rpx; } + +.duo_gift_sele{ + position: fixed; top: 0; left: 0; width: 100%; height: 100%; background-color: #fff; z-index: 10000; +} +.gift_top_v{ height:100rpx; padding: 0 40rpx; padding-right: 10rpx; } + + +.bg_jj{ + width: 14rpx; + height: 14rpx; + border-top: 2rpx solid #363b42; + border-right: 2rpx solid #363b42; + transform: rotateZ(45deg); + display: inline-block; +} + +.bg_jj1{ + width: 20rpx; + height: 20rpx; + border-top: 2rpx solid #363b42; + border-right: 2rpx solid #363b42; + transform: rotateZ(-135deg); + display: inline-block; +} + +.input-search { + position: relative; + padding: 10rpx; + font-size: 28rpx; +} +.input-box { + position: relative; + background-color: #f0f0f0; + border-radius: 60rpx; +} + +.input-box .sear_box { + +} +.input-search { + position: relative; + padding: 10rpx; + font-size: 28rpx; +} + +.icon-guan { + font-size: 20rpx; + padding: 10rpx; + position: absolute; + right: 20rpx; + top: 50%; + transform: translateY(-50%); +} + + + +.order-item { + display: flex; + height: 246rpx; + border-top: 3rpx solid rgb(245, 245, 245); + align-items: center; + padding-right: 30rpx; +} + + +.pay-for { + width: 100%; + height: 110rpx; + position: fixed; + left: 0; + bottom: 100rpx; + font-size: 28rpx; + color: #666; + background-color: rgb(255, 255, 255); + z-index: 1999; + border-top: 1rpx solid rgb(236, 236, 236); + border-bottom: 1rpx solid rgb(236, 236, 236); + +} + +.pay-for .pay-btn { + width: 220rpx; height: 112rpx; line-height: 112rpx; + background-color: rgb(219, 27, 52); + color: #fff; + border-radius: 0; + font-size: 31rpx; +} + +.pay-for .consumer { + margin-right: 23rpx; + color: rgb(0, 0, 0); + letter-spacing: 1rpx; +} + +.pay-for .consumer .total { + color: rgb(0, 0, 0); +} + +.pay-for .consumer .tips { + color: rgb(153, 153, 153); +} + +.pay-for .checkbox { + float: left; + padding-left: 40rpx; + line-height: 100rpx; + display: flex; + align-items: center; +} + +.pay-for .ico-check { + display: flex; + align-items: center; + margin-right: 20rpx; +} +.order-raido { + height: 100%; + padding-left: 30rpx; + padding-right: 25rpx; +} +.icon_no_sele{ display: inline-block; width: 39rpx; height: 39rpx; border: 1rpx solid #ddd; border-radius: 50%} +.icon_no_sele2{width: 39rpx; height: 39rpx; border: 1rpx solid #ddd; border-radius: 50%; margin-top: 20rpx; + margin-left: 30rpx; margin-right: 25rpx} +.baseline { + display: flex; + align-items: baseline; +} +.specifications { + padding: 3rpx 8rpx; + margin-top: 8rpx; + font-size: 22rpx; + max-width: 356rpx; + width: auto; + height: 30rpx; + line-height: 29rpx; + background-color: rgb(236, 236, 236); + border-radius: 8rpx; + white-space: nowrap; + color: rgb(63, 63, 63); + display: inline-block; +} + +.count { + display: flex; + bottom: 5rpx; + /* border: 2rpx solid rgb(236, 236, 236); */ + margin-bottom: 3rpx; +} + +.count>view, .count>input { + width: 50rpx; + height: 40rpx; + line-height: 40rpx; + text-align: center; + display: flex; + font-size: 18rpx; + justify-content: center; + min-height: 35rpx; + align-items: center; +} + +.count>.goodadd { + width: 67rpx; + font-size: 24rpx; +} + +.count>.add { + font-size: 32rpx; +} + +.sub, .add, .count>input { + /* border-right: 1px solid #000; */ + background-color: #f0f0f0; + border-radius: 8rpx; +} +.sub.active { + /* background-color: #ddd; */ + color: #ccc; +} +.count>input { + margin: 0 14rpx; + line-height: normal; +} +.alend { + align-items: flex-end; +} +.goods-cont { + width: 420rpx; + height: 165rpx; + font-size: 28rpx; + margin-left: 35rpx; + padding-top: 7rpx; + padding-bottom: 5rpx; +} + +.circle{ width: 50rpx;height: 50rpx; border-radius: 50%; margin-right: 10rpx; + border: 3rpx solid #c8162c;color: #c8162c;text-align: center; line-height: 50rpx} + +.sear_box::before{ + font-family: iconfont; + content: '\e618'; + font-size: 28rpx; +} + diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js index 389ee79..2fcb027 100644 --- a/pages/cart/cart2_inte/cart2_inte.js +++ b/pages/cart/cart2_inte/cart2_inte.js @@ -658,6 +658,10 @@ Page({ 'prom_id': th.data.bn_goods.prom_id, //促销活动id }; + if(getApp().globalData.skinface_id){ + goods.skinface_id=getApp().globalData.skinface_id; + } + //-- 把导购的信息填入-- if (gg.guide_id) { goods.guide_id = gg.guide_id; diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index b91b72d..5a5e237 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -619,6 +619,9 @@ Page({ 'prom_id': th.data.bn_goods.prom_id, //促销活动id }; + if(getApp().globalData.skinface_id){ + goods.skinface_id=getApp().globalData.skinface_id; + } //--导购分享过来的id-- if (gg.guide_id) { goods.guide_id = gg.guide_id; diff --git a/pages/goods/goodsInfo/filter.wxs b/pages/goods/goodsInfo/filter.wxs index 1b916fc..fba5618 100644 --- a/pages/goods/goodsInfo/filter.wxs +++ b/pages/goods/goodsInfo/filter.wxs @@ -20,8 +20,16 @@ function act_type(ty){ } } +function repl(str){ + var str_arr=str.split("^"); + return str_arr.join(","); +} + + + module.exports = { is_has: is_has, format_tt:format_tt, - act_type:act_type + act_type:act_type, + repl:repl } diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 4f7c3aa..8d8a824 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -272,9 +272,8 @@ Page({ self = this; - - console.log("gd onload"); - console.log(t); + //检查测肤 + getApp().check_skin_face(t,0,gid); //-- 自定义海报 -- getApp().request.promiseGet("/api/weshop/goods/poster/page", { @@ -2051,7 +2050,6 @@ Page({ }); }, - openSpecModel: function (t) { var th = this; var open_store = t.currentTarget.dataset.ind; @@ -2501,17 +2499,17 @@ Page({ console.log('get_sku'); var tt = this, arrdata = null; var now = ut.gettimestamp(); - await getApp().request.promiseGet("/api/weshop/goods/page", { - data: { - store_id: o.stoid, - sku: gd.sku, - more_spec: gd.more_spec, - isonsale: 1, - is_on_sale: 1, - pageSize: 500, - orderField: 'gg_ordid,goods_spec,sort' - } - }).then(res => { + await getApp().request.promiseGet("/api/weshop/goods/page", { + data: { + store_id: o.stoid, + sku: gd.sku, + more_spec: gd.more_spec, + isonsale: 1, + is_on_sale: 1, + pageSize: 500, + orderField: 'gg_ordid,goods_spec,sort' + } + }).then(res => { var e = res; if (e.data.code == 0) arrdata = e.data.data.pageData; }) @@ -2830,8 +2828,9 @@ Page({ } clearInterval(timer_get); - //如果会员是有默认的门店话 - if (!th.data.def_pick_store && th.data.fir_def_store && Object.keys(th.data.fir_def_store).length>0) { + + //如果会员是有默认的门店话 + if (!th.data.def_pick_store && th.data.fir_def_store && Object.keys(th.data.fir_def_store).length>0) { th.setData({def_pick_store: th.data.fir_def_store}); } wx.showLoading({ diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index cd7cfa8..f1a93ee 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -413,18 +413,11 @@ 零售价￥{{filters.toFix(data.market_price,2)}} - - - 分享 - + @@ -491,11 +484,10 @@ - + - @@ -1177,7 +1162,7 @@ - + @@ -1352,7 +1337,7 @@ - 库存不足 + 库存不足5 diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js index 2fe2124..419fab8 100644 --- a/pages/goods/search/search.js +++ b/pages/goods/search/search.js @@ -103,7 +103,7 @@ Page({ //--- 判断是等级会员，且在有效期范围内 --- if(user.card_field && now7) card_name=card_name.substring(0,8); + if(card_name && card_name.length>7) card_name=card_name.substring(0,8); th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list}); } }