合并分支

buyer/src/api/member.js

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

buyer/src/pages/home/orderCenter/MyOrder.vue

@@ -70,7 +70,7 @@
             <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 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>

buyer/src/pages/promotion/seckill.vue

@@ -44,7 +44,7 @@
         </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">
-          已售<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 class="goods-show-seller">
           <span>{{ item.storeName }}</span>