Skip to content

Commit

Permalink
feat: replace product interface
Browse files Browse the repository at this point in the history
  • Loading branch information
@shiyutim
shiyutim committed Jun 14, 2023
1 parent 8240d70 commit 91e0d94
Show file tree
Hide file tree
Showing 4 changed files with 108 additions and 83 deletions.
5 changes: 3 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@ F12 打开控制台，在 network 下，找到对应的 http 请求，然后找

## TODO

1. 选座支持
2. 其他平台支持
1. 定时逻辑、日志从前端移动到后端
2. 请求接口不堵塞 ui
3. 其他平台支持

This comment has been minimized.

Sign in to view

Copy link
@debby97cheer

debby97cheer Jul 3, 2023

秀动
8 changes: 3 additions & 5 deletions src-tauri/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,8 @@ struct ProductInfo {
fn get_product_info(t: usize, sign: &str, itemid: &str, cookie: &str) -> String {
let res = get_info(t, sign, itemid, cookie);
match res {
Err(e) => String::from(format!("数据获取失败 {}", e)),
Ok(s) => s,
Err(e) => {
println!("error: {}", e);
String::from("数据获取失败")
}
}
}

Expand Down Expand Up @@ -57,7 +54,8 @@ async fn get_info(
itemid: &str,
cookie: &str,
) -> Result<String, Box<dyn Error>> {
let url = format!("https://mtop.damai.cn/h5/mtop.alibaba.detail.subpage.getdetail/2.0/?jsv=2.7.2&appKey=12574478&t={}&sign={}&type=originaljson&dataType=json&v=2.0&H5Request=true&AntiCreep=true&AntiFlood=true&api=mtop.alibaba.detail.subpage.getdetail&method=GET&tb_eagleeyex_scm_project=20190509-aone2-join-test&data=%7B%22itemId%22%3A%22{}%22%2C%22bizCode%22%3A%22ali.china.damai%22%2C%22scenario%22%3A%22itemsku%22%2C%22exParams%22%3A%22%7B%5C%22dataType%5C%22%3A4%2C%5C%22dataId%5C%22%3A%5C%22%5C%22%2C%5C%22privilegeActId%5C%22%3A%5C%22%5C%22%7D%22%2C%22dmChannel%22%3A%22damai%40damaih5_h5%22%7D", t, sign, itemid);
// let url = format!("https://mtop.damai.cn/h5/mtop.alibaba.detail.subpage.getdetail/2.0/?jsv=2.7.2&appKey=12574478&t={}&sign={}&type=originaljson&dataType=json&v=2.0&H5Request=true&AntiCreep=true&AntiFlood=true&api=mtop.alibaba.detail.subpage.getdetail&method=GET&tb_eagleeyex_scm_project=20190509-aone2-join-test&data=%7B%22itemId%22%3A%22{}%22%2C%22bizCode%22%3A%22ali.china.damai%22%2C%22scenario%22%3A%22itemsku%22%2C%22exParams%22%3A%22%7B%5C%22dataType%5C%22%3A4%2C%5C%22dataId%5C%22%3A%5C%22%5C%22%2C%5C%22privilegeActId%5C%22%3A%5C%22%5C%22%7D%22%2C%22dmChannel%22%3A%22damai%40damaih5_h5%22%7D", t, sign, itemid);
let url = format!("https://mtop.damai.cn/h5/mtop.alibaba.damai.detail.getdetail/1.2/?jsv=2.7.2&appKey=12574478&t={}&sign={}&type=originaljson&dataType=json&v=2.0&H5Request=true&AntiCreep=true&AntiFlood=true&api=mtop.alibaba.detail.subpage.getdetail&method=GET&tb_eagleeyex_scm_project=20190509-aone2-join-test&data=%7B%22itemId%22%3A%22{}%22%2C%22bizCode%22%3A%22ali.china.damai%22%2C%22scenario%22%3A%22itemsku%22%2C%22exParams%22%3A%22%7B%5C%22dataType%5C%22%3A4%2C%5C%22dataId%5C%22%3A%5C%22%5C%22%2C%5C%22privilegeActId%5C%22%3A%5C%22%5C%22%7D%22%2C%22dmChannel%22%3A%22damai%40damaih5_h5%22%7D", t, sign, itemid);

let mut headers = get_common_headers();
headers.insert(
Expand Down
5 changes: 5 additions & 0 deletions src/components/dm/Header.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,13 @@ function initLog() {
list.value = res.flat(Infinity).reverse();
}
function initDate() {
defaultValue.value = [dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]
}
function showLog() {
visible.value = true;
initDate()
initLog()
}
Expand Down
173 changes: 97 additions & 76 deletions src/components/dm/Product.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,22 +54,22 @@ async function getProductInfo() {
commonTip(message);
if (isSuccess(message)) {
const result = parseData.data
let result = parseData.data
? JSON.parse(parseData.data.result)
: "";
if (result) {
if (result.itemBuyBtn.btnStatus === "303") {
result = result.detailViewComponentMap.item || {}
if (result.item.buyBtnStatus === "303") {
// 下架
Message.warning(`商品已下架`);
return;
} else if(result.itemBuyBtn.btnStatus === "100") {
} else if(result.item.buyBtnStatus === "100") {
// 不支持该渠道
Message.error(joinMsg([result.itemBuyBtn.btnText, result.itemBuyBtn.btnTips]))
Message.error(joinMsg([result.item.buyBtnText, result.item.buyBtnTips]))
return
} else if(result.itemBuyBtn.btnStatus === "106") {
} else if(result.item.buyBtnStatus === "106") {
// 即将开抢
// TODO bug fix
countDownVal.value = dayjs(result.itemBasicInfo.sellingStartTime).valueOf();
countDownVal.value = Number(result.item.sellStartTime);
// 如果预售的商品开售，则直接显示购买
if(countDownVal.value > Date.now()) {
Expand All @@ -84,7 +84,6 @@ async function getProductInfo() {
} else {
Message.error("获取商品详情失败");
}
}
} catch (e) {
Message.error(joinMsg(["获取商品详情失败", JSON.stringify(e)]));
}
Expand All @@ -99,12 +98,13 @@ const skuInfo = reactive({});
const activeSku = ref(null);
async function getSkuInfo(item) {
if (!item && item.performId) {
if (!item || !Array.isArray(item.performs) || !item.performs.length) {
Message.error("场地信息或场次 id 获取错误，请重新获取商品信息");
return;
}
const performId = item.performs[0].performId
const data = `{"itemId":"${form.value.itemId}","bizCode":"ali.china.damai","scenario":"itemsku","exParams":"{\\"dataType\\":2,\\"dataId\\":\\"${item.performId}\\",\\"privilegeActId\\":\\"\\"}","dmChannel":"damai@damaih5_h5"}`;
const data = `{"itemId":"${form.value.itemId}","bizCode":"ali.china.damai","scenario":"itemsku","exParams":"{\\"dataType\\":2,\\"dataId\\":\\"${performId}\\",\\"privilegeActId\\":\\"\\"}","dmChannel":"damai@damaih5_h5"}`;
const [t, sign] = getSign(data, form.value.token);
try {
Expand All @@ -113,7 +113,7 @@ async function getSkuInfo(item) {
sign,
itemid: form.value.itemId,
cookie: form.value.cookie,
dataid: item.performId,
dataid: performId,
});
const parseData = JSON.parse(res);
Expand All @@ -127,7 +127,7 @@ async function getSkuInfo(item) {
? JSON.parse(parseData.data.result)
: "";
if (result) {
skuInfo[item.performId] = result;
skuInfo[performId] = result;
}
}
}
Expand Down Expand Up @@ -307,17 +307,26 @@ function otherHandle(orderDetail) {
const isRob = ref(false)
async function rob() {
log.save(log.getTemplate('click', '点击抢票'))
// checkTime()
isRob.value = true
Notification.info({
title: "开始抢票，当倒计时结束时，将自动购买。请确保本地电脑时间准确",
title: "开始抢票，当倒计时结束时，将自动购买。请确保本地电脑时间准确或根据大麦自动校准时间",
duration: 8000
})
checkTime()
}
// 时间提醒
function checkTime() {
// 最终时间和当前时间的差
const diff = lastCountDownVal.value - Date.now()
const oneHour = 1000 * 60 * 60
if(diff > oneHour) {
Notification.info({
title: "提示：抢票时间尽量在一个小时内，并使用最新的 cookie，否则可能导致抢票失败",
duration: 5000
})
}
}
Expand All @@ -341,11 +350,11 @@ async function countDownFinished() {
<section class="product-wrap">
<div class="subtitle">商品信息</div>
<div v-if="productInfo">
<div class="info-wrap" v-if="productInfo.itemBasicInfo">
<div class="info-wrap" v-if="productInfo.staticData">
<div class="left">
<img
class="img"
:src="productInfo.itemBasicInfo.mainImageUrl"
:src="productInfo.staticData.itemBase.itemPic"
/>

<div v-if="isShowCountDown">
Expand Down Expand Up @@ -390,74 +399,89 @@ async function countDownFinished() {

<div class="right">
<div class="column">
<div>{{ productInfo.itemBasicInfo.cityName }}</div>
<div>{{ productInfo.itemBasicInfo.venueName }}</div>
<div>
{{ productInfo.staticData.itemBase.cityName }}
</div>
</div>
<div class="column">
<div class="label">名称：</div>
<div class="value">
{{
productInfo.itemBasicInfo.itemTitle ||
productInfo.itemBasicInfo.projectTitle
}}
{{ productInfo.staticData.itemBase.itemName }}
</div>
</div>
<div class="column">
<div class="label">itemId：</div>
<div class="value">
{{ productInfo.itemBasicInfo.itemId }}
{{ productInfo.staticData.itemBase.itemId }}
</div>
</div>
<div class="column">
<div class="label">价格：</div>
<div class="value">
{{ productInfo.itemBasicInfo.priceRange }}
{{ productInfo.item.priceRange }}
</div>
</div>

<h4>场次</h4>
<div class="ticket-list">
<div
v-for="item in productInfo.performCalendar
.performViews"
v-for="item in productInfo.item.performBases"
class="ticket-item"
@click="getSkuInfo(item)"
>
{{ item.performName }}
</div>
</div>
<div class="ticket-item-head">
{{ item.name }}

<a-tag
v-if="item.performBaseTagDesc"
:color="
item.performBaseTagDesc === '无票'
? '#f53f3f'
: ''
"
>
{{ item.performBaseTagDesc }}
</a-tag>
</div>

<div class="sku-wrap">
<div v-for="item in skuInfo" class="sku">
<div
class="sku-item"
:class="{
'active-sku':
activeSku &&
activeSku.skuId === sku.skuId,
}"
v-for="sku in item.perform.skuList"
@click="saveSku(sku)"
class="sku"
v-if="skuInfo[item.performs[0].performId]"
>
<div>{{ sku.priceName }}</div>
<div>{{ sku.price }}</div>
<h4>票档</h4>
<div
class="tag"
v-if="
Array.isArray(sku.tags) &&
sku.tags.length
"
class="sku-item"
:class="{
'active-sku':
activeSku &&
activeSku.skuId === sku.skuId,
}"
v-for="sku in skuInfo[
item.performs[0].performId
].perform.skuList"
@click="saveSku(sku)"
>
<a-tag color="#f53f3f">{{
sku.tags[0].tagDesc
}}</a-tag>
<div>{{ sku.priceName }}</div>
<div>{{ sku.price }}</div>
<div
class="tag"
v-if="
Array.isArray(sku.tags) &&
sku.tags.length
"
>
<a-tag color="#f53f3f">{{
sku.tags[0].tagDesc
}}</a-tag>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div v-else>请先获取商品信息</div>
<div v-else>请填写表单以获取商品信息</div>
</section>
</template>

Expand Down Expand Up @@ -502,36 +526,33 @@ async function countDownFinished() {
flex-flow: row nowrap;
}
.ticket-item {
border: 1px solid #ccc;
width: 200px;
padding: 20px 0;
margin-bottom: 10px;
margin-right: 30px;
text-align: center;
cursor: pointer;
&:hover {
background: #eee;
}
}
.sku-wrap {
display: flex;
flex-flow: row wrap;
.sku-item {
margin-right: 20px;
&-head {
border: 1px solid #ccc;
cursor: pointer;
width: 200px;
padding: 20px 0;
margin-bottom: 10px;
text-align: center;
.tag {
color: #ff0000;
text-align: center;
cursor: pointer;
&:hover {
background: #eee;
}
}
.active-sku {
background: #eee;
}
.sku-item {
border: 1px solid #ccc;
cursor: pointer;
padding: 20px 0;
margin-bottom: 10px;
text-align: center;
.tag {
color: #ff0000;
}
}
.active-sku {
background: #eee;
}
</style>

0 comments on commit 91e0d94

Please sign in to comment.