diff --git a/packageD/pages/user/member/bring/bring.js b/packageD/pages/user/member/bring/bring.js index 50d6052..e63b67f 100644 --- a/packageD/pages/user/member/bring/bring.js +++ b/packageD/pages/user/member/bring/bring.js @@ -7,6 +7,8 @@ var t = getApp(), s = require("../../../../../utils/common.js"); var regeneratorRuntime = require('../../../../../utils/runtime.js'); var oo = t.globalData.setting; + + Page({ /** * 页面的初始数据 @@ -25,7 +27,7 @@ Page({ cardInfo: '', user_infor: {}, //获取初始对象 needmon:0, - distribut_min:0 + distribut_min:0, }, // 银行卡失去焦点事件 blurInputEvent: function(e) { @@ -55,6 +57,16 @@ Page({ }, /*点击确定提现后表现的形式*/ Gettime: function(e) { + var th=this; + var user_info=getApp().globalData.userInfo; + //提现是零钱的时候，同时是发红包的时候 + if(this.data.current==2 && parseInt(this.data.tx_wx_type)==2){ + if(!user_info.openid){ + ut.m_toast("未绑定公众号微会员,无法提现！"); + return false + } + } + var user_money = this.data.user_money; var money = e.detail.value.moneys; //typeof判断数据类型 var current = this.data.current; @@ -186,6 +198,13 @@ Page({ // 提现 Cashwithdrawal: function(user_infor) { + + + if(this.data.tx_ing) return false; + this.data.tx_ing=1; + + var th=this; + delete user_infor.rmon; delete user_infor.isck; delete user_infor.needmon; @@ -204,6 +223,8 @@ Page({ 'content-type': 'application/json' }, // 设置请求的 header success: function(res) { + + th.data.tx_ing=0; if (res.data.code != -1) { wx.navigateTo({ url: 'msg/msg', @@ -353,8 +374,9 @@ Page({ var json_d = JSON.parse(e.switch_list); var is_closetxbank=json_d.is_closetxbank; var is_tx_wx=json_d.is_tx_wx; + var tx_wx_type=json_d.tx_wx_type; var data={ - is_closetxbank:is_closetxbank,is_tx_wx:is_tx_wx + is_closetxbank:is_closetxbank,is_tx_wx:is_tx_wx,tx_wx_type:tx_wx_type }; if(is_closetxbank) data.current=2; th.setData(data); @@ -402,12 +424,11 @@ Page({ }, - - /** * 用户点击右上角分享 */ onShareAppMessage: function() { getApp().globalData.no_clear=1; } + }) \ No newline at end of file diff --git a/packageE/pages/qy/contactMe/contactMe.js b/packageE/pages/qy/contactMe/contactMe.js index 9c12f7c..63d8f63 100644 --- a/packageE/pages/qy/contactMe/contactMe.js +++ b/packageE/pages/qy/contactMe/contactMe.js @@ -171,7 +171,7 @@ Page({ // }) let openuserid = this.data.openuserid let skip_verify = this.data.skip_verify ? true : false - let res = await getApp().request.promisePost(`/apib/weshop/admin/qyWeChat/qyWeChatCorpInfo/postAdminQyApi?accdb=${this.data.store.erpid}&url=externalcontact/add_contact_way`, { + let res = await getApp().request.promisePost(`/apib/weshop/admin/qyWeChat/qyWeChatCorpInfo/postAdminQyApi?accdb=${this.data.store.erpid}&url=externalcontact/add_contact_way&qyid=4`, { data: { // accdb: getApp().globalData.config.erpid, // ApiName: 'api.pos.shop.advancesum.seek', @@ -232,66 +232,77 @@ Page({ return app.my_warnning("登录需要授权手机号码！", 0, this); return false; } + let that =this; + let req_data = { + js_code:e.code, + store_id:getApp().globalData.setting.stoid, + } + getApp().request.promiseGet('/api/weshop/users/getCodeMobile',{data:req_data}).then(res=>{ - var that =this; - app.request.get("/api/weshop/manager/managerConfig/get", { - data: { - storeId: getApp().globalData.setting.stoid - }, - success: function (res2) { - if (res2.data.code == 0) { - var sessionKey = getApp().globalData.sessionKey; - if (res2.data.data.is_newphone == 1) { - - var req_data = { - sessionKey: sessionKey, - code: e.code, - isNewPhone: 1, - store_id: getApp().globalData.setting.stoid, - } - }else{ - var req_data = { - sessionKey: sessionKey, - encryptedData: e.encryptedData, - iv: e.iv, - store_id: getApp().globalData.setting.stoid, - } - } - - - //-- 获取一下手机 --/api/weshop/users/getCodeMobile?store_id=1&js_code=b8451556dd98b2eebec5aa6775625bce192a68fc1a4b15b0c6bf3ed046f90da4 - getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { - // console.log('手机号码'); - // console.log(res); - if (res.data.code == 0) { - let resdata = res.data.data; - that.setData({ - phone: resdata - }) - that.befgetqy() - // getApp().globalData.zc_dd = dd; - // wx.redirectTo({ - // url: "/packageA/pages/profile/profile?is_back=1" - // }) - } + if (res.data.code==0) { + this.setData({ + phone:res.data.data }) - // var sessionKey = getApp().globalData.sessionKey; - // var openid = getApp().globalData.openid; - // var r = getApp().globalData.getu; - // this.save_the_data(r, e, sessionKey, openid) - - - } else { + this.befgetqy() + }else { return app.my_warnning("授权登入失败,请稍后再试!", 0, that); } }, - failStatus: function (t) { - return app.my_warnning("授权登入失败,请稍后再试!", 0, that); - }, - fail: function (t) { - return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; - } - }); + ); + + // app.request.get("/api/weshop/manager/managerConfig/get", { + // data: { + // storeId: getApp().globalData.setting.stoid + // }, + // success: function (res2) { + // if (res2.data.code == 0) { + // var sessionKey = getApp().globalData.sessionKey; + // if (res2.data.data.is_newphone == 1) { + + // var req_data = { + // sessionKey: sessionKey, + // code: e.code, + // isNewPhone: 1, + // store_id: getApp().globalData.setting.stoid, + // } + // }else{ + // var req_data = { + // sessionKey: sessionKey, + // encryptedData: e.encryptedData, + // iv: e.iv, + // store_id: getApp().globalData.setting.stoid, + // } + // } + + // debugger + // //-- 获取一下手机 --/api/weshop/users/getCodeMobile?store_id=1&js_code=b8451556dd98b2eebec5aa6775625bce192a68fc1a4b15b0c6bf3ed046f90da4 + // getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { + // debugger + // if (res.data.code == 0) { + // let resdata = res.data.data; + // that.setData({ + // phone: resdata + // }) + // that.befgetqy() + // } + // }) + // // var sessionKey = getApp().globalData.sessionKey; + // // var openid = getApp().globalData.openid; + // // var r = getApp().globalData.getu; + // // this.save_the_data(r, e, sessionKey, openid) + + + // } else { + // return app.my_warnning("授权登入失败,请稍后再试!", 0, that); + // } + // }, + // failStatus: function (t) { + // return app.my_warnning("授权登入失败,请稍后再试!", 0, that); + // }, + // fail: function (t) { + // return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; + // } + // }); }, async befgetqy() { diff --git a/packageE/pages/togoin/togoin.js b/packageE/pages/togoin/togoin.js index c0cf25d..d7501ef 100644 --- a/packageE/pages/togoin/togoin.js +++ b/packageE/pages/togoin/togoin.js @@ -312,12 +312,12 @@ Page({ } }) } else { - this.setData({ sub: 1 }); + th.setData({ sub: 1 }); wx.showLoading({ title: '处理中.', mask: true }) - this.zu_ce(dd); //调用注册的函数 + th.zu_ce(dd); //调用注册的函数 } } diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 3e3573c..55db149 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -50,7 +50,8 @@ Page({ is_show_recommend:false, - has_rj:0 + has_rj:0, + rfmName:'成长值' }, goto_nav: function (e) { @@ -234,7 +235,10 @@ Page({ s.setData({ userInfo: e - }); + }); + + //--查询会员权益是否成绩 + s.getVison() //-- 要调用接口，获取卡的钱 -- var url = "/api/weshop/wxuser/getWxCardInfo?storeId=" + os.stoid + "&userId=" + e.user_id; @@ -510,7 +514,29 @@ Page({ - }, + }, + //获取会员权益等级是否升级 + getVison(){ + let isRfm = wx.getStorageSync('isRfm') + if (isRfm) { + this.setData({ + rfmName:'综合分' + }) + }else{ + rq.get(`/api/weshop/users/grade/vip/getSysPara?storeId=${os.stoid}&classInfo=IsUpRMF`, { + success: (res)=>{ + console.log('会员权益等级升级查询-------'); + console.log(res); + if (res.data.code == 0 && res.data.data && res.data.data.IsBool){ + this.setData({ + rfmName:'综合分' + }) + wx.setStorageSync('isRfm', true) + } + } + }) + } + }, //判断会员是后有改服务项目 check_is_has_qy: function (item, g_qy_list) { @@ -865,7 +891,12 @@ Page({ }, jump: function () { - getApp().goto("/packageE/pages/user/grow_value/grow_value") + let isRfm = wx.getStorageSync('isRfm') + //升级为RFM就不跳转成长值详情 + if (!isRfm) { + getApp().goto("/packageE/pages/user/grow_value/grow_value") + } + }, // 判断生日营销的页面是不是存在 birthday: function () { diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml index e3bb265..6c47c9b 100644 --- a/pages/user/index/index.wxml +++ b/pages/user/index/index.wxml @@ -19,12 +19,12 @@ {{" "}} - 成长值 + {{rfmName}} {{cz_val}} / {{need_money}} {{" "}} - 成长值 {{cz_val}} + {{rfmName}} {{cz_val}} @@ -44,7 +44,7 @@ 会员卡