1.添加抽过奖后,“已中奖”跟“未中奖”状态 2.非微信端也支持抽奖,去掉微信端判断
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b feature/raffle origin/feature/raffle
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git checkout release/5.4 git merge --no-ff feature/raffle
Step 4. Push the result of the merge to GitLab
git push origin release/5.4
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines
The changes were merged into release/5.4. The source branch has been removed.
// count: value.buy_total, | ||
isVirtual: isTickets, | ||
isDepositAdvance: value.attribute * 1 === 9, // 定金预售 | ||
status: value.status === 0 ? true : false, | ||
// status: value.status === 0 ? true : false, | ||
uid: value.uid, | ||
order_code: value.order_code | ||
order_code: value.order_code, | ||
goluck: value.status === 0 ? true : false, | ||
|
Status changed to merged