Skip to content

C
CFFP-HB
Commit 269725e0 by yuzhenWang
Options

Merge branch 'wyz01' into 'test' 

发布测试，提交代码

See merge request !135
parents 27213859 3015e046
Showing with 187 additions and 167 deletions
App.vue
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
// 只有已登录用户才需要检查 // 只有已登录用户才需要检查
if(uni.getStorageSync('loginType') == 'codelogin' && uni.getStorageSync('cffp_userId')) { if(uni.getStorageSync('loginType') == 'codelogin' && uni.getStorageSync('cffp_userId')) {
try { try {
const res = await api.queryInfo({userId: uni.getStorageSync('cffp_userId')}); const res = await api.queryInfo({});
if(!res['success']) { if(!res['success']) {
// 用户已注销，清除缓存 // 用户已注销，清除缓存
this.clearLoginState(); this.clearLoginState();
...@@ -254,6 +254,7 @@ ...@@ -254,6 +254,7 @@
} }
//家办商城跳转未登录状态下 //家办商城跳转未登录状态下
if(params.mpCffp&&(params.noLogin ||!params.dataToken)){ if(params.mpCffp&&(params.noLogin ||!params.dataToken)){
uni.removeStorageSync('userIsActive') uni.removeStorageSync('userIsActive')
uni.removeStorageSync('dataToken') uni.removeStorageSync('dataToken')
uni.setStorageSync('loginType','visitor'); uni.setStorageSync('loginType','visitor');
......
api/api.ts
...@@ -405,7 +405,7 @@ export default { ...@@ -405,7 +405,7 @@ export default {
improveInfo(params) { improveInfo(params) {
return request(`${apiURL}/pay/get/improve/info`, 'GET', params) return request(`${apiURL}/pay/get/improve/info`, 'GET', params)
}, },
// 实名认证查询接口 // 提交实名认证
submitImproveInfo(params) { submitImproveInfo(params) {
return request(`${apiURL}/pay/improve/info`, 'POST', params) return request(`${apiURL}/pay/improve/info`, 'POST', params)
}, },
...@@ -451,7 +451,8 @@ export default { ...@@ -451,7 +451,8 @@ export default {
}, },
//获取非分享名片信息 //获取非分享名片信息
getBusinessCard(userId) { getBusinessCard(userId) {
return request(`${apiURL}/business-card/my?userId=${userId}`, 'GET') // ?userId=${userId}
return request(`${apiURL}/business-card/my`, 'GET')
}, },
//获取分享状态名片信息 //获取分享状态名片信息
getShareBusinessCard(cardId) { getShareBusinessCard(cardId) {
...@@ -463,7 +464,8 @@ export default { ...@@ -463,7 +464,8 @@ export default {
}, },
//获取分享名片统计 //获取分享名片统计
getCardStats(data) { getCardStats(data) {
return request(`${apiURL}/business-card/stats/${data.cardId}?userId=${data.userId}`, 'GET') // ?userId=${data.userId}
return request(`${apiURL}/business-card/stats/${data.cardId}`, 'GET')
}, },
dealerCouponCardList(params) { dealerCouponCardList(params) {
return request(`${sfpUrl}/dealerCoupon/inventory/list/page`, 'POST', params) return request(`${sfpUrl}/dealerCoupon/inventory/list/page`, 'POST', params)
......
components/bootpage/bootpage.vue
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
}, },
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
components/commonPopup/restrictedTip.vue
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
title: String, title: String,
content: { content: {
type: String, type: String,
default: '您的账号处在不可用状态，请长按图片添加客服咨询情况' default: ''
}, },
showCode: { showCode: {
type: Boolean, type: Boolean,
...@@ -51,9 +51,13 @@ ...@@ -51,9 +51,13 @@
}, },
methods: { methods: {
open() { open(msg) {
if(dataHandling.getRuntimeEnv()=='browser'){ // if(dataHandling.getRuntimeEnv()=='browser'){
this.tipTxt = '您的账号处在不可用状态，请扫码添加客服咨询情况' // this.tipTxt = '您的账号处在不可用状态，请扫码添加客服咨询情况'
// }
if(msg){
this.tipTxt = msg
} }
if(this.visible){ if(this.visible){
return return
......
components/search/search.vue
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
}, },
querySystemMessage(){ querySystemMessage(){
if(this.userId){ if(this.userId){
api.querySystemMessage({systemType:1,userId:this.userId}).then((res)=>{ api.querySystemMessage({systemType:1,}).then((res)=>{
if(res['success']){ if(res['success']){
this.messageUnreadCount = res['data']['unReadcount']; this.messageUnreadCount = res['data']['unReadcount'];
if(Number(this.messageUnreadCount) > 99){ if(Number(this.messageUnreadCount) > 99){
......
myPackageA/applyFranchise/applyFranchise.vue
...@@ -302,8 +302,7 @@ ...@@ -302,8 +302,7 @@
// 登录并且是禁用状态 // 登录并且是禁用状态
if (this.loginType == 'codelogin' && this.userInfo.userIsActive == 2) { if (this.loginType == 'codelogin' && this.userInfo.userIsActive == 2) {
this.showCode = true this.showCode = true
this.restrictedOrCanelContent = '您的账号处在不可用状态，请扫码添加客服咨询情况' this.$refs.restrictedOrCanelTip.open('您的账号处在不可用状态，请扫码添加客服咨询情况')
this.$refs.restrictedOrCanelTip.open()
return return
} }
// 登录并且是注销状态 前端不判断，通过申请加盟的接口判断 // 登录并且是注销状态 前端不判断，通过申请加盟的接口判断
...@@ -354,8 +353,7 @@ ...@@ -354,8 +353,7 @@
// 不能登录并且是禁用状态 // 不能登录并且是禁用状态
if (res.data.userIsActive == 2) { if (res.data.userIsActive == 2) {
this.showCode = true this.showCode = true
this.restrictedOrCanelContent = '您的账号处在不可用状态，请扫码添加客服咨询情况' this.$refs.restrictedOrCanelTip.open('您的账号处在不可用状态，请扫码添加客服咨询情况')
this.$refs.restrictedOrCanelTip.open()
return return
} }
this.userId = String(res['data']['userId']); this.userId = String(res['data']['userId']);
...@@ -406,9 +404,10 @@ ...@@ -406,9 +404,10 @@
queryInfo() { queryInfo() {
api.queryInfo({ userId: uni.getStorageSync('cffp_userId') }).then(res => { api.queryInfo({}).then(res => {
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
this.form.nickName = res['data']['nickName'] this.form.nickName = res['data']['nickName']
if (this.form.nickName) { if (this.form.nickName) {
this.editNickName = true this.editNickName = true
...@@ -454,7 +453,9 @@ ...@@ -454,7 +453,9 @@
} }
} }
api.newSaveApplyInfo(params).then((res) => { api.newSaveApplyInfo(params).then((res) => {
if (res['success']) { if (res['success']) {
// 是合伙人就不让在加盟 // 是合伙人就不让在加盟
if (res.data.isPartner) { if (res.data.isPartner) {
this.$refs.everyJoinPopup.open() this.$refs.everyJoinPopup.open()
...@@ -470,10 +471,11 @@ ...@@ -470,10 +471,11 @@
) )
this.$refs.successJoinPopup.open() this.$refs.successJoinPopup.open()
} else { } else {
console.log('走到这里了');
// 由于注销需求，依据后端报错展示弹窗 // 由于注销需求，依据后端报错展示弹窗
this.showCode = false this.showCode = false
this.restrictedOrCanelContent = res['message']
this.$refs.restrictedOrCanelTip.open() this.$refs.restrictedOrCanelTip.open(res['message'])
} }
}) })
......
myPackageA/commission/withdrawalRecord.vue
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
}, },
methods: { methods: {
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
myPackageA/integralExchange/authenticaInfo.vue
...@@ -226,9 +226,9 @@ ...@@ -226,9 +226,9 @@
}, },
methods:{ methods:{
continueBind(){ continueBind(){
console.log('解绑');
let params = { let params = {
userId:uni.getStorageSync('cffp_userId'), // userId:uni.getStorageSync('cffp_userId'),
oprType:this.paymentMethod oprType:this.paymentMethod
} }
api.unbindImproveInfo(params).then((res)=>{ api.unbindImproveInfo(params).then((res)=>{
......
myPackageA/integralExchange/exchange.vue
...@@ -164,9 +164,9 @@ ...@@ -164,9 +164,9 @@
}, },
// 查询实名信息 // 查询实名信息
getImproveInfo(){ getImproveInfo(){
console.log('执行了');
let params = { let params = {
userId:uni.getStorageSync('cffp_userId'), // userId:uni.getStorageSync('cffp_userId'),
oprType:this.paymentMethod oprType:this.paymentMethod
} }
api.improveInfo(params).then((res)=>{ api.improveInfo(params).then((res)=>{
...@@ -182,6 +182,7 @@ ...@@ -182,6 +182,7 @@
}else { }else {
this.showUnbind = false this.showUnbind = false
} }
console.log('showUnbind',this.showUnbind);
}else{ }else{
uni.showToast({ uni.showToast({
title: res['message'], title: res['message'],
...@@ -193,7 +194,8 @@ ...@@ -193,7 +194,8 @@
}, },
// 查询兑换得钱数和待结算得积分 // 查询兑换得钱数和待结算得积分
queryByUserIdFortuneStatistic(){ queryByUserIdFortuneStatistic(){
api.queryByUserIdFortuneStatistic({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{ // userId:uni.getStorageSync('cffp_userId')
api.queryByUserIdFortuneStatistic({}).then((res)=>{
if(res['success']){ if(res['success']){
this.queryResult = res['data'] this.queryResult = res['data']
if(this.queryResult.yesExchangeFortune){ if(this.queryResult.yesExchangeFortune){
......
myPackageA/myTeam/myTeam.vue
...@@ -431,7 +431,7 @@ ...@@ -431,7 +431,7 @@
}, },
methods: { methods: {
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
...@@ -471,7 +471,7 @@ ...@@ -471,7 +471,7 @@
}, },
getqueryTeamAchievement() { getqueryTeamAchievement() {
this.CffpOrgInfoReqVO.userId=uni.getStorageSync('cffp_userId'), // this.CffpOrgInfoReqVO.userId=uni.getStorageSync('cffp_userId'),
this.CffpOrgInfoReqVO.queryType = this.tabList.filter(item=>item.id == this.currentTab)[0].type this.CffpOrgInfoReqVO.queryType = this.tabList.filter(item=>item.id == this.currentTab)[0].type
this.CffpOrgInfoReqVO.sortType = this.btnList.filter(item=>item.id == this.currentFilterBtn)[0].sortType this.CffpOrgInfoReqVO.sortType = this.btnList.filter(item=>item.id == this.currentFilterBtn)[0].sortType
api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => { api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => {
...@@ -502,7 +502,7 @@ ...@@ -502,7 +502,7 @@
// 1,代表刚进页面，2，代表修改了备注 // 1,代表刚进页面，2，代表修改了备注
this.myTeamList = [] this.myTeamList = []
api.queryMyTeamInfo({ api.queryMyTeamInfo({
userId: this.userId, // userId: this.userId,
type: '3' type: '3'
}).then(res =>{ }).then(res =>{
if(res['success']){ if(res['success']){
......
myPackageA/poster/poster.vue
...@@ -88,7 +88,7 @@ export default { ...@@ -88,7 +88,7 @@ export default {
}, },
methods: { methods: {
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
myPackageA/product-list/commission-detail.vue
...@@ -195,7 +195,7 @@ const fetchRateData = async () => { ...@@ -195,7 +195,7 @@ const fetchRateData = async () => {
} }
} }
const queryInfo = () => { const queryInfo = () => {
api.queryInfo({ userId: uni.getStorageSync('cffp_userId') }) api.queryInfo({})
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
delete res.data?.commonResult; delete res.data?.commonResult;
......
myPackageA/product-list/product-commission.vue
...@@ -76,7 +76,7 @@ const goToCommissionDetail = (product) => { ...@@ -76,7 +76,7 @@ const goToCommissionDetail = (product) => {
} }
const queryInfo = () => { const queryInfo = () => {
api.queryInfo({ userId: uni.getStorageSync('cffp_userId') }) api.queryInfo({})
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
delete res.data?.commonResult; delete res.data?.commonResult;
......
myPackageA/product-list/product-list.vue
...@@ -309,7 +309,7 @@ const productTypes = ref([]); ...@@ -309,7 +309,7 @@ const productTypes = ref([]);
// 产品列表 // 产品列表
const products = ref([]); const products = ref([]);
const queryInfo = () => { const queryInfo = () => {
api.queryInfo({ userId: uni.getStorageSync('cffp_userId') }) api.queryInfo({})
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
delete res.data?.commonResult; delete res.data?.commonResult;
......
myPackageA/ruleAndContract/cancelProtocol.vue
...@@ -123,7 +123,7 @@ export default { ...@@ -123,7 +123,7 @@ export default {
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
myPackageA/ruleAndContract/clause.vue
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
myPackageA/ruleAndContract/taxRules.vue
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
myPackageA/salary/salaryList.vue
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<!-- 明细卡片（紧跟在对应条目下方） --> <!-- 明细卡片（紧跟在对应条目下方） -->
<view class="detail-card" :class="{ active: item.expanded }" v-if="item.expanded"> <view class="detail-card" :class="{ active: item.expanded }" v-if="item.expanded">
<view class="detail-header"> <view class="detail-header">
<text class="total-label">🌟 基础信息</text> <text class="total-label"> 基础信息</text>
<!-- <text class="total-amount">¥{{ item.detail.grossAmount }} <text class="unit">元</text></text> --> <!-- <text class="total-amount">¥{{ item.detail.grossAmount }} <text class="unit">元</text></text> -->
</view> </view>
<!-- <view style="border-top:2px solid #dce3ed; margin:0px 0;"></view> --> <!-- <view style="border-top:2px solid #dce3ed; margin:0px 0;"></view> -->
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
</view> --> </view> -->
</view> </view>
<view class="detail-header"> <view class="detail-header">
<text class="total-label">🌟 打款明细</text> <text class="total-label"> 打款明细</text>
<!-- <text class="total-amount">¥{{ item.detail.grossAmount }} <text class="unit">元</text></text> --> <!-- <text class="total-amount">¥{{ item.detail.grossAmount }} <text class="unit">元</text></text> -->
</view> </view>
<!-- <view style="border-top:2px solid #dce3ed; margin:0px 0;"></view> --> <!-- <view style="border-top:2px solid #dce3ed; margin:0px 0;"></view> -->
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
if (item.mask) { if (item.mask) {
uni.showModal({ uni.showModal({
title: '安全验证', title: '安全验证',
content: '🔐 模拟人脸/指纹验证，点击“确定”通过验证', content: ' 模拟人脸/指纹验证，点击“确定”通过验证',
confirmText: '确定', confirmText: '确定',
cancelText: '取消', cancelText: '取消',
success: (res) => { success: (res) => {
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
} }
}, },
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
myPackageA/setting/logOff.vue
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
}, },
methods: { methods: {
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
const hasText = `${userId}|${timestamp}|${signatureSecret}` const hasText = `${userId}|${timestamp}|${signatureSecret}`
const hashResult = sha256(hasText); const hashResult = sha256(hasText);
let params = { let params = {
"userId":uni.getStorageSync('cffp_userId'), // "userId":uni.getStorageSync('cffp_userId'),
"signatureData":this.applyParam.personalSignOssPath, "signatureData":this.applyParam.personalSignOssPath,
"signatureHash":hashResult, "signatureHash":hashResult,
"timestamp":timestamp, "timestamp":timestamp,
......
pages.json
...@@ -752,18 +752,7 @@ ...@@ -752,18 +752,7 @@
}, },
"lazyLoad": true "lazyLoad": true
} }
// {
// "path" : "ticket/unUsed",
// "style" : {
// "navigationBarTitleText" : "我的卡券"
// }
// },
// {
// "path" : "ticket/alreadyUsed",
// "style" : {
// "navigationBarTitleText" : "使用记录"
// }
// }
] ]
}, },
{ {
......
pages/afterSaleDetail/afterSaleDetail.vue
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
}, },
userAfterSalesDtl(){ userAfterSalesDtl(){
const params = { const params = {
userId:this.userId, // userId:this.userId,
orderNo:this.orderNo, orderNo:this.orderNo,
afterSalesFlag:this.afterSalesFlag afterSalesFlag:this.afterSalesFlag
} }
......
pages/afterSales/afterSales.vue
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
}, },
userAfterSales(){ userAfterSales(){
const param = { const param = {
userId:this.userId, // userId:this.userId,
afterSalesFlag:this.afterSalesFlag afterSalesFlag:this.afterSalesFlag
} }
api.userAfterSales(param).then(res=>{ api.userAfterSales(param).then(res=>{
......
pages/application-process/basic-info.vue
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
}, },
queryOrgList() { queryOrgList() {
const param = { const param = {
userId: this.userId, // userId: this.userId,
partnerLevel: this.applyParam.partnerLevel partnerLevel: this.applyParam.partnerLevel
} }
api.queryOrgList(param).then((res) => { api.queryOrgList(param).then((res) => {
......
pages/applyDropClass/applyDropClass.vue
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/commonDetail/commonDetail.vue
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
}, },
methods: { methods: {
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/courseDetail/courseDetail.vue
...@@ -394,8 +394,10 @@ ...@@ -394,8 +394,10 @@
}, },
// 打开微信分享啊 // 打开微信分享啊
reinvite() { reinvite() {
//小程序没登录进入到系统，要回到小程序去登录 //小程序没登录进入到系统，要回到小程序去登录
if (uni.getStorageSync('mpCffp') && !uni.getStorageSync('dataToken')&&this.loginType === 'visitor') { if (uni.getStorageSync('mpCffp') && !uni.getStorageSync('dataToken')&&uni.getStorageSync('loginType') === 'visitor') {
this.jumpMplogin() this.jumpMplogin()
return return
} }
...@@ -521,7 +523,7 @@ ...@@ -521,7 +523,7 @@
//预约成功组件点击确认后的回调函数 //预约成功组件点击确认后的回调函数
c_confirmVerifyPopup() { c_confirmVerifyPopup() {
api.appointment({ api.appointment({
userId: uni.getStorageSync('cffp_userId'), // userId: uni.getStorageSync('cffp_userId'),
courseId: this.fileId courseId: this.fileId
}).then((res) => { }).then((res) => {
if (res['success']) { if (res['success']) {
...@@ -541,6 +543,7 @@ ...@@ -541,6 +543,7 @@
}, },
// 登录组件成功后回调函数 // 登录组件成功后回调函数
c_confirmLoginPopup() { c_confirmLoginPopup() {
console.log('执行了');
//登录完成之后 弹出预约弹窗 //登录完成之后 弹出预约弹窗
this.$refs.verifyPopupCom.open(); this.$refs.verifyPopupCom.open();
}, },
...@@ -1166,7 +1169,7 @@ ...@@ -1166,7 +1169,7 @@
let platform = uni.getSystemInfoSync().platform let platform = uni.getSystemInfoSync().platform
let UserShareRequestVO = { let UserShareRequestVO = {
systemType: platform == 'ios' ? '1' : '0', systemType: platform == 'ios' ? '1' : '0',
userId: uni.getStorageSync('cffp_userId'), // userId: uni.getStorageSync('cffp_userId'),
businessType: '1', // 分享类型 businessType: '1', // 分享类型
businessId: this.fileId, // 课程Id businessId: this.fileId, // 课程Id
shareUrl: shareURL + "/pages/courseDetail/courseDetail?fileId=" + this.fileId + shareUrl: shareURL + "/pages/courseDetail/courseDetail?fileId=" + this.fileId +
...@@ -1182,6 +1185,11 @@ ...@@ -1182,6 +1185,11 @@
// title: '分享成功', // title: '分享成功',
// duration: 2000 // duration: 2000
// }); // });
}else {
uni.showToast({
title: '分享统计失败',
duration: 2000
});
} }
}) })
}, },
...@@ -1199,7 +1207,7 @@ ...@@ -1199,7 +1207,7 @@
} }
}, },
queryInfo() { queryInfo() {
api.queryInfo({ userId: uni.getStorageSync('cffp_userId') }).then(res => { api.queryInfo({}).then(res => {
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
const cffp_userInfo = { const cffp_userInfo = {
...@@ -1401,6 +1409,7 @@ ...@@ -1401,6 +1409,7 @@
}, },
// 跳转到小程序登录 // 跳转到小程序登录
jumpMplogin() { jumpMplogin() {
let currentUrl = ``; let currentUrl = ``;
if (this.miniShareInfo.miniShare) { if (this.miniShareInfo.miniShare) {
if (uni.getStorageSync('loginType') == 'codelogin') { if (uni.getStorageSync('loginType') == 'codelogin') {
...@@ -1490,7 +1499,7 @@ ...@@ -1490,7 +1499,7 @@
this.showImg = false this.showImg = false
this.generatedImage = '' this.generatedImage = ''
this.shareItem = { fileFirstImage: '' }, this.shareItem = { fileFirstImage: '' },
this.loginType = uni.getStorageSync('loginType') this.loginType = uni.getStorageSync('loginType')
this.init(); this.init();
this.isWx_Miniprogram(); this.isWx_Miniprogram();
this.tabType = 1; this.tabType = 1;
......
pages/courselist/courselist.vue
...@@ -750,7 +750,7 @@ ...@@ -750,7 +750,7 @@
}) })
}, },
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/dropLists/dropLists.vue
...@@ -55,7 +55,8 @@ ...@@ -55,7 +55,8 @@
}) })
}, },
queryDropCourseList(){ queryDropCourseList(){
api.queryDropCourseList({userId:this.userId}).then(res=>{ // userId:this.userId
api.queryDropCourseList({}).then(res=>{
if(res['success']){ if(res['success']){
this.dropLists = res['data']['dropCourseListDtos'] this.dropLists = res['data']['dropCourseListDtos']
} }
......
pages/exchangeRecord/exchangeRecord.vue
...@@ -53,7 +53,8 @@ ...@@ -53,7 +53,8 @@
}, },
methods:{ methods:{
findByUserIdForWithdralHis(){ findByUserIdForWithdralHis(){
api.findByUserIdForWithdralHis({userId:this.userId}).then((res)=>{ // userId:this.userId
api.findByUserIdForWithdralHis({}).then((res)=>{
if(res['success']){ if(res['success']){
this.cffpFortuneDeductionList = res['data']['cffpFortuneDeductionList'] this.cffpFortuneDeductionList = res['data']['cffpFortuneDeductionList']
} }
......
pages/index/index.vue
...@@ -276,9 +276,9 @@ ...@@ -276,9 +276,9 @@
}, },
onShow() { onShow() {
if(uni.getStorageSync('dataToken')){ // if(uni.getStorageSync('dataToken')){
this.dataToken = uni.getStorageSync('dataToken') // this.dataToken = uni.getStorageSync('dataToken')
} // }
this.loginType = uni.getStorageSync('loginType') this.loginType = uni.getStorageSync('loginType')
this.init(); this.init();
...@@ -371,7 +371,7 @@ ...@@ -371,7 +371,7 @@
}, },
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
...@@ -548,7 +548,8 @@ ...@@ -548,7 +548,8 @@
} }
}, },
querySystemMessage() { querySystemMessage() {
api.querySystemMessage({systemType:1,userId:uni.getStorageSync('cffp_userId')}).then(res => { // userId:uni.getStorageSync('cffp_userId')
api.querySystemMessage({systemType:1,}).then(res => {
if (res['success']&& res['data']['dataList']&& res['data']['dataList'].length>0) { if (res['success']&& res['data']['dataList']&& res['data']['dataList'].length>0) {
let total = res['data']['dataList'].filter(item=>{ let total = res['data']['dataList'].filter(item=>{
...@@ -783,15 +784,13 @@ ...@@ -783,15 +784,13 @@
}) })
}, },
reLogin(){ reLogin(){
console.log('index调用');
uni.showLoading({ uni.showLoading({
title: '加载中...' title: '加载中...'
}); });
// 添加iOS平台检测 // 添加iOS平台检测
const isIOS = navigator.platform.match(/(iPhone|iPod|iPad)/i); const isIOS = navigator.platform.match(/(iPhone|iPod|iPad)/i);
const params = { const params = {
loginType:'5', code: this.dataToken,
authToken: this.dataToken,
loginType: '5', loginType: '5',
visitorUuid:uni.getStorageSync('visitorUuid')?uni.getStorageSync('visitorUuid'):dataHandling.uuid() visitorUuid:uni.getStorageSync('visitorUuid')?uni.getStorageSync('visitorUuid'):dataHandling.uuid()
} }
......
pages/inviteJoin/inviteJoin.vue
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
}) })
}, },
queryInfo() { queryInfo() {
api.queryInfo({ userId: uni.getStorageSync('cffp_userId') }).then(res => { api.queryInfo({}).then(res => {
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
const cffp_userInfo = { const cffp_userInfo = {
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
// 查询组织list // 查询组织list
getqueryOrgList() { getqueryOrgList() {
let CffpAreaQueryReqVO = { let CffpAreaQueryReqVO = {
userId: this.userId, // userId: this.userId,
partnerLevel: '' partnerLevel: ''
} }
api.queryOrgList(CffpAreaQueryReqVO).then(res => { api.queryOrgList(CffpAreaQueryReqVO).then(res => {
...@@ -629,7 +629,7 @@ ...@@ -629,7 +629,7 @@
this.generatedImage = '' this.generatedImage = ''
}, },
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/lanch/index.vue
...@@ -25,8 +25,11 @@ ...@@ -25,8 +25,11 @@
let dataToken = ref() let dataToken = ref()
let restrictedTipRef = ref() let restrictedTipRef = ref()
onLoad((options) => { onLoad((options) => {
jumpInfo.value = JSON.parse(JSON.stringify(options))
jumpInfo.value = JSON.parse(JSON.stringify(options))
if(options.backFlag){
uni.setStorageSync('backFlag',options.backFlag)
}
// 参数带token了重新登录 // 参数带token了重新登录
if (options.dataToken) { if (options.dataToken) {
console.log('jumpInfo.value', jumpInfo.value); console.log('jumpInfo.value', jumpInfo.value);
...@@ -79,11 +82,11 @@ ...@@ -79,11 +82,11 @@
}) })
} }
} }
}) })
const reLogin = (landingPage) => { const reLogin = (landingPage) => {
console.log('lanuch调用了');
uni.showLoading({ uni.showLoading({
title: '加载中...' title: '加载中...'
}); });
...@@ -91,7 +94,7 @@ ...@@ -91,7 +94,7 @@
const isIOS = navigator.platform.match(/(iPhone|iPod|iPad)/i); const isIOS = navigator.platform.match(/(iPhone|iPod|iPad)/i);
const params = { const params = {
loginType: '5', loginType: '5',
authToken: dataToken.value, code: dataToken.value,
visitorUuid:uni.getStorageSync('visitorUuid')?uni.getStorageSync('visitorUuid'):dataHandling.uuid() visitorUuid:uni.getStorageSync('visitorUuid')?uni.getStorageSync('visitorUuid'):dataHandling.uuid()
} }
api.loginVerification(params).then((res) => { api.loginVerification(params).then((res) => {
...@@ -133,9 +136,17 @@ ...@@ -133,9 +136,17 @@
} else if (landingPage == 'applyFranchise') { } else if (landingPage == 'applyFranchise') {
uni.reLaunch({ url: `/myPackageA/applyFranchise/applyFranchise?shareId=${jumpInfo.value.shareId}&invitationCode=${jumpInfo.value.invitationCode}&inviteUserId=${jumpInfo.value.inviteUserId}&miniShare=1` }) uni.reLaunch({ url: `/myPackageA/applyFranchise/applyFranchise?shareId=${jumpInfo.value.shareId}&invitationCode=${jumpInfo.value.invitationCode}&inviteUserId=${jumpInfo.value.inviteUserId}&miniShare=1` })
}else if(landingPage == 'index'){ }else if(landingPage == 'index'){
uni.reLaunch({ if(jumpInfo.value.miniShare){
url:'/pages/index/index?miniShare=1' uni.reLaunch({
}) url:'/pages/index/index?miniShare=1'
})
}else {
console.log('走到这里了');
uni.reLaunch({
url:'/pages/index/index'
})
}
}else if(landingPage == 'courselist'){ }else if(landingPage == 'courselist'){
uni.reLaunch({ uni.reLaunch({
url:'/pages/courselist/courselist' url:'/pages/courselist/courselist'
...@@ -150,12 +161,28 @@ ...@@ -150,12 +161,28 @@
}) })
} }
} else { } else {
uni.showToast({ //内嵌带的code失效了，用户需要重新登录
title: res['message'], if(res.data.commonResult&&res.data.commonResult.errorCode=='1101'){
duration: 2000, if(dataHandling.h5RuntimeEnv()=='wechat-miniprogram'){
icon: 'none' if(jumpInfo.value.backFlag =='ydMall'){
}) wx.miniProgram.reLaunch({url:`/myPackageA/login/index?codeInvalid=1&systemSource=cffp&pageSource=lanch&landingPage=${jumpInfo.value.landingPage}`})
uni.reLaunch({ url: `/pages/index/index` }) }
}else {
uni.reLaunch({
url:`/myPackageA/login/login`
})
}
return
}else {
uni.showToast({
title: res['message'],
duration: 2000,
icon: 'none'
})
uni.reLaunch({ url: `/pages/index/index` })
}
} }
}) })
uni.hideLoading() uni.hideLoading()
......
pages/myPoints/myPoints.vue
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
findByUserIdForFortuneStatistic(){ findByUserIdForFortuneStatistic(){
const param = { const param = {
isDtl:2, isDtl:2,
userId:uni.getStorageSync('cffp_userId'), // userId:uni.getStorageSync('cffp_userId'),
// userId: 1, // userId: 1,
fortuneDate:this.fortuneDate, fortuneDate:this.fortuneDate,
timeFlag:this.timeFlag timeFlag:this.timeFlag
......
pages/myShare/myShare.vue
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
}, },
methods: { methods: {
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/orderConfirm/orderConfirm.vue
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
methods: { methods: {
queryInfo() { queryInfo() {
api.queryInfo({ userId: uni.getStorageSync('cffp_userId') }).then(res => { api.queryInfo({}).then(res => {
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
orderId: this.orderId, orderId: this.orderId,
amount: this.isRedirect == 1 ? this.calculatedPrice : this.totalPrice, amount: this.isRedirect == 1 ? this.calculatedPrice : this.totalPrice,
paymentMethod: this.paymentMethod, paymentMethod: this.paymentMethod,
userId: this.userId, // userId: this.userId,
integralExchange: this.isDeduction == "true" ? this.deductionCore : 0, integralExchange: this.isDeduction == "true" ? this.deductionCore : 0,
paymentType: '', paymentType: '',
isPayOrAuth: '', isPayOrAuth: '',
...@@ -342,6 +342,7 @@ ...@@ -342,6 +342,7 @@
// #ifdef H5 // #ifdef H5
param.paymentType = 2; param.paymentType = 2;
//deviceType:PC为1,移动端为2,微信为3 //deviceType:PC为1,移动端为2,微信为3
if (this.deviceType == 3) { if (this.deviceType == 3) {
// 向小程序通信 // 向小程序通信
if (dataHandling.h5RuntimeEnv() == 'wechat-miniprogram') { if (dataHandling.h5RuntimeEnv() == 'wechat-miniprogram') {
...@@ -355,11 +356,9 @@ ...@@ -355,11 +356,9 @@
} }
let _this = this let _this = this
param.isPayOrAuth = 1; param.isPayOrAuth = 1;
// uni.showToast({ uni.showToast({
// title: JSON.stringify(param), content:`微信支付：${JSON.stringify(param)}`
// duration: 10000, })
// icon: 'none'
// })
api.wxAuthorize(param).then((res) => { api.wxAuthorize(param).then((res) => {
_this.paymentBtnDisabled = false; _this.paymentBtnDisabled = false;
...@@ -554,7 +553,8 @@ ...@@ -554,7 +553,8 @@
courseDetailLoad(option) { courseDetailLoad(option) {
this.courseDetail(); this.courseDetail();
this.queryByUserIdFortuneStatistic() this.queryByUserIdFortuneStatistic()
this.deviceType = common.checkDeviceType(); this.deviceType = common.checkDeviceType(); //原来的
// this.deviceType = '3'; //测试的
if (this.deviceType == 3) { if (this.deviceType == 3) {
this.paymentMethod = 1; this.paymentMethod = 1;
} }
......
pages/orderDetail/orderDetail.vue
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
}, },
methods: { methods: {
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
}, },
userCourseInfo() { userCourseInfo() {
const param = { const param = {
userId: this.userId, // userId: this.userId,
orderId: this.orderId, orderId: this.orderId,
queryType: this.type == 'drop' ? '1' : '2', queryType: this.type == 'drop' ? '1' : '2',
commissionType: this.commissionType, commissionType: this.commissionType,
......
pages/orderStatus/orderStatus.vue
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
...@@ -132,7 +132,8 @@ ...@@ -132,7 +132,8 @@
}) })
}, },
querySystemMessage() { querySystemMessage() {
api.querySystemMessage({systemType:1,userId:uni.getStorageSync('cffp_userId')}).then(res => { // userId:uni.getStorageSync('cffp_userId')
api.querySystemMessage({systemType:1,}).then(res => {
if (res['success']&& res['data']['dataList'].length>0) { if (res['success']&& res['data']['dataList'].length>0) {
this.infoTotal = res['data']['dataList'].filter(item=>{ this.infoTotal = res['data']['dataList'].filter(item=>{
return item.isRead == 0 return item.isRead == 0
......
pages/personalCenter/accountoperation/aboutcffp.vue
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/personalCenter/detail.vue
...@@ -317,8 +317,8 @@ ...@@ -317,8 +317,8 @@
}, 100); }, 100);
}; };
const queryInfo = () => { const queryInfo = () => {
api.queryInfo({ userId: uni.getStorageSync('cffp_userId') }) api.queryInfo({})
.then((res: QueryInfoResponse) => { // 👈 添加类型注解 .then((res: QueryInfoResponse) => { // 添加类型注解
if (res.success) { if (res.success) {
delete res.data?.commonResult; delete res.data?.commonResult;
......
pages/personalCenter/helpCenter.vue
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/personalCenter/myTeam.vue
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
}, },
methods: { methods: {
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
...@@ -336,7 +336,7 @@ ...@@ -336,7 +336,7 @@
}, },
getqueryTeamAchievement() { getqueryTeamAchievement() {
this.CffpOrgInfoReqVO.userId=uni.getStorageSync('cffp_userId'), // this.CffpOrgInfoReqVO.userId=uni.getStorageSync('cffp_userId'),
this.CffpOrgInfoReqVO.queryType = this.tabList.filter(item=>item.id == this.currentTab)[0].type this.CffpOrgInfoReqVO.queryType = this.tabList.filter(item=>item.id == this.currentTab)[0].type
this.CffpOrgInfoReqVO.sortType = this.btnList.filter(item=>item.id == this.currentFilterBtn)[0].sortType this.CffpOrgInfoReqVO.sortType = this.btnList.filter(item=>item.id == this.currentFilterBtn)[0].sortType
api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => { api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => {
......
pages/personalCenter/myTeamIncubate.vue
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
myTeamList:[],//我的团队表格数据， myTeamList:[],//我的团队表格数据，
myTeamData:{},//我的团队总数据， myTeamData:{},//我的团队总数据，
CffpOrgInfoReqVO: { CffpOrgInfoReqVO: {
userId: uni.getStorageSync('cffp_userId'), // userId: uni.getStorageSync('cffp_userId'),
startDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`, startDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`,
endDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`, endDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`,
courseOrPolicy: '1', courseOrPolicy: '1',
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
}, },
methods: { methods: {
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/personalCenter/personalCenter.vue
...@@ -546,7 +546,8 @@ ...@@ -546,7 +546,8 @@
}, },
querySystemMessage() { querySystemMessage() {
if (this.userId) { if (this.userId) {
api.querySystemMessage({ systemType: 1, userId: uni.getStorageSync('cffp_userId') }).then((res) => { // userId: uni.getStorageSync('cffp_userId')
api.querySystemMessage({ systemType: 1, }).then((res) => {
if (res['success'] && res['data']['dataList'] && res['data']['dataList'].length > 0) { if (res['success'] && res['data']['dataList'] && res['data']['dataList'].length > 0) {
this.messageInfo = res['data']['dataList']; this.messageInfo = res['data']['dataList'];
this.msgTotal = res['data']['dataList'].filter(item => { this.msgTotal = res['data']['dataList'].filter(item => {
...@@ -755,7 +756,6 @@ ...@@ -755,7 +756,6 @@
} else { } else {
const urlObj = JSON.parse(JSON.stringify(item)) const urlObj = JSON.parse(JSON.stringify(item))
console.log('222222222', urlObj.link);
if (urlObj.type) { if (urlObj.type) {
urlObj.link = urlObj.link =
`${urlObj.link}?type=${urlObj.type}&from=personalCenter&partnerType=${this.customerBasicInfo.partnerType}` `${urlObj.link}?type=${urlObj.type}&from=personalCenter&partnerType=${this.customerBasicInfo.partnerType}`
...@@ -845,7 +845,7 @@ ...@@ -845,7 +845,7 @@
}, },
// 查询个人资料 // 查询个人资料
queryInfo() { queryInfo() {
api.queryInfo({ userId: uni.getStorageSync('cffp_userId') }).then(res => { api.queryInfo({}).then(res => {
if (res['success']) { if (res['success']) {
this.customerBasicInfo = res['data']; this.customerBasicInfo = res['data'];
if (res['data']['businessCardId']) { if (res['data']['businessCardId']) {
......
pages/personalCenter/system/accontsetting.vue
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/personalCenter/system/menulist.vue
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
}, },
methods: { methods: {
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/personalCenter/system/settings.vue
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/personalCenter/teamPerformance/teamPerformance.vue
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
} }
], ],
CffpOrgInfoReqVO: { CffpOrgInfoReqVO: {
userId: uni.getStorageSync('cffp_userId'), // userId: uni.getStorageSync('cffp_userId'),
startDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`, startDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`,
endDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`, endDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`,
queryType: '', queryType: '',
......
pages/personalCenter/user-information.vue
...@@ -170,7 +170,8 @@ ...@@ -170,7 +170,8 @@
const initialData = JSON.parse(options.customerBasicInfo); const initialData = JSON.parse(options.customerBasicInfo);
this.optionForm = JSON.parse(JSON.stringify(initialData)); this.optionForm = JSON.parse(JSON.stringify(initialData));
this.tempInfo.optionForm = JSON.parse(JSON.stringify(initialData)); this.tempInfo.optionForm = JSON.parse(JSON.stringify(initialData));
console.log('this.optionForm',this.optionForm);
console.log('this.tempInfo',this.tempInfo);
// 初始化 realInfo.shiming 和 tempInfo.shiming // 初始化 realInfo.shiming 和 tempInfo.shiming
this.realInfo.shiming = {}; this.realInfo.shiming = {};
this.tempInfo.shiming = {}; this.tempInfo.shiming = {};
...@@ -189,7 +190,7 @@ ...@@ -189,7 +190,7 @@
}, },
methods: { methods: {
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
...@@ -243,7 +244,7 @@ ...@@ -243,7 +244,7 @@
// 查询实名信息 // 查询实名信息
getImproveInfo(){ getImproveInfo(){
let params = { let params = {
userId:uni.getStorageSync('cffp_userId'), // userId:uni.getStorageSync('cffp_userId'),
oprType:'0'//因为接口不传这个值会报错，所以传一个值，拿到实名信息 oprType:'0'//因为接口不传这个值会报错，所以传一个值，拿到实名信息
} }
api.improveInfo(params).then((res)=>{ api.improveInfo(params).then((res)=>{
...@@ -364,7 +365,7 @@ ...@@ -364,7 +365,7 @@
saveUserInfo() { saveUserInfo() {
let UserRequestVO = { let UserRequestVO = {
id: uni.getStorageSync('cffp_userId'), // id: uni.getStorageSync('cffp_userId'),
realName: this.optionForm.realName, realName: this.optionForm.realName,
nickName: this.optionForm.nickName, nickName: this.optionForm.nickName,
headPicture: this.optionForm.headPicture, headPicture: this.optionForm.headPicture,
...@@ -372,7 +373,7 @@ ...@@ -372,7 +373,7 @@
} }
let params = { let params = {
realNameAuthRequest: {...this.realInfo.shiming}, realNameAuthRequest: {...this.realInfo.shiming},
userId: uni.getStorageSync('cffp_userId'), // userId: uni.getStorageSync('cffp_userId'),
oprType:0 //只更新实名 oprType:0 //只更新实名
} }
......
pages/pointsExchange/customDatePop.vue
...@@ -532,7 +532,7 @@ ...@@ -532,7 +532,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin: 40rpx 100rpx; margin: 40rpx 0rpx;
box-sizing: border-box; box-sizing: border-box;
.header-time { .header-time {
background: rgba(245, 245, 245, 1); background: rgba(245, 245, 245, 1);
......
pages/pointsExchange/pointsExchange.vue
...@@ -246,12 +246,7 @@ ...@@ -246,12 +246,7 @@
api.dropOptionsQuery({ code: 'CFFP_Commission_Item' }).then((res) => { api.dropOptionsQuery({ code: 'CFFP_Commission_Item' }).then((res) => {
this.commissionTypeList = [{ dropOptionName: '全部', dropOptionCode: null, id: '0' }].concat(res[ this.commissionTypeList = [{ dropOptionName: '全部', dropOptionCode: null, id: '0' }].concat(res[
'data']['dropMasterInfoList'][0]['dropOptionsInfoList']); 'data']['dropMasterInfoList'][0]['dropOptionsInfoList']);
// for(let i=0;i<this.commissionTypeList.length;i++){
// if(this.commissionType == this.commissionTypeList[i]['dropOptionCode']){
// this.commissionTypeIdx = i;
// break;
// }
// }
}) })
}, },
closePop() { closePop() {
...@@ -259,7 +254,7 @@ ...@@ -259,7 +254,7 @@
}, },
//时间选择框确定事件 //时间选择框确定事件
comfirm(obj) { comfirm(obj) {
console.log('obj', obj);
this.currentItem = obj.current this.currentItem = obj.current
// timeType 8:月份 9:三种方式的选择 10:自定义日期选择 // timeType 8:月份 9:三种方式的选择 10:自定义日期选择
...@@ -321,7 +316,6 @@ ...@@ -321,7 +316,6 @@
}) })
}, },
toWithdrawal() { toWithdrawal() {
if (!this.yesExchangeFortune || this.yesExchangeFortune == 0) { if (!this.yesExchangeFortune || this.yesExchangeFortune == 0) {
uni.showModal({ uni.showModal({
content: `目前可兑换积分为${this.yesExchangeFortune},积分低于1分时无法兑换`, content: `目前可兑换积分为${this.yesExchangeFortune},积分低于1分时无法兑换`,
...@@ -368,7 +362,7 @@ ...@@ -368,7 +362,7 @@
} }
}, },
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/product/product.vue
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
} }
}, },
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/saleCourseLists/saleCourseLists.vue
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
}, },
userCourseCount(){ userCourseCount(){
const params = { const params = {
userId:this.userId, // userId:this.userId,
queryDate:this.queryDate queryDate:this.queryDate
} }
api.userCourseCount(params).then(res=>{ api.userCourseCount(params).then(res=>{
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
}, },
userCourseList(){ userCourseList(){
const params = { const params = {
userId:this.userId, // userId:this.userId,
queryDate:this.queryDate queryDate:this.queryDate
} }
if(this.tabType===1){ if(this.tabType===1){
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
}) })
}, },
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/systemMsg/system_msg.vue
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
...@@ -94,7 +94,8 @@ ...@@ -94,7 +94,8 @@
}) })
}, },
querySystemMessage() { querySystemMessage() {
api.querySystemMessage({systemType:1,userId:uni.getStorageSync('cffp_userId')}).then(res => { // userId:uni.getStorageSync('cffp_userId')
api.querySystemMessage({systemType:1,}).then(res => {
if (res['success']&&res['data']['dataList']&&res['data']['dataList'].length>0) { if (res['success']&&res['data']['dataList']&&res['data']['dataList'].length>0) {
this.system_msgs_list = res['data']['dataList']; this.system_msgs_list = res['data']['dataList'];
}else{ }else{
...@@ -134,7 +135,8 @@ ...@@ -134,7 +135,8 @@
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
api.oneKeyRead({systemType:1,userId:uni.getStorageSync('cffp_userId')}).then((res)=>{ // userId:uni.getStorageSync('cffp_userId')
api.oneKeyRead({systemType:1}).then((res)=>{
if(res['success']){ if(res['success']){
that.querySystemMessage(); that.querySystemMessage();
}else{ }else{
...@@ -150,22 +152,7 @@ ...@@ -150,22 +152,7 @@
} }
} }
}); });
// api.oneKeyRead({systemType:1,userId:uni.getStorageSync('cffp_userId')}).then((res)=>{
// if(res['success']){
// uni.showToast({
// title: '所有信息都已读',
// duration: 2000,
// icon: 'none'
// })
// this.querySystemMessage();
// }else{
// uni.showToast({
// title: res['message'],
// duration: 2000,
// icon: 'none'
// })
// }
// })
} }
} }
} }
......
pages/systemMsg/system_msg_detail.vue
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/taxRules/taxRules.vue
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
pages/withdrawal/withdrawal.vue
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
sfp/childEdu/childEdu.vue
...@@ -534,7 +534,7 @@ ...@@ -534,7 +534,7 @@
return common.formatFloat(num,digitNum=2,type=1) return common.formatFloat(num,digitNum=2,type=1)
}, },
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
sfp/dataImport/data-import.vue
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
sfp/housePurchase/housePurchase.vue
...@@ -371,7 +371,7 @@ ...@@ -371,7 +371,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
sfp/housePurchase/loanBalance.vue
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
sfp/housePurchase/planningParameters.vue
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
}, },
methods:{ methods:{
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
sfp/index/index.vue
...@@ -636,7 +636,7 @@ ...@@ -636,7 +636,7 @@
this.resultShowFlag = false; this.resultShowFlag = false;
}, },
queryInfo() { queryInfo() {
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({}).then(res=>{
// 保存用户得个人信息 // 保存用户得个人信息
if (res['success']) { if (res['success']) {
delete res.data.commonResult delete res.data.commonResult
......
util/router.js
...@@ -67,8 +67,8 @@ export default function initApp() { ...@@ -67,8 +67,8 @@ export default function initApp() {
url: '/myPackageA/login/login' url: '/myPackageA/login/login'
}) })
} }
if (uni.getStorageSync('cffp_userId')) { if (uni.getStorageSync('loginType') == 'codelogin') {
api.queryInfo({ userId: uni.getStorageSync('cffp_userId') }).then(res => { api.queryInfo({}).then(res => {
if (!res['success']) { if (!res['success']) {
uni.setStorageSync('loginType', 'visitor') uni.setStorageSync('loginType', 'visitor')
uni.navigateTo({ uni.navigateTo({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment