From 99e043a73f80e3dfe5803b4903e22bb730292338 Mon Sep 17 00:00:00 2001 From: "3075067877@qq.com" <3075067877@qq.com> Date: Wed, 3 Apr 2024 17:57:27 +0800 Subject: [PATCH] change --- src/js/api.js | 2 + src/manifest.json | 2 +- src/pages.json | 6 +- src/pages/index/index.vue | 98 +++++++++++-- .../popup-content/miniapp-change-jian-jie.vue | 13 +- .../popup-content/miniapp-change-name.vue | 17 ++- src/subpackage/party/js/api.js | 3 +- src/subpackage/party/pages/index/index.vue | 30 ++-- src/subpackage/party/pages/login/login.vue | 116 ++++++++++----- src/subpackage/party/pages/login/regist.vue | 44 ++++-- src/subpackage/party/pages/login/reviewing.vue | 25 +--- src/subpackage/party/pages/miniapp/auth.vue | 24 ++-- src/subpackage/party/pages/miniapp/certify.vue | 33 +++-- src/subpackage/party/pages/miniapp/certify_res.vue | 33 +++-- src/subpackage/party/pages/miniapp/record.vue | 8 +- src/subpackage/party/pages/miniapp/record_pre.vue | 2 +- src/subpackage/party/pages/miniapp/record_res.vue | 101 ++----------- src/subpackage/party/pages/miniapp/regist.vue | 97 +++++++------ src/subpackage/party/pages/miniapp/regular.vue | 157 +++++++++++++++++++-- src/subpackage/party/pages/miniapp/unauth.vue | 1 - .../party/pages/miniapp/wx_auth_select.vue | 3 +- 21 files changed, 522 insertions(+), 293 deletions(-) diff --git a/src/js/api.js b/src/js/api.js index a540d6b..66faf33 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -163,6 +163,8 @@ API['party'] = { webUpload:`${ORIGIN}/upload/file/businessLicense`, // 上传图片 webOcr:`${ORIGIN}/ouxuanac/ocr`, // 营业执照识别 + // bindingOpenId: `${ORIGIN}/admin/assistant/bindingOpenId`, //改为小程序端绑定openid + bindingOpenId: `${ORIGIN}/assistant/bindingOpenId`, //改为小程序端绑定openid } export default { ORIGIN, API }; diff --git a/src/manifest.json b/src/manifest.json index bc21464..d409cc9 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -62,7 +62,7 @@ "export": "" }, "captcha": { - "version": "2.0.0", //请选择小程序插件最新版本 + "version": "2.1.0", //请选择小程序插件最新版本 "provider": "wx1fe8d9a3cb067a75" } }, diff --git a/src/pages.json b/src/pages.json index 5158f52..bd83d54 100644 --- a/src/pages.json +++ b/src/pages.json @@ -9,11 +9,7 @@ { "path": "pages/login/login", "style": { - "mp-weixin": { - "usingComponents": { - "miniprogram-thirdparty-plugin": "plugin://myPlugin/miniprogram-thirdparty-plugin" - } - } + "navigationBarTitleText": "登录" } }, { diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 4dc8252..2123cef 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -75,7 +75,7 @@ - + 核销 @@ -196,12 +196,12 @@ } }, async onLoad(options) { + try{ util.showLoad(); // 20230829 新增平台账户不绑定，不检验，每次进来走重新登陆绑定流程 if(options.role !== 'ADMIN-PLATFORM')await this.checkUserAuthor(); - // 20240325 新增openid绑定账号检测 - await this.webBrandUserCheck(); + util.hideLoad(); this.loginStatus = app.isLogin(); if(!!app.isLogin())this.getIndexInfo(); @@ -245,7 +245,13 @@ }); } if(tabInfo.id === 10)return util.routeTo(tabInfo.path + `?brand_id=${indexData.brand.id}`,'nT'); - + if(tabInfo.id === 11){ + // if(!indexData.brand.mini_wechat_appid)return util.showNone('暂无appid！') + let url = tabInfo.path + `?appid=${indexData.brand.mini_wechat_appid}` + console.log(222,url) + return util.routeTo(url,'nT'); + } + util.routeTo(tabInfo.path,'nT'); }, @@ -288,10 +294,14 @@ let _data = res.data; if(_data.code == 0){ // let _data = res.data.data; + if(_data.data == ''){ uni.removeStorageSync('token'); this.loginStatus = app.isLogin(); - return util.routeTo(`/pages/login/login`,'rL'); + // 20240325 新增openid绑定账号检测 + this.webBrandUserCheck(); + + // return util.routeTo(`/pages/login/login`,'rL'); } uni.setStorageSync('token',_data.data); return _data; @@ -390,31 +400,42 @@ }, webBrandUserCheck(){ + + // return this.webUserGet(); + console.warn('webBrandUserCheck') + let token = uni.getStorageSync('token'); + let token_web = uni.getStorageSync('token_web'); + let _data = { + token: token||"", + token_web: token_web||"", + } return servers.get({ url: API['party'].webBrandUser, - data: {}, + data: _data, failMsg: '加载数据失败！' }) .then(res=>{ console.log('webBrandUserCheck',res) - if(!res.had_binding){ - console.warn('webBrandUser 验证绑定账号失败！'); - return util.routeTo(`/pages/login/login`,'rL'); - }else{ + // if(!res.had_binding){ + // console.warn('webBrandUser 验证绑定账号失败！'); + // return util.routeTo(`/pages/login/login`,'rL'); + // }else{ //status: 1创建品牌 2实名认证 3审核成功 4审核失败 5完成 6修改审核中???待定 - console.warn(res,'webBrandUserCheck success'); - if(res.status==0){ + console.warn(res,'webBrandUserCheck success',res.status); + if(res.status==0&&token_web){ return util.routeTo(`/subpackage/party/pages/login/regist`,'rL'); }else if(res.status==1){ return util.routeTo(`/subpackage/party/pages/login/reviewing`,'rL'); }else if(res.status==2){ return util.routeTo(`/subpackage/party/pages/login/reviewing`,'rL'); + }else if(res.status==5){ + //完成 小程序端执行绑定 + this.bindUserOpenid(); } - // return res; - } + // } }).catch(err=>{ console.warn('webBrandUserCheck err',err) @@ -426,6 +447,55 @@ let { indexData } = this; util.routeTo(`/pages/store_list/store_list?brand_id=${indexData.brand.id}`,'nT'); }, + bindUserOpenid(){ + + let token_web = uni.getStorageSync('token_web'); + let _data = { + token_web: token_web||"", + } + return servers.post({ + url: API['party'].bindingOpenId, + data: _data, + failMsg: '绑定失败！' + }) + .then(res=>{ + console.log('小程序端绑定bindUserOpenid',res) + if(res.msg=="success"){ + util.showNone('绑定成功！'); + util.routeTo(`/pages/index/index`,'rL'); + }else{ + util.showNone(res.message || '绑定失败！'); + } + }).catch(err=>{ + console.warn('bindUserOpenid err',err) + util.showNone(err.message || '绑定失败！'); + // util.routeTo(`/subpackage/party/pages/login/reviewing`,'rL'); + util.routeTo(`/pages/login/login`,'rL'); + }) + }, + webUserGet(){ + let token_web = uni.getStorageSync('token_web'); + let _data = { + token_web: token_web||"", + } + return servers.post({ + url: API['party'].webUserGet, + data: _data, + failMsg: '获取信息失败！' + }) + .then(res=>{ + console.log('webUserGet:',res) + if(res.code==0){ + }else{ + util.showNone(res.message || '失败！'); + } + }).catch(err=>{ + console.warn('bindUserOpenid err',err) + util.showNone(err.message || '获取信息失败！'); + }) + }, + + } } diff --git a/src/subpackage/party/components/popup-content/miniapp-change-jian-jie.vue b/src/subpackage/party/components/popup-content/miniapp-change-jian-jie.vue index a605f95..af4e9db 100644 --- a/src/subpackage/party/components/popup-content/miniapp-change-jian-jie.vue +++ b/src/subpackage/party/components/popup-content/miniapp-change-jian-jie.vue @@ -10,6 +10,16 @@ 小程序简介设置 + + + 可修改次数: + {{appInfo.signature_info.modify_quota}} + 次 + 已修改次数: + {{appInfo.signature_info.modify_used_count}} + 次 + + @@ -41,10 +51,9 @@ import { mapState } from 'vuex'; export default { props: { - nameInfo: { + appInfo: { type: Object, default: ()=>({ - showPopup:true, }) }, appid: { diff --git a/src/subpackage/party/components/popup-content/miniapp-change-name.vue b/src/subpackage/party/components/popup-content/miniapp-change-name.vue index fa8a886..bac1607 100644 --- a/src/subpackage/party/components/popup-content/miniapp-change-name.vue +++ b/src/subpackage/party/components/popup-content/miniapp-change-name.vue @@ -10,6 +10,17 @@ 小程序名称设置 + + + + 可修改次数: + {{appInfo.nickname_info.modify_quota}} + 次 + 已修改次数: + {{appInfo.nickname_info.modify_used_count}} + 次 + + @@ -84,10 +95,10 @@ import { mapState } from 'vuex'; export default { props: { - nameInfo: { + appInfo: { type: Object, default: ()=>({ - showPopup:true, + // showPopup:true, }) }, appid: { @@ -137,7 +148,7 @@ export default { await this.setnickname().then(res=>{ console.log("setnickname-res", res) this.showPopup = false; - this.$emit('sure',this.nameInfo); + this.$emit('sure',this.appInfo); }) }, diff --git a/src/subpackage/party/js/api.js b/src/subpackage/party/js/api.js index d06e503..b28ec5b 100644 --- a/src/subpackage/party/js/api.js +++ b/src/subpackage/party/js/api.js @@ -4,7 +4,7 @@ export const PARTY_API = { webBrandUser: `${ORIGIN}/web/webBrandUser/GetOpenId`, //检测用户openid是否与账户绑定, captchaSms: `${ORIGIN}/captchaSms/send`, // 发送验证码 webLogin: `${ORIGIN}/web/webBrandUser/login`, // 登录 - // webUserGet:`${ORIGIN}/web/webBrandUser/get`, // 获取用户信息 + webUserGet:`${ORIGIN}/web/webBrandUser/get`, // 获取官网用户信息,审核状态 webUpload: `${ORIGIN}/upload/file/businessLicense`, // 上传图片 webOcr: `${ORIGIN}/ouxuanac/ocr`, // 营业执照识别 webBrandUserSave: `${ORIGIN}/web/webBrandUser/save`, // 官网PC端用户品牌数据提交 @@ -19,6 +19,7 @@ export const PARTY_API = { getVerifyMiniAppInfo: `${ORIGIN}/admin/tryout/verifyMiniAppInfo/get`, //获取转正数据 verifybetaweapp: `${ORIGIN}/admin/wechatTpp/mini/tryout/verifybetaweapp`, //转正 + bindingOpenId: `${ORIGIN}/assistant/bindingOpenId`, //改为小程序端绑定openid getCertifyInfo: `${ORIGIN}/admin/tryout/verifyMiniAppInfo/get`, //获取小程序认证信息 diff --git a/src/subpackage/party/pages/index/index.vue b/src/subpackage/party/pages/index/index.vue index 2170bfd..18ddd6c 100644 --- a/src/subpackage/party/pages/index/index.vue +++ b/src/subpackage/party/pages/index/index.vue @@ -65,6 +65,15 @@ + 试用小程序 + + + 去转正 + + + + + 收款账户申请（商户号） @@ -117,10 +126,11 @@ } }, onLoad(opts) { - console.log("onload-", this.brandInfo.brand.id) - if(!opts.appid){ - opts.appid = "wxc141a743225e7885" - } + console.log("onload-", opts) + this.appid = opts.appid; + // if(!opts.appid){ + // opts.appid = "wxc141a743225e7885" + // } }, onShow() { this.checkMiniAppRegist() @@ -144,18 +154,22 @@ }, }, methods: { + toRegular(){ + console.log('toRegular') + util.routeTo(`/subpackage/party/pages/miniapp/regular`,'nT'); + }, toShouKuan(){ console.log('toShouKuan') return util.showNone('暂未开放') util.routeTo(`/subpackage/party/pages/index/shoukuan`,'nT'); }, toMiniAppRegist(index){ - let {miniapp_app_id} = this - console.log('toMiniAppRegist',index) - if(!this.miniapp_app_id){ + let {miniapp_app_id,appid} = this + console.log('toMiniAppRegist',index,appid) + if(!appid){ util.routeTo(`/subpackage/party/pages/miniapp/wx_auth_select?index=${index}`,'nT'); }else{ - util.routeTo(`/subpackage/party/pages/miniapp/regist?appid=${miniapp_app_id}`,'nT'); + util.routeTo(`/subpackage/party/pages/miniapp/regist?appid=${appid}`,'nT'); } }, checkMiniAppRegist(){ diff --git a/src/subpackage/party/pages/login/login.vue b/src/subpackage/party/pages/login/login.vue index 7d8983f..3dad910 100644 --- a/src/subpackage/party/pages/login/login.vue +++ b/src/subpackage/party/pages/login/login.vue @@ -3,17 +3,19 @@ - 返回首页 + 返回首页 - + - + - 获取验证码 + {{codeText}} @@ -22,6 +24,8 @@ - 同意《用户协议》和 - 《隐私协议》 + 同意《用户协议》和 + 《隐私协议》 @@ -55,34 +59,32 @@ import { servers } from '@/js/server'; import party_api from '../../../party/js/api'; + import{phoneReg} from '@/utils/util.js' const app = getApp(); const uniLogin = util.promisify(uni.login); - // import tools from '../../js/tools'; - // import retailServer from '../../js/retail_server'; - // import retailApi from '../../js/retail_api'; - // import hoverCartList from '../../components/hover_cart_list/hover_cart_list'; + import { mapState } from 'vuex' export default { components: { - // 'hoverCartList': hoverCartList , }, data() { return { + agree:false, mobile:"", code:"", ticket:"", - agree:false, + count:60, + codeText:"获取验证码", // mobile: '18502079603', // code:"697961", // ticket:"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2YWxpZF9wZXJpb2QiOiJcIjIwMjQtMDMtMjZUMTQ6Mzc6NTEuOTYzNTA1NDM2KzA4OjAwXCJcbiIsInZhbHVlIjoiMTg1MDIwNzk2MDM2OTc5NjEifQ.8-jjMrKufC_cpfQoNOtY5JSyvyNDoyUe2b00EfdYR48", } }, onLoad() { - console.log("onload-", this.brandInfo.brand.id,party_api.captchaSms) // util.showNone("onLoad 判断是否有审核中商家资料") }, onShow() { @@ -97,22 +99,42 @@ }, }, methods: { - testis(){ - const appid = uni.getAccountInfoSync().miniProgram.appId; - console.log('appid',appid) - util.routeTo(`/subpackage/party/pages/login/regist`,'rL'); - }, - groupChange(e){ - console.log('groupChange',e) - this.agree = e.detail.value.indexOf('agree') > -1 + // 验证码倒计时 + countDown(){ + let {count} = this + console.log('countDown',count) + if(count != 60)return + let timer = setInterval(()=>{ + count-- + this.count = count + if(count <= 0){ + clearInterval(timer) + this.codeText = '获取验证码' + this.count = 60 + }else{ + this.codeText = count + 's' + } + },1000) }, - async clickSubmitbtn(){ - let {mobile,code,ticket} = this + captchaLogin:util.debounce(function(){ + let {mobile,count} = this + if(!mobile || !phoneReg.test(mobile))return util.showNone('请输入正确手机号码！'); + if(count != 60)return util.showNone('请稍后再试！'); + this.countDown() + this.selectComponent('#captcha').show() + // 进行业务逻辑，若出现错误需重置验证码，执行以下方法 + // if (error) { + // this.selectComponent('#captcha').refresh() + // } + },1000,false), + clickSubmitbtn:util.debounce(async function(){ + let {mobile,code,ticket,agree} = this console.log('clickSubmitbtn',this.mobile, this.code, this.ticket) + + if(!mobile || !phoneReg.test(mobile))return util.showNone('请输入正确手机号码！'); + if(!code)return util.showNone('请输入手机验证码！'); + if(!agree)return util.showNone('请阅读并同意服务协议和隐私政策！') - if(this.agree == false){ - return util.showNone('请同意用户协议和隐私协议！') - } let loginRes ="" // #ifndef H5 @@ -139,19 +161,39 @@ }) .then(res=>{ console.log('webLogin',res) + //按照后端湘宏要求, 登录后存储token_web. 此后在官网流程请求接口时, 带上token_web + let token = res.token + uni.setStorageSync('token_web',token); + return util.routeTo(`/subpackage/party/pages/login/regist`,'rL'); }).catch(err=>{ console.warn('webLogin err',err) util.showNone('登录失败！') }) + },500,false), + toIndex(){//返回首页 + util.routeTo(`/pages/login/login`,'rL'); }, - captchaLogin: function () { - this.selectComponent('#captcha').show() - // 进行业务逻辑，若出现错误需重置验证码，执行以下方法 - // if (error) { - // this.selectComponent('#captcha').refresh() - // } + + toWeb(index){ + let url = '' + if(index == 1){ + url = 'https://help.ouxuanzhineng.cn/web/#/7/23' + }else if(index == 2){ + url = 'https://help.ouxuanzhineng.cn/web/#/7/24' + } + util.routeTo(`/subpackage/party/pages/index/web_view?url=${url}`,'nT'); + }, + testis(){ + const appid = uni.getAccountInfoSync().miniProgram.appId; + console.log('appid',appid) + util.routeTo(`/subpackage/party/pages/login/regist`,'rL'); }, + groupChange(e){ + console.log('groupChange',e) + this.agree = e.detail.value.indexOf('agree') > -1 + }, + // 验证码验证结果回调 handlerVerify: function (ev) { // 如果使用了 mpvue，ev.detail 需要换成 ev.mp.detail @@ -185,7 +227,7 @@ console.log(ev.detail.errMsg) }, captchaSmsSend: function (ticket,rand_str) { - console.log('captchaSms123: ',ticket,rand_str,this.mobile) + console.log('captchaSmsSend: ',ticket,rand_str,this.mobile) let {mobile} = this return servers.get({ url: party_api.captchaSms, @@ -199,13 +241,9 @@ .then(res=>{ console.log('captchaSms',res) this.ticket = res - if(!res.had_binding){ - console.warn('webBrandUser 验证绑定账号失败！'); - // return util.routeTo(`/pages/login/login`,'rL'); - } }).catch(err=>{ - console.warn('webBrandUserCheck err',err) + console.warn('err:',err) // util.routeTo(`/pages/login/login`,'rL'); }) @@ -253,7 +291,7 @@ .input-hold-class{ font-size: 28rpx; color: $b-color-gray; - padding-left: 30rpx; + padding-left: 0rpx; } > input{ width: 668rpx; diff --git a/src/subpackage/party/pages/login/regist.vue b/src/subpackage/party/pages/login/regist.vue index 7895047..2fa7a4e 100644 --- a/src/subpackage/party/pages/login/regist.vue +++ b/src/subpackage/party/pages/login/regist.vue @@ -67,8 +67,8 @@ 证件有效期* - 长期 - 短期 + 长期 + 短期 @@ -149,7 +149,7 @@ 手机号* - @@ -379,12 +379,16 @@ webBrandUserGet(){ // util.showNone("检测是否有数据回显") - console.log("webBrandUserGet") + let _data = { + brand_id: this.brandInfo.brand.id + } + if(uni.getStorageSync('token_web')){//后台湘宏要求:token_web必须传 + _data.token_web = uni.getStorageSync('token_web') + } + console.log("webBrandUserGet-1",uni.getStorageSync('token_web')) servers.post({ url: party_api.webBrandUserGet, - data: { - brand_id: this.brandInfo.brand.id - }, + data: _data, isDefaultGet: false, }) .then(res=>{ @@ -428,7 +432,10 @@ console.log("getLocalImg:", img) let img_url = await this.getUploadImgURL(img); console.log("getUploadImgURL:", img_url) - let ocr_res = await this.getOcrFromImg(ocr_type,img_url); + let ocr_res = await this.getOcrFromImg(ocr_type,img_url).catch(err=>{ + console.log("getOcrFromImg-err", err) + util.showNone("识别失败，请重新上传") + }) this.setOcrResult(ocr_type,ocr_res) this.submitData.business_license = img_url }, @@ -440,7 +447,10 @@ console.log("getLocalImg:", img) let img_url = await this.getUploadImgURL(img); console.log("getUploadImgURL:", img_url) - let ocr_res = await this.getOcrFromImg(ocr_type,img_url); + let ocr_res = await this.getOcrFromImg(ocr_type,img_url).catch(err=>{ + console.log("getOcrFromImg-err", err) + util.showNone("识别失败，请重新上传") + }) this.setOcrResult(ocr_type,ocr_res) this.submitData.extension.business_id_card_url = img_url }, @@ -466,7 +476,9 @@ console.log("getOcrFromImg-res", res) if(res.statusCode == 200){ console.log("getOcrFromImg-ocr", res.data.data) - return res.data.data + if(res.data.data)return res.data.data + return util.showNone("识别失败，请重新上传") + } }) .catch(err=>{ @@ -598,6 +610,7 @@ }, bindPickerChange_qualification(e) { console.log('bindPickerChange_qualification:', e.detail.value) + if(e.detail.value>1)return util.showNone("仅支持:企业或个体工商户") this.qualification_type_index = e.detail.value this.qualification_type_show = this.qualification_types_arr[e.detail.value] }, @@ -648,6 +661,9 @@ let _data = JSON.parse(JSON.stringify(this.submitData)) if(_token)_data['token'] = _token; _data['status']= 2;//前端修改审核状态: 1提交资料,2实名认证,3审核成功,4审核失败 5完成 6修改审核中? + if(uni.getStorageSync('token_web')){//后台湘宏要求: token_web必须传 + _data.token_web = uni.getStorageSync('token_web') + } servers.post({ url: party_api.webBrandUserSave, data: _data, @@ -689,7 +705,6 @@ return true }, SubmitEvent() { - util.routeTo("/subpackage/party/pages/login/reviewing", "nT") }, formSubmit(e) { console.log('form发生了submit事件，携带数据为：', e.detail.value) @@ -697,9 +712,16 @@ //回显提交数据webBrandUserGet resetSubmitData(){ const _token = uni.getStorageSync('token') || ''; + let token_web = uni.getStorageSync('token_web') + let _data = JSON.parse(JSON.stringify(this.submitData)) if(_token)_data['token'] = _token; + if(uni.getStorageSync('token_web')){//后台湘宏要求: token_web必须传 + _data.token_web = uni.getStorageSync('token_web') + } + + console.log(123,token_web,uni.getStorageSync('token_web')) servers.post({ url: party_api.webBrandUserGet, data: _data, diff --git a/src/subpackage/party/pages/login/reviewing.vue b/src/subpackage/party/pages/login/reviewing.vue index 6498494..fb2de33 100644 --- a/src/subpackage/party/pages/login/reviewing.vue +++ b/src/subpackage/party/pages/login/reviewing.vue @@ -62,32 +62,21 @@ methods: { webBrandUserCheck(){ console.warn('webBrandUserCheck') + let _data = {} + if(uni.getStorageSync('token_web')){//后台湘宏要求: 有用户token就传用户token，没有就传验证码登录返回的那个token + _data.token_web = uni.getStorageSync('token_web') + } return servers.get({ url: API['party'].webBrandUser, - data: {}, + data: _data, failMsg: '加载数据失败！' }) .then(res=>{ console.log('webBrandUserCheck',res) this.info = res - if(!res.had_binding){ - console.warn('webBrandUser 验证绑定账号失败！'); - // return util.routeTo(`/pages/login/login`,'rL'); - }else{ - //status: 1创建品牌 2实名认证 3审核成功 4审核失败 5完成 6修改审核中???待定 - console.warn(res,'webBrandUserCheck success'); - this.status = res.status - // if(res.status==0){ - // return util.routeTo(`/subpackage/party/pages/login/regist`,'rL'); - // }else if(res.status==1){ - // return util.routeTo(`/subpackage/party/pages/login/reviewing`,'rL'); - // }else if(res.status==2){ - // return util.routeTo(`/subpackage/party/pages/login/reviewing`,'rL'); - // } - - // return res; - } + this.status = res.status + }).catch(err=>{ console.warn('webBrandUserCheck err',err) diff --git a/src/subpackage/party/pages/miniapp/auth.vue b/src/subpackage/party/pages/miniapp/auth.vue index 56641cb..21e26ad 100644 --- a/src/subpackage/party/pages/miniapp/auth.vue +++ b/src/subpackage/party/pages/miniapp/auth.vue @@ -225,25 +225,31 @@ export default { await this.thirdPartyAuthor(party_token).then(res=>{ console.log('thirdPartyAuthor授权成功',res) - this.authSuccess(party_token) - this.auth_step = 2 + // this.authSuccess(party_token) //20240403 老板说去掉绑定bindBrand, 直接跳认证 + this.SubmitEvent() }).catch(err=>{ console.error('授权失败',err) }) }, async authSuccess(party_token){ util.showNone("授权成功") + util.showLoad() await this.bindBrand(party_token).then(res=>{ + util.hideLoad() console.log(' authSuccess bindBrand',res) - + util.showNone("绑定结果:"+res.msg||"绑定成功") + this.SubmitEvent() + }).catch(err=>{ + console.error('authSuccess bindBrand err',err) + util.showNone("绑定失败") + util.hideLoad() }) }, - idTimeChange(e){ console.log(e.detail) }, SubmitEvent(){ - util.routeTo("/subpackage/party/pages/login/reviewing","nT") + util.routeTo("/subpackage/party/pages/miniapp/regular","nT") }, bindBrand(unique_id){ return servers.post({ @@ -282,10 +288,10 @@ export default { }, getFastcreateToken(openid){//获取小程序创建token //TODO 测试,节省数据,试用测试数据填充 - return { - token: "d56e4149-8cd1-11ee-b5fb-5254005df464", - unique_id: "r2dCHjL3HqO3_i6_A7m0NT-qZg3UI290JTn0D5oOw8C3UDwuZJJ6kmKG41BOrqMb" - } + // return { + // token: "d56e4149-8cd1-11ee-b5fb-5254005df464", + // unique_id: "r2dCHjL3HqO3_i6_A7m0NT-qZg3UI290JTn0D5oOw8C3UDwuZJJ6kmKG41BOrqMb" + // } return servers.get({ url: party_api.fastregisterbetaweapp, data: { diff --git a/src/subpackage/party/pages/miniapp/certify.vue b/src/subpackage/party/pages/miniapp/certify.vue index ad5628c..62c8980 100644 --- a/src/subpackage/party/pages/miniapp/certify.vue +++ b/src/subpackage/party/pages/miniapp/certify.vue @@ -14,8 +14,8 @@ 命名类型 - 自选词汇 - 商标命名 + 自选词汇 + 商标命名 @@ -23,8 +23,8 @@ 认证类型 - 企业 - 个体户 + 企业 + 个体户 @@ -83,10 +83,11 @@ 发票信息 + - 不开发票 - 电子普票 - 增值税发票 + 不开发票 + 电子普票 + 增值税发票 @@ -218,7 +219,7 @@ export default { } }, form: {//auth_data - "account_name": "广州欧轩test", + "account_name": "", "account_name_type": 1, "qualification": "",// string 否 非个人类型必填。主体资质材料 media_id 支持jpg,jpeg .bmp.gif .png格式，仅支持一张图片 "account_supplemental": [], // array 否 名称命中关键词-补充材料 media_id 支持jpg,jpeg .bmp.gif .png格式，支持上传多张图片 @@ -256,7 +257,7 @@ export default { "pay_type": 2, "service_appid": "", - "third_party_phone": "02022102214" + "third_party_phone": "" } } @@ -312,9 +313,18 @@ export default { toCertifyRes(){ util.routeTo(`/subpackage/party/pages/miniapp/certify_res?appid=${this.appid}`,"nT") }, - wxauth(){ - let _data = this.getGateWayJson('wxauth') + wxauth(){//提交认证 + // let _data = this.getGateWayJson('wxauth') + let _data = {//提交认证信息 + "appid": this.appid, + "module": "/wxa/sec/wxaauth", + "method": "POST", + "form": {} + } + // console.log(33333,_data) + // delete _data['localImg'] _data.form['auth_data'] = this.form + console.log("wxautht提交:",_data) servers.post({ url: party_api.gatewayDo, data: _data, @@ -409,6 +419,7 @@ export default { console.error("先去api.js定义透传数据:",jname) return util.showNone("接口不存在") } + console.log(555566666,_data) _data.appid = appid; return _data }, diff --git a/src/subpackage/party/pages/miniapp/certify_res.vue b/src/subpackage/party/pages/miniapp/certify_res.vue index ad08427..575e188 100644 --- a/src/subpackage/party/pages/miniapp/certify_res.vue +++ b/src/subpackage/party/pages/miniapp/certify_res.vue @@ -5,23 +5,23 @@ 查询结果 - 任务状态: + 任务状态： {{getTaskTxt(result.task_status)}} - 审核单状态: + 审核单状态： {{ getApplyTxt(result.apply_status) }} - 认证订单号: + 认证订单号： {{result.orderid}} - 打回重填原因: + 打回重填原因： {{result.refill_reason}} - 认证失败原因: + 认证失败原因： {{result.fail_reason}} @@ -29,7 +29,7 @@ - + @@ -41,7 +41,7 @@ - 查询请用与创建信息致的微信扫验证,完成授权确认 + 查询请用与创建信息一致的微信扫验证,完成授权确认 @@ -67,15 +67,15 @@ export default { qrcodeText:"", qrcodeSrc:"", qrcodeSize: 200, - appid: "wxc141a743225e7885", + appid: "", result: { - "appid": "wxeb7efb9a1cbdd554", - "apply_status": 1, - "auth_url": "https://mp.weixin.qq.com/publicpoc/fastregisterwxaauth?action=scan&tid=4959e9ad8ec74ec4a4136be6b340e340#wechat_redirect", + "appid": "", + "apply_status": "", + "auth_url": "", "errcode": 0, - "errmsg": "ok: ok", - "orderid": 16988765364484129000, - "task_status": 1 + "errmsg": "", + "orderid": "", + "task_status": "" }, } }, @@ -106,7 +106,7 @@ export default { 14: '验证失败', 15: '等待支付' } - return map_task_status[status]||"未知状态" + return map_task_status[status]||"未认证" } }, getApplyTxt(){ @@ -119,7 +119,7 @@ export default { 4: '认证通过', 5: '认证最终失败（不能再修改）' } - return map_apply_status[status]||"未知状态" + return map_apply_status[status]||"未认证" } }, }, @@ -171,7 +171,6 @@ export default { console.log(e.detail) }, SubmitEvent(){ - util.routeTo("/subpackage/party/pages/login/reviewing","nT") }, makeQR() { uni.showLoading({ diff --git a/src/subpackage/party/pages/miniapp/record.vue b/src/subpackage/party/pages/miniapp/record.vue index dab11f9..3c523ee 100644 --- a/src/subpackage/party/pages/miniapp/record.vue +++ b/src/subpackage/party/pages/miniapp/record.vue @@ -735,9 +735,9 @@ export default { }, onLoad(opts) { console.log("onload-", opts) - if(!opts.appid){ - opts.appid = "wxc141a743225e7885" - } + // if(!opts.appid){ + // opts.appid = "wxc141a743225e7885" + // } this.appid = opts.appid; this.getData(); // this.getTempDraft(); @@ -932,6 +932,7 @@ export default { let _res = res.data.data if(res.data.code==0){ util.showNone("提交成功") + util.routeTo(`/subpackage/party/pages/miniapp/record_res?appid=${this.appid}`,"nT") return }else{ util.showNone(res.data.message) @@ -942,7 +943,6 @@ export default { }) // this.applyIcpFiling() - // util.routeTo("/subpackage/party/pages/login/reviewing", "nT") }, editTempDraft(){ // return util.showNone("暂未开放") diff --git a/src/subpackage/party/pages/miniapp/record_pre.vue b/src/subpackage/party/pages/miniapp/record_pre.vue index 2ed7f19..a485ecc 100644 --- a/src/subpackage/party/pages/miniapp/record_pre.vue +++ b/src/subpackage/party/pages/miniapp/record_pre.vue @@ -15,7 +15,7 @@ - + diff --git a/src/subpackage/party/pages/miniapp/record_res.vue b/src/subpackage/party/pages/miniapp/record_res.vue index 101b2f4..dd037be 100644 --- a/src/subpackage/party/pages/miniapp/record_res.vue +++ b/src/subpackage/party/pages/miniapp/record_res.vue @@ -17,7 +17,7 @@ - + ⚠️验证超时则需要重新走备案流程 @@ -39,6 +39,7 @@ export default { }, data() { return { + appid: "", options:[{ title:"平台初审", desc:"平台审核中" @@ -56,9 +57,10 @@ export default { desc:"备案成功" }], appData:{ - info:{ - status:4 - }, + audit_data: [], + available: 1, + is_canceling: false, + status: 0, }, statusMap: { 2: '平台审核中', @@ -78,12 +80,12 @@ export default { } }, onLoad(opts) { - console.log("onload-", this.brandInfo.brand.id) - if(!opts.appid){ - opts.appid = "wxc141a743225e7885" - } + // console.log("onload-", this.brandInfo.brand.id) + // if(!opts.appid){ + // opts.appid = "wxc141a743225e7885" + // } this.appid = opts.appid; - // this.getData(); + this.getData(); }, onShow() { @@ -91,80 +93,6 @@ export default { computed: { ...mapState(['brandInfo',]), step_options(){ - let arr = [] - let status = this.appData.info.status - if(this.appData.info.status==2){ - arr.push({ - title:"平台初审", - desc:"平台审核中" - }) - }else if(this.appData.info.status==3){ - arr.push({ - title:"平台初审", - desc:"平台审核中" - }) - arr.push({ - title:"平台审核结果", - desc:"平台审核驳回" - }) - }else if(this.appData.info.status==4){ - arr.push({ - title:"平台初审", - desc:"平台审核中" - }) - arr.push({ - title:"平台审核结果", - desc:"平台审核通过" - }) - arr.push({ - title:"管局审核", - desc:"管局审核中" - }) - }else if(this.appData.info.status==5){ - arr.push({ - title:"平台初审", - desc:"平台审核中" - }) - arr.push({ - title:"平台审核结果", - desc:"平台审核通过" - }) - arr.push({ - title:"管局审核", - desc:"管局审核中" - }) - arr.push({ - title:"管局审核结果", - desc:"管局审核通过" - }) - }else if(this.appData.info.status==6){ - arr.push({ - title:"平台初审", - desc:"平台审核中" - }) - arr.push({ - title:"平台审核结果", - desc:"平台审核通过" - }) - arr.push({ - title:"管局审核", - desc:"管局审核中" - }) - arr.push({ - title:"管局审核结果", - desc:"管局审核通过" - }) - arr.push({ - title:"已备案", - desc:"备案成功" - }) - }else{ - arr.push({ - title:"未审核", - desc:this.statusMap[status] - }) - } - return arr } }, watch: { @@ -174,7 +102,7 @@ export default { }, methods: { async getData() { - util.showLoad("加载中") + // util.showLoad("加载中") try { const res = await this.gatewayDo({ appid: this.appid, @@ -189,8 +117,8 @@ export default { // form: {} // }); - // console.log(res1); - if (res.data.errcode === 0) { + console.log(123,res); + if (res.code == 0) { console.log(res.data); this.appData = res.data.info; } else { @@ -228,7 +156,6 @@ export default { console.log(e.detail) }, SubmitEvent(){ - util.routeTo("/subpackage/party/pages/login/reviewing","nT") } } } diff --git a/src/subpackage/party/pages/miniapp/regist.vue b/src/subpackage/party/pages/miniapp/regist.vue index 6aa2199..2b9c2a5 100644 --- a/src/subpackage/party/pages/miniapp/regist.vue +++ b/src/subpackage/party/pages/miniapp/regist.vue @@ -10,8 +10,14 @@ {{['实名验证成功', '实名验证中', '实名验证失败'][appInfo.realname_status]}} - - 去认证 + + + + 查询认证 + 去认证 @@ -21,7 +27,7 @@ 备案状态* - {{statusMap_icp[icpInfo.status]||icpInfo.status}} + {{statusMap_icp[icpInfo.status]||"未备案"}} @@ -46,7 +52,7 @@ 点击上传 - 重新上传 + @@ -91,7 +97,7 @@ - + 类目名称: {{e.first_name}}/{{e.second_name}} 类目状态: {{audit_list_txt(e.audit_status)}} @@ -109,13 +115,13 @@ + :src="submitData.extension.business_id_card_url?submitData.extension.business_id_card_url:'../../static/regist/id_people.png'"> 上传身份证头像面 + :src="submitData.extension.business_id_card_back_url?submitData.extension.business_id_card_back_url:'../../static/regist/id_guohui.png'"> 上传身份证国徽面 @@ -195,13 +201,13 @@ --> @@ -239,30 +245,30 @@ export default { animation:true, appInfo:{ "account_type": 3, - "appid": "wxeb7efb9a1cbdd554", - "credential": "91440101MA9XP4D2XW", + "appid": "", + "credential": "", "customer_type": 0, "errcode": 0, "errmsg": "ok", "head_image_info": { - "head_image_url": "http://wx.qlogo.cn/mmhead/mOW261WJzibug0Qe1lZiaHGicjibdNzI2Qz0pjBeoqlIzZxwlJwGsj78c8MuhiaWtxBlTfe42qvTVXI4/0", + "head_image_url": "", "modify_quota": 5, "modify_used_count": 1 }, - "nickname": "欧轩企业管理2", + "nickname": "", "nickname_info": { - "modify_quota": 2, - "modify_used_count": 1, - "nickname": "欧轩企业管理2" + "modify_quota": 0, + "modify_used_count": 0, + "nickname": "" }, - "principal_name": "广州欧轩企业管理有限公司", + "principal_name": "", "principal_type": 1, "realname_status": 1, "registered_country": 1017, "signature_info": { "modify_quota": 5, "modify_used_count": 1, - "signature": "提供企业管理服务简介" + "signature": "" }, "wx_verify_info": { "naming_verify": false, @@ -276,11 +282,11 @@ export default { "credit_end_date": "0", //格式：2006-01-02，永久用 0 表示 "company_type": 1,//企业类型 "legal_person_name": "",//法人姓名 - "registered_province_code": 440000,//省份编号 110000 - "registered_city_code": 440100,//城市编号 110100 - "registered_capital": 1010000,//注册资本，单位元 100000 - "business_id_card_url": "https://imgcdn.ouxuanzhineng.cn/upload/business_id_card_url/79a41229df038e0e10583d2db0d4f49f.png", - "business_id_card": "123456789",//运营人员身份证号-- + "registered_province_code": "",//省份编号 110000 + "registered_city_code": "",//城市编号 110100 + "registered_capital": "",//注册资本，单位元 100000 + "business_id_card_url": "", + "business_id_card": "",//运营人员身份证号-- "business_id_card_back_url":"",//运营人员身份证国徽面 }, }, @@ -291,13 +297,13 @@ export default { 5: '管局审核驳回', 6: '已备案', 1024: '未备案', - 1025: '未备案 && 小程序信息未填', - 1026: '未备案 && 小程序类目未填', - 1027: '未备案 && 小程序信息未填 && 小程序类目未填', - 1028: '未备案 && 小程序未认证', - 1029: '未备案 && 小程序信息未填 && 小程序未认证', - 1030: '未备案 && 小程序类目未填 && 小程序未认证', - 1031: '未备案 && 小程序信息未填 && 小程序类目未填 && 小程序未认证' + // 1025: '未备案 && 小程序信息未填', + // 1026: '未备案 && 小程序类目未填', + // 1027: '未备案 && 小程序信息未填 && 小程序类目未填', + // 1028: '未备案 && 小程序未认证', + // 1029: '未备案 && 小程序信息未填 && 小程序未认证', + // 1030: '未备案 && 小程序类目未填 && 小程序未认证', + // 1031: '未备案 && 小程序信息未填 && 小程序类目未填 && 小程序未认证' }, icpInfo:{}, nameInfo:{ @@ -325,15 +331,13 @@ export default { }, async onLoad(opts) { console.log("onload-", opts) - let _brandInfo = await this.$store.dispatch('getBrandInfo'); console.log("_brandInfo:",_brandInfo) this.brandInfo = _brandInfo - this.appid = opts.appid; - // util.showNone("onLoad") - this.getCurrentAppInfo() - this.getWebBrandUser() + + this.getCurrentAppInfo() //更新小程序账户基本信息 + this.getWebBrandUser() //更新用户信息-官网 this.get_icp_entrance_info()//更新备案状态 this.getcategory() this.getAllCategoriesByType() @@ -344,7 +348,7 @@ export default { computed: { // ...mapState(['brandInfo',]) icp_btn_style(){ - return this.icpInfo.status == 6 ? "certify-yes" : "certify-yes" + return this.icpInfo.status == 6 ? "certify-yes" : "certify-no" }, category_style(){ return function(status){ @@ -623,14 +627,16 @@ export default { try { let res = await this.gatewayDo(data); // const { info } = res.data; - consoe.log("setJianJie:",res) + console.log("setJianJie888:",res) if (res.data.errcode === 0) { console.log(res); util.showNone("修改成功") + this.getCurrentAppInfo() } else { util.showNone(res.data.errmsg) } } catch (error) { + console.log("setJianJie-err", error) } }, async setHeadImage(mediaid) { @@ -652,6 +658,7 @@ export default { if (res.data.errcode === 0) { console.log(res); util.showNone("修改成功") + this.getCurrentAppInfo() } else { util.showNone(res.data.errmsg) } @@ -682,6 +689,9 @@ export default { toCertify(){ util.routeTo(`/subpackage/party/pages/miniapp/certify?appid=${this.appid}`,"nT") }, + toCertifyRes(){ + util.routeTo(`/subpackage/party/pages/miniapp/certify_res?appid=${this.appid}`,"nT") + }, nameChange(e){ console.log("nameChange",e) }, @@ -759,23 +769,19 @@ export default { // #ifdef H5 url+= "?token=" + "2187a643-4d4a-11ee-a364-5254005df464" // #endif + if(this.appid) postJson.appid = this.appid return servers.post({ url: url, data: postJson, isDefaultGet: false, }) .then(res => { - console.log("gatewayDo:", res.data) + console.log("gatewayDo 0 :", res.data) if(res.data.code!=0){ return util.showNone(res.data.message) }else{ return res.data } - // if (res.statusCode == 200) { - // return res.data - // } else { - // console.warn("gatewayDo-err", res.data) - // } }) .catch(err => { console.log("gatewayDo-err", err) @@ -854,7 +860,6 @@ export default { console.log(e.detail) }, SubmitEvent(){ - util.routeTo("/subpackage/party/pages/login/reviewing","nT") } } } @@ -1111,7 +1116,9 @@ page { color: #333333; // width: 168rpx; // position: absolute; - + >text:first-child { + // width: 188rpx; + } >text:last-child { color: $b-color-red; } diff --git a/src/subpackage/party/pages/miniapp/regular.vue b/src/subpackage/party/pages/miniapp/regular.vue index 19a366d..d4e6426 100644 --- a/src/subpackage/party/pages/miniapp/regular.vue +++ b/src/subpackage/party/pages/miniapp/regular.vue @@ -16,8 +16,19 @@ 证件类型* - --> + + + + + + + 证件号* @@ -26,7 +37,7 @@ 法人姓名* - - + @@ -123,19 +134,25 @@ export default { showRegular:true, brandInfo:"", verify_info: { - "code": "23123123123",//证件号 + "code": "",//证件号 "code_type": 1,//证件类型 - "component_phone": "020-22102214",//公司电话 - "enterprise_name": "test-试用转正名称",//名称 - "legal_persona_idcard": "413876199929937272",//法人身份证 - "legal_persona_name": "test_fa_ren_name",//法人姓名 - "legal_persona_wechat": "wx_999",//法人微信 + "component_phone": "",//公司电话 + "enterprise_name": "",//名称 + "legal_persona_idcard": "",//法人身份证 + "legal_persona_name": "",//法人姓名 + "legal_persona_wechat": "",//法人微信 }, + code_type_show: "请选择证件类型", + // 企业代码类型 1：统一社会信用代码（18 位） 2：组织机构代码（9 位 xxxxxxxx-x） 3：营业执照注册号(15 位) + code_type_arr: ["统一社会信用代码18 位）", "组织机构代码（9 位）", "营业执照注册号"], + code_type_index: 0, + + } }, async onLoad() { - util.showNone("onLoad") + // util.showNone("onLoad") let _brandInfo = await this.$store.dispatch('getBrandInfo'); console.log("_brandInfo:",_brandInfo) this.brandInfo = _brandInfo @@ -143,7 +160,7 @@ export default { this.getVerifyMiniAppInfo() }, onShow() { - + }, computed: { // ...mapState(['brandInfo',]) @@ -154,6 +171,86 @@ export default { }, }, methods: { + showModuleMsg(msg){ + return new Promise((resolve, reject) => { + uni.showModal({ + title: '提示', + content: msg, + showCancel: false, + confirmText: '知道了', + confirmColor: '#009874', + success: function (res) { + if (res.confirm) { + console.log('用户点击确定'); + resolve() + } + } + }); + }) + }, + //TODO 回显用户注册品牌数据到页面 + webUserGet(){ + let token_web = uni.getStorageSync('token_web'); + let token = uni.getStorageSync('token'); + let _data = { + token_web: token_web||"", + token:token||"" + } + return servers.post({ + url: party_api.webUserGet, + data: _data, + failMsg: '获取信息失败！' + }) + .then(res=>{ + console.log('webUserGet:',res) + this.setWebUserInfoToData(res) + return res + + }).catch(err=>{ + console.warn('bindUserOpenid err',err) + util.showNone(err.message || '获取信息失败！'); + }) + }, + setCompanyCode(code){ + if(code.length == 18){ + this.code_type_index = 0 + this.code_type_show = this.code_type_arr[0] + this.verify_info.code_type = 1 + }else if(code.length == 9){ + this.code_type_index = 1 + this.code_type_show = this.code_type_arr[1] + this.verify_info.code_type = 2 + }else if(code.length == 15){ + this.code_type_index = 2 + this.code_type_show = this.code_type_arr[2] + this.verify_info.code_type = 3 + } + }, + setWebUserInfoToData(info){ + let {verify_info} = this + verify_info.code_type = info.code_type||"" + verify_info.component_phone = info.mobile||"" + verify_info.enterprise_name = info.company_name||"" + verify_info.legal_persona_idcard = info.extension.business_id_card||"" + verify_info.code = info.agency_code||"" //证件号 + verify_info.legal_persona_name = info.extension.legal_person_name||"" + + this.setCompanyCode(info.agency_code) + + }, + bindPickerChange_code_types(e) { + console.log('bindPickerChange_code_types:', e.detail.value) + this.code_type_index = e.detail.value + this.code_type_show = this.code_type_arr[e.detail.value] + this.verify_info.code_type = Number(e.detail.value) + 1 + + //清理证件号 + this.verify_info.code = "" + }, + toCertify(){ + let appid = this.appid + util.routeTo(`/subpackage/party/pages/miniapp/regist`,"nT") + }, getVerifyMiniAppInfo(){ return servers.get({ url: party_api.getVerifyMiniAppInfo, @@ -164,7 +261,14 @@ export default { }) .then(res=>{ console.log('getVerifyMiniAppInfo',res) - this.verify_info = res.verify_info + if(res.verify_info){ + this.webUserGet() + // this.verify_info = res.verify_info + }else{ + util.showNone('获取已填写信息') + this.webUserGet() + } + return res }).catch(err=>{ console.warn('getVerifyMiniAppInfo err',err) @@ -173,7 +277,28 @@ export default { idTimeChange(e){ console.log(e.detail) }, - verifybetaweapp(){ + async verifybetaweapp(){ + + if(!this.verify_info.enterprise_name){ + return this.showModuleMsg('请输入公司名称') + } + if(!this.verify_info.code){ + return this.showModuleMsg('请输入证件号') + } + if(!this.verify_info.code_type){ + return this.showModuleMsg('请选择证件类型') + } + if(!this.verify_info.legal_persona_name){ + return this.showModuleMsg('请输入法人姓名') + } + if(!this.verify_info.legal_persona_wechat){ + return this.showModuleMsg('请输入法人微信号') + } + if(!this.verify_info.legal_persona_idcard){ + return this.showModuleMsg('请输入法人身份证') + } + await this.showModuleMsg('请确认微信号为法人微信号!否则无法完成转正操作！') + let _data = { brand_id: this.brandInfo.brand.id, ...this.verify_info @@ -189,9 +314,11 @@ export default { return res }).catch(err=>{ console.warn('verifybetaweapp err',err) + // this.SubmitEvent() }) }, - SubmitEvent(){ + async SubmitEvent(){ + await this.showModuleMsg('请等待法人完成转正操作后, 再去进行小程序的认证与备案操作！') // util.routeTo("/subpackage/party/pages/miniapp/regular_res","nT") this.showRegular = false } diff --git a/src/subpackage/party/pages/miniapp/unauth.vue b/src/subpackage/party/pages/miniapp/unauth.vue index 223d798..e0149b1 100644 --- a/src/subpackage/party/pages/miniapp/unauth.vue +++ b/src/subpackage/party/pages/miniapp/unauth.vue @@ -59,7 +59,6 @@ export default { console.log(e.detail) }, SubmitEvent(){ - util.routeTo("/subpackage/party/pages/login/reviewing","nT") } } } diff --git a/src/subpackage/party/pages/miniapp/wx_auth_select.vue b/src/subpackage/party/pages/miniapp/wx_auth_select.vue index cf473cc..c05a474 100644 --- a/src/subpackage/party/pages/miniapp/wx_auth_select.vue +++ b/src/subpackage/party/pages/miniapp/wx_auth_select.vue @@ -43,6 +43,7 @@ import { mapState } from 'vuex' + // const MiniprogramThirdpartyPlugin = requirePlugin('miniprogram-thirdparty-plugin') export default { components: { @@ -61,7 +62,7 @@ }, onReady() { - MiniprogramThirdpartyPlugin.init(wx) + // MiniprogramThirdpartyPlugin.init(wx) }, computed: { ...mapState(['brandInfo', ])