master #1

Open
gxwebsoft wants to merge 108 commits from developer/template-10584:master into master
Showing only changes of commit a4a0a922fc - Show all commits

View File

@@ -11,7 +11,7 @@ import type { ShopGoods, ShopGoodsParam } from '@/api/shop/shopGoods/model'
import { getMyGltUserTicketTotal } from '@/api/glt/gltUserTicket' import { getMyGltUserTicketTotal } from '@/api/glt/gltUserTicket'
import { ensureLoggedIn } from '@/utils/auth' import { ensureLoggedIn } from '@/utils/auth'
import './index.scss' import './index.scss'
import navTo from "@/utils/common"; // import navTo from "@/utils/common";
function Home() { function Home() {
const [activeTabKey, setActiveTabKey] = useState('recommend') const [activeTabKey, setActiveTabKey] = useState('recommend')
@@ -290,14 +290,15 @@ function Home() {
</View> </View>
</View> </View>
<View className="ticket-card" onClick={() => Taro.navigateTo({ url: `/shop/category/index?id=4560` })}> {/* onClick={() => Taro.navigateTo({ url: `/shop/category/index?id=4560` })} */}
<View className="ticket-card">
<View className="ticket-card__head"> <View className="ticket-card__head">
<Text className="ticket-card__title"></Text> <Text className="ticket-card__title"></Text>
</View> </View>
</View> </View>
{/* onClick={() => navTo('/shop/category/index?id=4556')} */}
<View className="ticket-card" onClick={() => navTo('/shop/category/index?id=4556')}> <View className="ticket-card">
<View className="ticket-card__head"> <View className="ticket-card__head">
<Text className="ticket-card__title">·</Text> <Text className="ticket-card__title">·</Text>
</View> </View>