2 Commits 667879cfc2 ... fee9c1fde0

Auteur SHA1 Message Date
  李宇 fee9c1fde0 Merge remote-tracking branch 'origin/cfclub' into cfclub il y a 2 mois
  李宇 f880058e8c fix(shop): 修复支付页订单金额显示为0元 il y a 2 mois

+ 1 - 1
cfc-frontend/pages/shop/checkout/checkout.vue

@@ -472,7 +472,7 @@ export default {
             var pointsUsed = order.pointsUsed || 0
             var pointsUsed = order.pointsUsed || 0
             setTimeout(function() {
             setTimeout(function() {
               uni.navigateTo({
               uni.navigateTo({
-                url: '/pages/shop/payment/payment?orderNo=' + order.orderNo + '&amount=' + (moneyAmount / 100).toFixed(2) + '&pointsUsed=' + pointsUsed
+                url: '/pages/shop/payment/payment?orderNo=' + order.orderNo + '&amount=' + moneyAmount + '&pointsUsed=' + pointsUsed
               })
               })
             }, 1000)
             }, 1000)
           } else {
           } else {

+ 1 - 1
cfc-frontend/pages/shop/order-detail/order-detail.vue

@@ -130,7 +130,7 @@ export default {
     },
     },
     onPay() {
     onPay() {
       uni.navigateTo({
       uni.navigateTo({
-        url: '/pages/shop/payment/payment?orderNo=' + this.orderNo + '&amount=' + (this.order.totalAmount / 100 || 0)
+        url: '/pages/shop/payment/payment?orderNo=' + this.orderNo + '&amount=' + (this.order.totalAmount || 0)
       })
       })
     },
     },
     onCancel() {
     onCancel() {

+ 1 - 1
cfc-frontend/pages/shop/order-list/order-list.vue

@@ -87,7 +87,7 @@
             </text>
             </text>
             <view class="order-actions" @click.stop>
             <view class="order-actions" @click.stop>
               <button v-if="item.status === 'pending'" class="btn-sm btn-cancel" @click="onCancel(item.orderNo)">取消</button>
               <button v-if="item.status === 'pending'" class="btn-sm btn-cancel" @click="onCancel(item.orderNo)">取消</button>
-              <button v-if="item.status === 'pending'" class="btn-sm btn-pay" @click="onPay(item.orderNo, item.totalAmount / 100)">去支付</button>
+              <button v-if="item.status === 'pending'" class="btn-sm btn-pay" @click="onPay(item.orderNo, item.totalAmount)">去支付</button>
               <button v-if="item.status === 'paid'" class="btn-sm btn-refund" @click="goAfterSales(item.id, item.orderNo)">申请退款</button>
               <button v-if="item.status === 'paid'" class="btn-sm btn-refund" @click="goAfterSales(item.id, item.orderNo)">申请退款</button>
               <button v-if="item.status === 'shipped'" class="btn-sm btn-confirm" @click="onConfirm(item.orderNo)">确认收货</button>
               <button v-if="item.status === 'shipped'" class="btn-sm btn-confirm" @click="onConfirm(item.orderNo)">确认收货</button>
               <button v-if="item.status === 'completed'" class="btn-sm btn-rebuy" @click="goDetail(item.orderNo)">再次购买</button>
               <button v-if="item.status === 'completed'" class="btn-sm btn-rebuy" @click="goDetail(item.orderNo)">再次购买</button>