合并分支

master
lemon橪 2022-05-09 18:38:48 +08:00
commit b197cda548
3 changed files with 3 additions and 3 deletions

View File

@ -52,7 +52,7 @@ export function recharge (params) {
// 提现 // 提现
export function withdrawalApply (params) { export function withdrawalApply (params) {
return request({ return request({
url: '/buyer/passport/member/wallet/withdrawal', url: '/buyer/wallet/wallet/withdrawal',
method: Method.POST, method: Method.POST,
needToken: true, needToken: true,
data: params data: params

View File

@ -70,7 +70,7 @@
<Button @click="goPay(order.sn)" size="small" type="success" v-if="order.allowOperationVO.pay"></Button> <Button @click="goPay(order.sn)" size="small" type="success" v-if="order.allowOperationVO.pay"></Button>
<Button @click="received(order.sn)" size="small" type="warning" v-if="order.allowOperationVO.rog"></Button> <Button @click="received(order.sn)" size="small" type="warning" v-if="order.allowOperationVO.rog"></Button>
<!-- 售后 --> <!-- 售后 -->
<Button v-if="order.groupAfterSaleStatus.includes('NOT_APPLIED')" @click="applyAfterSale(order.orderItems)" size="small"></Button> <Button v-if="order.groupAfterSaleStatus && order.groupAfterSaleStatus.includes('NOT_APPLIED')" @click="applyAfterSale(order.orderItems)" size="small"></Button>
</div> </div>
</div> </div>
</div> </div>

View File

@ -44,7 +44,7 @@
</div> </div>
<div class="goods-seckill-btn" :class="{'goods-seckill-btn-gray' : nowHour < list[currIndex].timeLine}">{{nowHour >= list[currIndex].timeLine ? '立即抢购' : '即将开始'}}</div> <div class="goods-seckill-btn" :class="{'goods-seckill-btn-gray' : nowHour < list[currIndex].timeLine}">{{nowHour >= list[currIndex].timeLine ? '立即抢购' : '即将开始'}}</div>
<div class="goods-show-num"> <div class="goods-show-num">
已售<Progress style="width:110px" class="ml_10" :percent="Math.floor(item.salesNum/item.quantity)" /> 已售<Progress style="width:110px" class="ml_10" :percent="Math.ceil(item.salesNum/item.quantity)" />
</div> </div>
<div class="goods-show-seller"> <div class="goods-show-seller">
<span>{{ item.storeName }}</span> <span>{{ item.storeName }}</span>