Skip to content

I
icbcRPG
Commit 7ba03828 authored by shunx 马's avatar shunx 马
Browse files
Options

合并

parent 9e65b3cf
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 7 deletions
project/src/pages/main3/main3.jsx
View file @ 7ba03828
...@@ -65,15 +65,8 @@ class Main3 extends Component { ...@@ -65,15 +65,8 @@ class Main3 extends Component {
return; return;
} }
const urlmap = { const urlmap = {
<<<<<<< HEAD
xiaomaibu: 'https://gonghang.activity-1.m.duiba.com.cn/projectx/pa14d7c75/index.html?appID=66480', xiaomaibu: 'https://gonghang.activity-1.m.duiba.com.cn/projectx/pa14d7c75/index.html?appID=66480',
// equnongchang:'https://gonghang.activity-1.m.duiba.com.cn/projectx/pb3bde510/index.html?appID=66480', // equnongchang:'https://gonghang.activity-1.m.duiba.com.cn/projectx/pb3bde510/index.html?appID=66480',
=======
xiaomaibu:'https://gonghang.activity-1.m.duiba.com.cn/projectx/pa14d7c75/index.html?appID=66480',
// equnongchang:'https://gonghang.activity-1.m.duiba.com.cn/projectx/pb3bde510/index.html?appID=66480',
// equnongchang:'https://gonghang.activity-1.m.duiba.com.cn/projectx/p6e9a59d7/index.html?appID=66480',
equnongchang:'https://gonghang.activity-1.m.duiba.com.cn/projectx/p6e9a59d7/index.html?appID=66480',
>>>>>>> f159ae55c49025ccbf580525495917f2e17cf611
// equnongchang:'https://gonghang.activity-1.m.duiba.com.cn/projectx/p6e9a59d7/index.html?appID=66480', // equnongchang:'https://gonghang.activity-1.m.duiba.com.cn/projectx/p6e9a59d7/index.html?appID=66480',
equnongchang: 'https://gonghang.activity-1.m.duiba.com.cn/projectx/p6e9a59d7/index.html?appID=66480', equnongchang: 'https://gonghang.activity-1.m.duiba.com.cn/projectx/p6e9a59d7/index.html?appID=66480',
wodeejia: 'https://gonghang.activity-1.m.duiba.com.cn/projectx/pb3bde510/index.html?appID=66480&gohome=true', wodeejia: 'https://gonghang.activity-1.m.duiba.com.cn/projectx/pb3bde510/index.html?appID=66480&gohome=true',
......
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