Skip to content

2
20250711_TBGuardingLife
Commit dc5654d7 authored by 俞嘉婷's avatar 俞嘉婷
Browse files
Options

feat: 中间页改回非三合一

parent a7ad6b39
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 20 deletions
dist/index.html
View file @ dc5654d7
...@@ -19,6 +19,8 @@ CFG.empname = getUrlParam('empname') || sessionStorage.getItem("empname"); ...@@ -19,6 +19,8 @@ CFG.empname = getUrlParam('empname') || sessionStorage.getItem("empname");
CFG.empno && sessionStorage.setItem("empno", CFG.empno); CFG.empno && sessionStorage.setItem("empno", CFG.empno);
CFG.empname && sessionStorage.setItem("empname", CFG.empname); CFG.empname && sessionStorage.setItem("empname", CFG.empname);
CFG.channel && sessionStorage.setItem("channel", CFG.channel); CFG.channel && sessionStorage.setItem("channel", CFG.channel);
CFG.channel && localStorage.setItem("channel-tb", CFG.channel); //积分商城约定存储渠道信息
if (location.href.indexOf("customShare") > 0) { if (location.href.indexOf("customShare") > 0) {
CFG.appID = "93842"; CFG.appID = "93842";
if (location.href.indexOf("Did1NjE4Nzk") > 0) { if (location.href.indexOf("Did1NjE4Nzk") > 0) {
...@@ -30,10 +32,14 @@ if (location.href.indexOf("customShare") > 0) { ...@@ -30,10 +32,14 @@ if (location.href.indexOf("customShare") > 0) {
} else { } else {
CFG.projectId = "pea14681b"; // 线上正式 TODO CFG.projectId = "pea14681b"; // 线上正式 TODO
CFG.env = "prod"; CFG.env = "prod";
CFG.environment = "prod"; //test || '' CFG.environment = ""; // 测试传 test || 正式传''
CFG.originUrl = "https://wx.cpic.com.cn"; // 正式域名 https://wx.cpic.com.cn 线上测试域名 https://wxtest.cpic.com.cn CFG.originUrl = "https://wx.cpic.com.cn"; // 正式域名 https://wx.cpic.com.cn 线上测试域名 https://wxtest.cpic.com.cn
} }
} }
CFG.middleTestPage = window.location.origin + "/customShare/share?id=Did1NjE4Nzk"; //线上测试中间页
CFG.middleProdPage = window.location.origin + "/customShare/share?id=Did1NjE4ODc"; //线上正式中间页
CFG.middleUrl = CFG.projectId == 'peb9f4481' ? CFG.middleTestPage : CFG.middleProdPage;
// 动态域名 // 动态域名
CFG.domain = window.location.origin; CFG.domain = window.location.origin;
// 首页 app.jsx中会拼动态域名 // 首页 app.jsx中会拼动态域名
...@@ -70,6 +76,6 @@ if (CFG.env == 'test') { ...@@ -70,6 +76,6 @@ if (CFG.env == 'test') {
} }
if (!getUrlParam("appID")) { if (!getUrlParam("appID")) {
// alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。") // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
}</script><link href="//yun.duiba.com.cn/spark/v2/temp_base/1754967184422/styles/vendors.215cbda27e48d35e899b.css" rel="stylesheet"><link href="//yun.duiba.com.cn/spark/v2/temp_base/1754967184422/styles/main.215cbda27e48d35e899b.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>"use strict"; }</script><link href="//yun.duiba.com.cn/spark/v2/temp_base/1755151808798/styles/vendors.d0123c005da97fcfa12d.css" rel="stylesheet"><link href="//yun.duiba.com.cn/spark/v2/temp_base/1755151808798/styles/main.d0123c005da97fcfa12d.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>"use strict";
CFG.___G___ = 'yujiating%3Bmaster%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2F20250711_tbguardinglife.git%20(fetch)%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2F20250711_tbguardinglife.git%20(push)%3B';</script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1754967184422/js/runtime-main.0fbe32ee.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1754967184422/js/vendors.7a2250d0.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1754967184422/js/main.43a295e5.js" crossorigin="anonymous"></script></body></html> CFG.___G___ = 'yujiating%3Bmaster%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2F20250711_tbguardinglife.git%20(fetch)%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2F20250711_tbguardinglife.git%20(push)%3B';</script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1755151808798/js/runtime-main.fc8f5cdf.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1755151808798/js/vendors.7a2250d0.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1755151808798/js/main.964dbb26.js" crossorigin="anonymous"></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/js/main.43a295e5.js deleted 100644 → 0
View file @ a7ad6b39
This diff is collapsed.
dist/js/main.43a295e5.js.map deleted 100644 → 0
View file @ a7ad6b39
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/main.964dbb26.js 0 → 100644
View file @ dc5654d7
This diff is collapsed.
dist/js/main.964dbb26.js.map 0 → 100644
View file @ dc5654d7
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/runtime-main.0fbe32ee.js → dist/js/runtime-main.fc8f5cdf.js
View file @ dc5654d7
!function(e){function r(r){for(var n,a,l=r[0],i=r[1],p=r[2],c=0,s=[];c<l.length;c++)a=l[c],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var i=t[l];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=a(a.s=t[0]))}return e}var n={},o={1:0},u=[];function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.m=e,a.c=n,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,r){if(1&r&&(e=a(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)a.d(t,n,function(r){return e[r]}.bind(null,n));return t},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="//yun.duiba.com.cn/spark/v2/temp_base/1754967184422/";var l=window.webpackJsonp=window.webpackJsonp||[],i=l.push.bind(l);l.push=r,l=l.slice();for(var p=0;p<l.length;p++)r(l[p]);var f=i;t()}([]); !function(e){function r(r){for(var n,a,l=r[0],i=r[1],p=r[2],c=0,s=[];c<l.length;c++)a=l[c],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var i=t[l];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=a(a.s=t[0]))}return e}var n={},o={1:0},u=[];function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.m=e,a.c=n,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,r){if(1&r&&(e=a(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)a.d(t,n,function(r){return e[r]}.bind(null,n));return t},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="//yun.duiba.com.cn/spark/v2/temp_base/1755151808798/";var l=window.webpackJsonp=window.webpackJsonp||[],i=l.push.bind(l);l.push=r,l=l.slice();for(var p=0;p<l.length;p++)r(l[p]);var f=i;t()}([]);
//# sourceMappingURL=runtime-main.0fbe32ee.js.map //# sourceMappingURL=runtime-main.fc8f5cdf.js.map
\ No newline at end of file \ No newline at end of file
loc.json
View file @ dc5654d7
{"numOfComponents":5048,"numOfProject":3596} {"numOfComponents":5048,"numOfProject":3598}
\ No newline at end of file \ No newline at end of file
public/index.html
View file @ dc5654d7
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
CFG.empname && sessionStorage.setItem("empname", CFG.empname) CFG.empname && sessionStorage.setItem("empname", CFG.empname)
CFG.channel && sessionStorage.setItem("channel", CFG.channel) CFG.channel && sessionStorage.setItem("channel", CFG.channel)
CFG.channel && localStorage.setItem("channel-tb", CFG.channel); //积分商城约定存储渠道信息
if (location.href.indexOf("customShare") > 0) { if (location.href.indexOf("customShare") > 0) {
CFG.appID = "93842"; CFG.appID = "93842";
if (location.href.indexOf("Did1NjE4Nzk") > 0) { // 线上测试免登中间页 if (location.href.indexOf("Did1NjE4Nzk") > 0) { // 线上测试免登中间页
...@@ -53,10 +55,15 @@ ...@@ -53,10 +55,15 @@
} else { } else {
CFG.projectId = "pea14681b"; // 线上正式 TODO CFG.projectId = "pea14681b"; // 线上正式 TODO
CFG.env = "prod"; CFG.env = "prod";
CFG.environment = "prod"; //test || '' CFG.environment = ""; // 测试传 test || 正式传''
CFG.originUrl = `https://wx.cpic.com.cn`; // 正式域名 https://wx.cpic.com.cn 线上测试域名 https://wxtest.cpic.com.cn CFG.originUrl = `https://wx.cpic.com.cn`; // 正式域名 https://wx.cpic.com.cn 线上测试域名 https://wxtest.cpic.com.cn
} }
} }
CFG.middleTestPage = window.location.origin + "/customShare/share?id=Did1NjE4Nzk"; //线上测试中间页
CFG.middleProdPage = window.location.origin + "/customShare/share?id=Did1NjE4ODc"; //线上正式中间页
CFG.middleUrl = CFG.projectId == 'peb9f4481' ? CFG.middleTestPage : CFG.middleProdPage;
// 动态域名 // 动态域名
CFG.domain = window.location.origin; CFG.domain = window.location.origin;
// 首页 app.jsx中会拼动态域名 // 首页 app.jsx中会拼动态域名
......
sparkrc.js
View file @ dc5654d7
...@@ -10,5 +10,5 @@ module.exports ={ ...@@ -10,5 +10,5 @@ module.exports ={
"IMAGE_Q2": 0.8, "IMAGE_Q2": 0.8,
"RES_PATH": "/src/assets/", "RES_PATH": "/src/assets/",
"RES_PATH_PROD": "//yun.duiba.com.cn/spark/v2/temp_base/1754019365583", "RES_PATH_PROD": "//yun.duiba.com.cn/spark/v2/temp_base/1754019365583",
"JS_PATH_PROD": "https://yun.duiba.com.cn/spark/v2/temp_base/1754967184422/js" "JS_PATH_PROD": "https://yun.duiba.com.cn/spark/v2/temp_base/1755151808798/js"
} }
\ No newline at end of file
src/pages/middlePageNew/middlePageNew.jsx
View file @ dc5654d7
...@@ -51,11 +51,9 @@ class MiddlePage extends React.Component { ...@@ -51,11 +51,9 @@ class MiddlePage extends React.Component {
//接口重定向地址 //接口重定向地址
let directUrl = `${actUrl}&channel=${channel}&empno=${empno}&empname=${empname}&wdTK=${wdTK}&isFromShare=${isFromShare}&empnoShow=${empnoShow}` let directUrl = `${actUrl}&channel=${channel}&empno=${empno}&empname=${empname}&wdTK=${wdTK}&isFromShare=${isFromShare}&empnoShow=${empnoShow}`
// 用不到了
// const middleUrl = CFG.projectId == 'pa77ad6bf' ? CFG.middleTestPage : CFG.middleProdPage; const callBackUrl = `${CFG.middleUrl}&redirectUrl=${actUrl}&channel=${channel}&empno=${empno}&empname=${empname}&wdTK=${wdTK}&isFromShare=${isFromShare}&empnoShow=${empnoShow}`
// const callBackUrl = `${middleUrl}&redirectUrl=${actUrl}&channel=${channel}&empno=${empno}&empname=${empname}&wdTK=${wdTK}&isFromShare=${isFromShare}&empnoShow=${empnoShow}` this.setState({callBackUrl})
// this.setState({callBackUrl})
// console.info("这是直接跳转的链接", directUrl); // console.info("这是直接跳转的链接", directUrl);
if (channel == CHANNEL_PARAMS.THD_MINI) { if (channel == CHANNEL_PARAMS.THD_MINI) {
//太好店渠道 //太好店渠道
...@@ -87,7 +85,7 @@ class MiddlePage extends React.Component { ...@@ -87,7 +85,7 @@ class MiddlePage extends React.Component {
}) })
if(success){ if(success){
this.setState({dataInfo:data},()=>{ this.setState({dataInfo:data},()=>{
this.handleToGo2() this.handleToGo()
}) })
...@@ -101,7 +99,7 @@ class MiddlePage extends React.Component { ...@@ -101,7 +99,7 @@ class MiddlePage extends React.Component {
if (success) { if (success) {
console.info('----data', data); console.info('----data', data);
this.setState({dataInfo:data},()=>{ this.setState({dataInfo:data},()=>{
// this.handleToGo2() // this.handleToGo()
}) })
} else { } else {
...@@ -214,7 +212,7 @@ class MiddlePage extends React.Component { ...@@ -214,7 +212,7 @@ class MiddlePage extends React.Component {
return path; return path;
}; };
// 跳转逻辑处理 用不到了 // 跳转逻辑处理
handleToGo = _throttle(() => { handleToGo = _throttle(() => {
const {callBackUrl, dataInfo} = this.state; const {callBackUrl, dataInfo} = this.state;
if(getUrlParam('channel') == CHANNEL_PARAMS.THD_MINI){ if(getUrlParam('channel') == CHANNEL_PARAMS.THD_MINI){
...@@ -262,7 +260,7 @@ class MiddlePage extends React.Component { ...@@ -262,7 +260,7 @@ class MiddlePage extends React.Component {
<div className="middlePageNew"> <div className="middlePageNew">
<div className={`${channel == CHANNEL_PARAMS.THD_MINI ? 'bg' : 'bg1'}`}> <div className={`${channel == CHANNEL_PARAMS.THD_MINI ? 'bg' : 'bg1'}`}>
{/* <div className="btn"></div> */} {/* <div className="btn"></div> */}
<div className="btn" onClick={this.handleToGo2}> <div className="btn" onClick={this.handleToGo}>
{/* {!isWeixinMini && ( {/* {!isWeixinMini && (
<WxOpenModule <WxOpenModule
id={"downLoadbtn"} id={"downLoadbtn"}
......
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