Browse Source

update detail.

qd 1 năm trước cách đây
mục cha
commit
b07cfebd4d

+ 4 - 2
locale/en.json

@@ -263,7 +263,9 @@
   "order.confirm.msg1": "Zhang available",
   "order.confirm.noCoupon": "No coupon available yet",
   "order.confirm.discount": "Activity discount",
+  "order.confirm.total": "Total",
   "order.confirm.unit": "piece",
+	"order.confirm.noNeedInvoice": "No need invoice",
   "order.confirm.invoiceRequest": "Invoice request",
   "order.confirm.exchangeNow": "Exchange now",
   "order.confirm.submitOrder": "Submit order",
@@ -289,7 +291,7 @@
   "order.detail.needPay": "Require payment",
   "order.detail.refund": "Refunded",
   "order.detail.cancleOrder": "Cancel order",
-  "order.detail.continuePay": "Continue to pay",
+  "order.detail.continuePay": "pay",
   "order.detail.applyRefund": "Apply for a refund",
   "order.detail.inviteGroup": "Invite group group",
   "order.detail.groupDetail": "Group details",
@@ -444,7 +446,7 @@
   "pay.payresult.payFailed": "Payment failed",
   "pay.payresult.orderClosed": "The order has been closed",
   "pay.payresult.checkPay": "Check payment result...",
-  "pay.payresult.backHome": "Return to home page",
+  "pay.payresult.backHome": "To home",
   "pay.payresult.repay": "Repay",
   "pay.payresult.viewOrder": "View order",
   "pay.payresult.myGroup": "My Group",

+ 2 - 0
locale/zh-Hans.json

@@ -263,7 +263,9 @@
 	"order.confirm.msg1": "张可用",
 	"order.confirm.noCoupon": "暂无可用优惠券",
 	"order.confirm.discount": "活动优惠",
+  "order.confirm.total": "合计",
 	"order.confirm.unit": "件",
+	"order.confirm.noNeedInvoice": "不需要发票",
 	"order.confirm.invoiceRequest": "发票申请",
 	"order.confirm.exchangeNow": "立即兑换",
 	"order.confirm.submitOrder": "提交订单",

+ 7 - 7
pages/order/confirm.vue

@@ -108,8 +108,8 @@
         </view>
       </view>
       <view class="total-box-footer ss-font-28 ss-flex ss-row-right ss-col-center ss-m-r-28">
-        <view class="total-num ss-m-r-20">共{{ state.totalNumber }}{{$t('order.confirm.unit')}}</view>
-        <view>合计:</view>
+        <view class="total-num ss-m-r-20"> {{ state.totalNumber }} {{$t('order.confirm.unit')}}</view>
+        <view>{{$t('order.confirm.total')}}:</view>
         <view class="total-num text-red"> ¥{{ state.orderInfo.pay_fee }} </view>
         <view class="ss-flex" v-if="state.orderPayload.order_type === 'score'">
           <view class="total-num ss-font-30 text-red ss-m-l-4"> + </view>
@@ -126,7 +126,7 @@
       <view class="order-item ss-flex ss-col-center ss-row-between">
         <view class="item-title">{{$t('order.confirm.invoiceRequest')}}</view>
         <view class="ss-flex ss-col-center" @tap="onSelectInvoice">
-          <text class="item-value">{{ state.invoiceInfo.name || $t('order.confirm.noNeedInvoice') }}</text>
+          <text class="item-value">{{ state.invoiceInfo.name }}</text>
           <text class="_icon-forward item-icon"></text>
         </view>
       </view>
@@ -234,15 +234,15 @@
   // 提交订单/立即兑换
   function onConfirm() {
     if (!state.orderPayload.address_id && state.orderInfo.need_address === 1) {
-      sheep.$helper.toast($t('order.confirm.chooseAddress'));
+      sheep.$helper.toast(uni.getLocale() == 'en' ? 'Please select the shipping address' : '请选择收货地址');
       return;
     }
 
     if (exchangeNow.value) {
       uni.showModal({
-        title: $t('order.confirm.prompt'),
-        content: $t('order.confirm.promptContent'),
-        cancelText: $t('order.confirm.later'),
+        title: uni.getLocale() == 'en' ? 'Prompt' : '提示',
+        content: uni.getLocale() == 'en' ? 'Are you sure you want to use the points to redeem them immediately?' : '确定使用积分立即兑换?',
+        cancelText: uni.getLocale() == 'en' ? 'Think again' : '再想想',
         success: async function (res) {
           if (res.confirm) {
             submitOrder();

+ 4 - 4
pages/order/detail.vue

@@ -357,8 +357,8 @@
   // 取消订单
   async function onCancel(orderId) {
     uni.showModal({
-      title: $t('order.detail.tips'),
-      content: $t('order.detail.tipsCancleOrder'),
+      title: uni.getLocale() == 'en' ? 'Prompt' : '提示',
+      content: uni.getLocale() == 'en' ? 'Are you sure you want to cancel the order?' : '确定要取消订单吗?',
       success: async function (res) {
         if (res.confirm) {
           const { code, data } = await sheep.$api.order.cancel(orderId);
@@ -373,8 +373,8 @@
   // 申请退款
   async function onRefund(orderId) {
     uni.showModal({
-      title: $t('order.detail.tips'),
-      content: $t('order.detail.tipsRefund'),
+      title: uni.getLocale() == 'en' ? 'Prompt' : '提示',
+      content: uni.getLocale() == 'en' ? 'Are you sure you want to apply for a refund?' : '确定要申请退款吗?',
       success: async function (res) {
         if (res.confirm) {
           const { code, data } = await sheep.$api.order.applyRefund(orderId);

+ 3 - 3
pages/order/invoice.vue

@@ -130,13 +130,13 @@
   const state = reactive({
     info: [
       {
-        title: $t('order.invoice.submitOrder'),
+        title: uni.getLocale() == 'en' ? 'Order submission' : '订单提交',
       },
       {
-        title: $t('order.invoice.waitInvoice'),
+        title: uni.getLocale() == 'en' ? 'Waiting for invoice' : '等待开票',
       },
       {
-        title: $t('order.invoice.finishInvoice'),
+        title: uni.getLocale() == 'en' ? 'Invoice completed' : '开票完成',
       },
     ],
     data: {},

+ 8 - 8
pages/order/list.vue

@@ -333,8 +333,8 @@
   // 确认收货
   async function onConfirm(orderId) {
     uni.showModal({
-      title: $t('order.list.tips'),
-      content: $t('order.list.tipsConfirmReceived'),
+      title: uni.getLocale() == 'en' ? 'tips' : '提示',
+      content: uni.getLocale() == 'en' ? 'Confirm that packages have arrived before receipt' : '请确认包裹全部到达后再确认收货',
       success: async function (res) {
         if (res.confirm) {
           const { code, data } = await sheep.$api.order.confirm(orderId);
@@ -357,8 +357,8 @@
   // 取消订单
   async function onCancel(orderId) {
     uni.showModal({
-      title: $t('order.list.tips'),
-      content: $t('order.list.tipsCancleOrder'),
+      title: uni.getLocale() == 'en' ? 'tips' : '提示',
+      content: uni.getLocale() == 'en' ? 'Are you sure you want to cancel the order?' : '确定要取消订单吗?',
       success: async function (res) {
         if (res.confirm) {
           const { code, data } = await sheep.$api.order.cancel(orderId);
@@ -374,8 +374,8 @@
   // 删除订单
   function onDelete(orderId) {
     uni.showModal({
-      title: $t('order.list.tips'),
-      content: $t('order.list.tipsDeleteOrder'),
+      title: uni.getLocale() == 'en' ? 'tips' : '提示',
+      content: uni.getLocale() == 'en' ? 'Are you sure you want to delete the order?' : '确定要删除订单吗?',
       success: async function (res) {
         if (res.confirm) {
           const { code, data } = await sheep.$api.order.delete(orderId);
@@ -391,8 +391,8 @@
   // 申请退款
   async function onRefund(orderId) {
     uni.showModal({
-      title: $t('order.list.tips'),
-      content: $t('order.list.tipsApplyRefund'),
+      title: uni.getLocale() == 'en' ? 'tips' : '提示',
+      content: uni.getLocale() == 'en' ? 'Are you sure you want to apply for a refund?' : '确定要申请退款吗?',
       success: async function (res) {
         if (res.confirm) {
           // #ifdef MP

+ 12 - 12
pages/pay/index.vue

@@ -102,19 +102,19 @@
   const payMethods = [
     {
       icon: '/assets/addons/shopro/uniapp/pay/wechat.png',
-      title: $t('pay.index.wxpay'),
+      title: uni.getLocale() == 'en' ? 'WeChat Payment' : '微信支付',
       value: 'wechat',
       disabled: false,
     },
     {
       icon: '/assets/addons/shopro/uniapp/pay/alipay.png',
-      title: $t('pay.index.alipay'),
+      title: uni.getLocale() == 'en' ? 'Alipay payment' : '支付宝支付',
       value: 'alipay',
       disabled: false,
     },
     {
       icon: '/assets/addons/shopro/uniapp/pay/wallet.png',
-      title: $t('pay.index.balancepay'),
+      title: uni.getLocale() == 'en' ? 'Balance payment' : '余额支付',
       value: 'money',
       disabled: false,
     },
@@ -126,7 +126,7 @@
     },
     {
       icon: '/assets/addons/shopro/uniapp/pay/cod.png',
-      title: $t('pay.index.payCash'),
+      title: uni.getLocale() == 'en' ? 'Cash on delivery' : '货到付款',
       value: 'offline',
       disabled: false,
     },
@@ -134,13 +134,13 @@
 
   const onPay = () => {
     if (state.payment === '') {
-      sheep.$helper.toast($t('pay.index.choosePayway'));
+      sheep.$helper.toast(uni.getLocale() == 'en' ? 'Please choose a payment method' : '请选择支付方式');
       return;
     }
     if (state.payment === 'money') {
       uni.showModal({
-        title: $t('pay.index.tips'),
-        content: $t('pay.index.tipsConfirmPay'),
+        title: uni.getLocale() == 'en' ? 'tips' : '提示',
+        content: uni.getLocale() == 'en' ? 'Are you sure you want to pay?' : '确定要支付吗?',
         success: function (res) {
           if (res.confirm) {
             sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.order_sn);
@@ -149,8 +149,8 @@
       });
     } else if (state.payment === 'offline') {
       uni.showModal({
-        title: $t('pay.index.tips'),
-        content: $t('pay.index.tipsSubmitOrder'),
+        title: uni.getLocale() == 'en' ? 'tips' : '提示',
+        content: uni.getLocale() == 'en' ? 'Are you sure you want to place an order?' : '确定要下单吗?',
         success: function (res) {
           if (res.confirm) {
             sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.order_sn);
@@ -164,7 +164,7 @@
 
   const payDescText = computed(() => {
     if (state.payStatus === 2) {
-      return $t('pay.index.paid');
+      return uni.getLocale() == 'en' ? 'The order has been paid' : '该订单已支付';
     }
     if (state.payStatus === 1 && state.orderInfo.ext.expired_time !== 0) {
       const time = useDurationTime(state.orderInfo.ext.expired_time);
@@ -172,10 +172,10 @@
         state.payStatus = -1;
         return '';
       }
-      return $t('pay.index.restTime')+` ${time.h}:${time.m}:${time.s} `;
+      return (uni.getLocale() == 'en' ? 'Remaining payment time' : '剩余支付时间')+` ${time.h}:${time.m}:${time.s} `;
     }
     if (state.payStatus === -2) {
-      return $t('pay.index.noPayData');
+      return uni.getLocale() == 'en' ? 'No payment order information found' : '未查询到支付单信息';
     }
 
     return '';

+ 2 - 2
unpackage/dist/build/h5/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <link rel="stylesheet" href="/h5/assets/uni.79134f79.css">
+    <link rel="stylesheet" href="/h5/assets/uni.eec03726.css">
 
     <meta charset="UTF-8" />
     <meta
@@ -11,7 +11,7 @@
     <title>星品购666</title>
     <!--preload-links-->
     <!--app-context-->
-    <script type="module" crossorigin src="/h5/assets/index.fdf56543.js"></script>
+    <script type="module" crossorigin src="/h5/assets/index.62158469.js"></script>
     <link rel="stylesheet" href="/h5/assets/index.81956fb0.css">
   </head>
   <body>