|
@@ -95,8 +95,11 @@ export default class ContentRouter extends React.Component {
|
|
|
<Route path="/product" component={Product} />
|
|
|
<Route path="/productSort" component={ProductSort} />
|
|
|
<Route path="/weappShare" component={WeappShare} />
|
|
|
+<<<<<<< HEAD
|
|
|
<Route path="/links" component={Links} />
|
|
|
<Route path="/cities" component={Cities} />
|
|
|
+=======
|
|
|
+>>>>>>> 094466872b31ebc5b3e9dcd460a498cd1e8a3a54
|
|
|
|
|
|
<Route path="/jzmList" component={JzmList} />
|
|
|
<Route path="/mcjList" component={McjList} />
|