diff --git a/ybf_wx/src/utils/aCommon.js b/ybf_wx/src/utils/aCommon.js index eb0cab6d37cc7c322b42a4f83f1f427d07de357f..f1770619b168362538f722a45d9ed36924653a0a 100644 --- a/ybf_wx/src/utils/aCommon.js +++ b/ybf_wx/src/utils/aCommon.js @@ -7,10 +7,10 @@ const zlog = console.log.bind(console) // Z-BasicInfo let INFO = { - corpId: 'wwd1cdbca7b8b2b6c4', - agentId: '1000015', - // corpId: 'ww4df265003b43fa0d', - // agentId: '1000032', + // corpId: 'wwd1cdbca7b8b2b6c4', + // agentId: '1000015', + corpId: 'ww4df265003b43fa0d', + agentId: '1000032', } async function getXToken() { diff --git a/ybf_wx/src/utils/aRequest.js b/ybf_wx/src/utils/aRequest.js index bc97df332642077d356297a11658c9c9c925892b..39341c815290286bc6994913ac848fb28bc6b653 100644 --- a/ybf_wx/src/utils/aRequest.js +++ b/ybf_wx/src/utils/aRequest.js @@ -8,10 +8,10 @@ import envConfig from '@/config/env-config' // const testEnv = require('../../config/dev.env') // Z-BasicInfo let INFO = { - corpId: 'wwd1cdbca7b8b2b6c4', - agentId: '1000015', - // corpId: 'ww4df265003b43fa0d', - // agentId: '1000032', + // corpId: 'wwd1cdbca7b8b2b6c4', + // agentId: '1000015', + corpId: 'ww4df265003b43fa0d', + agentId: '1000032', // url: 'http://139.155.48.151:8085', url: envConfig.appBaseUrlA, } diff --git a/ybf_wx/src/utils/aWxRequest.js b/ybf_wx/src/utils/aWxRequest.js index 4d6c401ac8e6c0bc1b3d5251de1161e9d247b494..f0857894969385dd6fb82bf5d44636aa75cd3915 100644 --- a/ybf_wx/src/utils/aWxRequest.js +++ b/ybf_wx/src/utils/aWxRequest.js @@ -6,10 +6,10 @@ export function wxRequest(inUrl, data = {}, header = {}, method = 'post') { // Z-BasicInfo let INFO = { - corpId: 'wwd1cdbca7b8b2b6c4', - agentId: '1000015', - // corpId: 'ww4df265003b43fa0d', - // agentId: '1000032', + // corpId: 'wwd1cdbca7b8b2b6c4', + // agentId: '1000015', + corpId: 'ww4df265003b43fa0d', + agentId: '1000032', // url: 'http://139.155.48.151:8085' + inUrl, url: envConfig.appBaseUrlA + inUrl, } diff --git a/ybf_wx/src/views/home.vue b/ybf_wx/src/views/home.vue index bb3d445e121f5cd4600a5e36c98345c4b1bd7857..615bc13056fb21734fc93798b1077111efbe4911 100644 --- a/ybf_wx/src/views/home.vue +++ b/ybf_wx/src/views/home.vue @@ -6,7 +6,10 @@ <div class="main"> <!-- <div class="tops"></div> --> <div class="lists"> - <div v-if="this.$route.query.code !== undefined" style="font-size: 14px;">Code: {{this.$route.query.code}}</div> + <div + v-if="this.$route.query.code !== undefined" + style="font-size: 14px;" + >Code: {{this.$route.query.code}}</div> <div v-for="(item, index) of list.main" :key="index"> <div class="list" @click="listClick(item.redirect)"> <div> @@ -90,13 +93,13 @@ export default { }, mounted() { this.zReadyUserId(); - // this.zTestGetNowUrlInfo(); + this.zTestGetNowUrlInfo(); }, created() { // alert(`--->home: created.`) // this.zReadyUserId() - this.zReadyUserId(); - this.zTestGetNowUrlInfo(); + // this.zReadyUserId(); + // this.zTestGetNowUrlInfo(); }, methods: { zReadyUserId() { @@ -134,7 +137,8 @@ export default { // alert(`--->home: zTestPreAuthCode: IN.`) const basicInfo = { head: "https://open.weixin.qq.com/connect/oauth2/authorize?", - appId: "wwd1cdbca7b8b2b6c4", + // appId: "wwd1cdbca7b8b2b6c4", + appId: "ww4df265003b43fa0d", redirectUrI: encodeURIComponent("qywx2.100smartdata.com"), responseType: "code", scope: "snsapi_base", @@ -167,15 +171,28 @@ export default { code: this.zcache.code }; let headerData = { - agentId: "1000015", - corpId: "wwd1cdbca7b8b2b6c4" - // agentId: "1000032", - // corpId: "ww4df265003b43fa0d" + // agentId: "1000015", + // corpId: "wwd1cdbca7b8b2b6c4" + agentId: "1000032", + corpId: "ww4df265003b43fa0d" }; // url: "http://139.155.48.151:8085/workWx/auth/oauth2/getUserInfo", // headers: header, + + alert( + `--->home.vue: zTestGetUserInfoByOldToken: postData =${JSON.stringify( + postData + )}` + ); + alert( + `--->home.vue: zTestGetUserInfoByOldToken: headerData =${JSON.stringify( + headerData + )}` + ); + this.zcache.userInfoResOld = "PostData:" + JSON.stringify(postData); + axios({ url: "http://139.155.48.151:8085/workWx/auth/oauth2/getUserInfo?code=" + @@ -185,12 +202,24 @@ export default { data: postData }) .then(res => { + alert(`--->home.vue: zTestGetUserInfoByOldToken: axios: res.`); + alert( + `--->home.vue: zTestGetUserInfoByOldToken: axios: res =${JSON.stringify( + res + )}` + ); // this.zcache.userInfoResNew = "RESOK:" + JSON.stringify(res.data); this.zcache.userInfoResNew = "RESOK:" + res.data.data.userId; sessionStorage.setItem("userId", String(res.data.data.userId)); this.zcache.userId = String(res.data.data.userId); }) - .catch(res => { + .catch(err => { + alert(`--->home.vue: zTestGetUserInfoByOldToken: axios: err.`); + alert( + `--->home.vue: zTestGetUserInfoByOldToken: axios: res =${JSON.stringify( + err + )}` + ); this.zcache.userInfoResNew = "RESERR."; }); }, diff --git a/ybf_wx/src/views/sideNav/discount/index.vue b/ybf_wx/src/views/sideNav/discount/index.vue index 061f0d1b60bf5541260504a2e66c8f660f995548..1f265177a8cfddc5def29e73e8613a7c6f2c07f2 100644 --- a/ybf_wx/src/views/sideNav/discount/index.vue +++ b/ybf_wx/src/views/sideNav/discount/index.vue @@ -156,7 +156,8 @@ export default { zTestPreAuthCode() { const basicInfo = { head: "https://open.weixin.qq.com/connect/oauth2/authorize?", - appId: "wwd1cdbca7b8b2b6c4", + // appId: "wwd1cdbca7b8b2b6c4", + appId: "ww4df265003b43fa0d", redirectUrI: encodeURIComponent("qywx2.100smartdata.com"), responseType: "code", scope: "snsapi_base",