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

+ 46 - 45
locale/en.json

@@ -276,10 +276,10 @@
   "order.detail.title": "Order Details",
   "common.detail": "Details",
   "order.detail.applyService": "Apply for after-sales service",
-  "order.detail.reapplyService": "Re-sale service",
-  "order.detail.saleDetail": "After-sales details",
-  "order.detail.rebuy": "Buy again",
-  "order.detail.order_no": "Order number",
+  "order.detail.reapplyService": "Resale service",
+  "order.detail.saleDetail": "Aftersales details",
+  "order.detail.rebuy": "reBuy",
+  "order.detail.order_no": "Orderid",
   "order.detail.copy": "Copy",
   "order.detail.order_time": "Order time",
   "order.detail.pay_time": "Payment time",
@@ -290,15 +290,15 @@
   "order.detail.paid": "paid",
   "order.detail.needPay": "Require payment",
   "order.detail.refund": "Refunded",
-  "order.detail.cancleOrder": "Cancel order",
+  "order.detail.cancleOrder": "Cancel",
   "order.detail.continuePay": "pay",
-  "order.detail.applyRefund": "Apply for a refund",
-  "order.detail.inviteGroup": "Invite group group",
+  "order.detail.applyRefund": "Apply refund",
+  "order.detail.inviteGroup": "Invite group",
   "order.detail.groupDetail": "Group details",
-  "order.detail.viewExpress": "View logistics",
-  "order.detail.confirmReceived": "Confirm receipt",
-  "order.detail.comment": "Evaluate the order",
-  "order.detail.viewInvoice": "View Invoice",
+  "order.detail.viewExpress": "Logistics",
+  "order.detail.confirmReceived": "Receipt",
+  "order.detail.comment": "Evaluate",
+  "order.detail.viewInvoice": "Invoice",
   "order.detail.refundAgain": "Refund",
   "order.detail.tips": "Tips",
   "order.detail.tipsCancleOrder": "Are you sure you want to cancel the order?",
@@ -315,7 +315,7 @@
   "order.invoice.unit": "per",
   "order.invoice.previewInvoice": "Click to preview the invoice",
   "order.invoice.orderStatus": "Order Status",
-  "order.invoice.orderNo": "order number",
+  "order.invoice.orderNo": "orderid",
   "order.invoice.orderTime": "Order time",
   "order.invoice.submitOrder": "Order submission",
   "order.invoice.waitInvoice": "Waiting for invoice",
@@ -323,21 +323,21 @@
   "order.invoice.openDocSuc": "Open document successfully",
   "order.list.title": "My order",
   "order.list.noOrder": "No order yet",
-  "order.list.orderNo": "order number",
+  "order.list.orderNo": "orderid",
   "order.list.applyService": "Apply for after-sales service",
-  "order.list.reapplyService": "Re-sales service",
-  "order.list.saleDetail": "After-sales details",
+  "order.list.reapplyService": "Resales service",
+  "order.list.saleDetail": "Aftersales",
   "order.list.discount": "Discount",
   "order.list.freight": "Freight",
   "order.list.totalMoney": "Total amount",
-  "order.list.deleteOrder": "Delete order",
-  "order.list.viewDetail": "View details",
-  "order.list.viewInvoice": "View Invoice",
+  "order.list.deleteOrder": "Delete",
+  "order.list.viewDetail": "Details",
+  "order.list.viewInvoice": "Invoice",
   "order.list.all": "all",
-  "order.list.unpaid": "Pending payment",
-  "order.list.nosend": "To be shipped",
-  "order.list.noget": "To be received",
-  "order.list.nocomment": "To be evaluated",
+  "order.list.unpaid": "Pending",
+  "order.list.nosend": "To shipped",
+  "order.list.noget": "To received",
+  "order.list.nocomment": "To evaluated",
   "order.list.tips": "Tips",
   "order.list.tipsConfirmReceived": "Please confirm that all packages have arrived before confirming receipt",
   "order.list.tipsCancleOrder": "Are you sure you want to cancel the order?",
@@ -365,7 +365,7 @@
   "order.aftersale.notWant": "I don't want it anymore",
   "order.aftersale.detail.title": "After-sales details",
   "order.aftersale.detail.refundMoney": "Total refund amount",
-  "order.aftersale.detail.orderNo": "Service order number",
+  "order.aftersale.detail.orderNo": "Service orderid",
   "order.aftersale.detail.copy": "Copy",
   "order.aftersale.detail.applyTime": "Application time",
   "order.aftersale.detail.type": "After-sales type",
@@ -381,7 +381,7 @@
   "order.aftersale.detail.complete": "Complete",
   "order.aftersale.list.title": "After-sales List",
   "order.aftersale.list.noData": "No data yet",
-  "order.aftersale.list.orderNo": "Service order number",
+  "order.aftersale.list.orderNo": "Service orderid",
   "order.aftersale.list.cancleApply": "Cancel application",
   "order.aftersale.list.delete": "Delete",
   "order.aftersale.list.all": "all",
@@ -437,7 +437,7 @@
   "pay.rechargelog.title": "Recharge Record",
   "pay.rechargelog.payStatus": "Payment Status",
   "pay.rechargelog.payWay": "Recharge Channel",
-  "pay.rechargelog.orderNo": "Recharge order number",
+  "pay.rechargelog.orderNo": "Recharge orderid",
   "pay.rechargelog.payTime": "Recharge time",
   "pay.rechargelog.noData": "No recharge record yet",
   "pay.payresult.title": "Payment Result",
@@ -498,7 +498,7 @@
   "pay.withdrawlog.accountInfo": "Account Information",
   "pay.withdrawlog.alipay": "Alipay",
   "pay.withdrawlog.wxbalance": "WeChat change",
-  "pay.withdrawlog.orderNo": "Withdrawal order number",
+  "pay.withdrawlog.orderNo": "Withdrawal orderid",
   "pay.withdrawlog.fee": "handling fee",
   "pay.withdrawlog.applyTime": "Application time",
   "pay.withdrawlog.noData": "No withdrawal record yet",
@@ -514,7 +514,7 @@
   "pay.account.info.realname": "real name",
   "pay.account.info.enterRealname": "Please enter your real name",
   "pay.account.info.alipay": "Alipay",
-  "pay.account.info.enterAlipay": "Please enter your Alipay email/mobile phone number",
+  "pay.account.info.enterAlipay": "Please enter your Alipay email/phone number",
   "pay.account.info.save": "Save",
   "pay.account.type.withdraw": "Select a withdrawal method",
   "pay.account.type.confirm": "Confirm",
@@ -534,6 +534,7 @@
   "public.feedback.product": "Feedback on product function issues",
   "public.feedback.advice": "Suggestions and feedback",
   "public.setting.title": "System Settings",
+  "public.setting.and": "And",
   "public.setting.logout": "Logout",
   "public.feedback.version": "Current version",
   "public.feedback.session": "Local cache",
@@ -563,8 +564,8 @@
   "user.info.nickname": "nickname",
   "user.info.setNickname": "Set Nickname",
   "user.info.sex": "Gender",
-  "user.info.mobile": "Mobile phone number",
-  "user.info.bindMobile": "Please bind your mobile phone number",
+  "user.info.mobile": "phone number",
+  "user.info.bindMobile": "Please bind your phone number",
   "user.info.password": "Login password",
   "user.info.editPassword": "Change login password",
   "user.info.setPassword": "Click to set login password",
@@ -599,8 +600,8 @@
   "user.address.add": "Add address",
   "user.address.receiver": "Consignee",
   "user.address.enterReceiver": "Please fill in the name of the consignee",
-  "user.address.mobile": "Mobile phone number",
-  "user.address.enterMobile": "Please enter your mobile phone number",
+  "user.address.mobile": "phone number",
+  "user.address.enterMobile": "Please enter your phone number",
   "user.address.province": "province and city",
   "user.address.enterProvince": "Please select a province or city",
   "user.address.detail": "Detailed address",
@@ -622,8 +623,8 @@
   "user.invoice.type": "Invoice type",
   "user.invoice.realname": "name",
   "user.invoice.enterRealname": "Please enter your name (required)",
-  "user.invoice.mobile": "Mobile phone number",
-  "user.invoice.enterMobile": "Please enter your mobile phone number (required)",
+  "user.invoice.mobile": "phone number",
+  "user.invoice.enterMobile": "Please enter your phone number (required)",
   "user.invoice.company": "Unit name",
   "user.invoice.enterCompany": "Please enter the company name (required)",
   "user.invoice.taxId": "Tax ID",
@@ -663,10 +664,10 @@
   "user.wallet.score.balance": "Current points","goods.detail.reply": "Business reply",
 	"goods.detail.participate": "This product is participating",
 	"goods.detail.activity": "activity",
-	"goods.detail.param": "parameter",
+	"goods.detail.param": "Parameter",
 	"goods.detail.productParam": "product parameters",
 	"goods.detail.confirm": "Confirm",
-	"goods.detail.assure": "guarantee",
+	"goods.detail.assure": "Guarantee",
 	"goods.detail.serviceAssure": "Service Assure",
 	"goods.detail.choose": "Choose",
 	"goods.detail.chooseSpec": "Please select product specifications",
@@ -678,7 +679,7 @@
 	"goods.detail.rob": "robbed",
 	"goods.detail.collected": "Collected",
 	"goods.detail.collect": "Collection",
-	"goods.detail.service": "Customer Service",
+	"goods.detail.service": "Service",
 	"goods.detail.share": "share",
 	"goods.detail.have": "Already have",
 	"goods.detail.peoplejoin": "People participate in activities",
@@ -713,11 +714,11 @@
 	"sheep.auth.password": "password",
 	"sheep.auth.enterPassword": "enter password",
 	"sheep.auth.login": "To login",
-	"sheep.auth.changeMobile": "Change mobile phone number",
-	"sheep.auth.bindMobile": "Bind mobile phone number",
-	"sheep.auth.tipsMobile": "For the security of your account, please use your mobile phone number",
-	"sheep.auth.mobile": "Mobile phone number",
-	"sheep.auth.enterMobile": "enter mobile phone number",
+	"sheep.auth.changeMobile": "Change phone number",
+	"sheep.auth.bindMobile": "Bind phone number",
+	"sheep.auth.tipsMobile": "For the security of your account, please use your phone number",
+	"sheep.auth.mobile": "phone number",
+	"sheep.auth.enterMobile": "enter phone number",
 	"sheep.auth.code": "Verification code",
 	"sheep.auth.enterCode": "enter verification code",
 	"sheep.auth.confirm": "Confirm",
@@ -736,7 +737,7 @@
 	"sheep.auth.enterUsername": "enter username",
 	"sheep.auth.save": "save",
 	"sheep.auth.authInfo": "Authorization information",
-	"sheep.auth.tipsAuth": "Complete your avatar, nickname, and mobile phone number",
+	"sheep.auth.tipsAuth": "Complete your avatar, nickname, and phone number",
 	"sheep.auth.avatar": "avatar",
 	"sheep.auth.nickname": "nickname",
 	"sheep.auth.enterNickname": "enter a nickname",
@@ -746,8 +747,8 @@
 	"sheep.auth.resetPwd": "Reset password",
 	"sheep.auth.tipsResetPwd": "For the security of your account, please perform security verification before setting a password",
 	"sheep.auth.backLogin": "To login",
-	"sheep.auth.tipsLogin": "If you have not registered a mobile phone number, please click below to register immediately",
-	"sheep.auth.tipsRegister": "Please use your mobile phone number to complete registration",
+	"sheep.auth.tipsLogin": "If you have not registered a phone number, please click below to register immediately",
+	"sheep.auth.tipsRegister": "Please use your phone number to complete registration",
 	"sheep.auth.to": "to",
 	"sheep.auth.avalCoupon": "Coupons can be used",
 	"sheep.auth.expire": "Expiration date",
@@ -795,7 +796,7 @@
 	"sheep.auth.chooseFile": "Choose file",
 	"sheep.auth.retry": "Click to try again",
 	"sheep.auth.toBind": "To bind",
-	"sheep.auth.tipsBind": "Click to bind your mobile phone number to ensure account security",
+	"sheep.auth.tipsBind": "Click to bind your phone number to ensure account security",
 	"sheep.auth.cny": "yuan",
 	"sheep.auth.balance": "Balance",
 	"sheep.auth.point": "Points",

+ 1 - 0
locale/zh-Hans.json

@@ -533,6 +533,7 @@
 	"public.feedback.submit": "提交",
 	"public.feedback.product": "产品功能问题反馈",
 	"public.feedback.advice": "建议及意见反馈",
+	"public.setting.and": "和",
 	"public.setting.title": "系统设置",
 	"public.setting.logout": "退出登录",
 	"public.feedback.version": "当前版本",

+ 2 - 2
pages/goods/components/detail/detail-tabbar.vue

@@ -36,7 +36,7 @@
           ></image>
           <view class="item-title">{{$t('goods.detail.service')}}</view>
         </view>
-        <view
+        <!-- <view
           v-if="shareIcon"
           class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
           @tap="showShareModal"
@@ -47,7 +47,7 @@
             mode="aspectFit"
           ></image>
           <view class="item-title">{{$t('goods.detail.share')}}</view>
-        </view>
+        </view> -->
         <slot></slot>
       </view>
     </view>

+ 2 - 2
pages/goods/index.vue

@@ -35,9 +35,9 @@
                 <view class="price-text ss-m-r-16">
                   {{ state.selectedSkuPrice.price || formatPrice(state.goodsInfo.price) }}
                 </view>
-                <view class="origin-price-text" v-if="state.goodsInfo.original_price > 0">
+                <!-- <view class="origin-price-text" v-if="state.goodsInfo.original_price > 0">
                   {{ state.selectedSkuPrice.original_price || state.goodsInfo.original_price }}
-                </view>
+                </view> -->
               </view>
               <view class="sales-text">
                 {{ formatSales(state.goodsInfo.sales_show_type, state.goodsInfo.sales) }}

+ 4 - 4
pages/public/setting.vue

@@ -126,8 +126,8 @@
   }
   function onLogoff() {
     uni.showModal({
-      title: $t('public.setting.tips'),
-      content: $t('public.setting.tipsDeleteAccount'),
+      title: uni.getLocale() == 'en' ? 'tips' : '提示',
+      content: uni.getLocale() == 'en' ? 'Confirm to cancel the account?' : '确定注销账号?',
       success: async function (res) {
         if (res.confirm) {
           const { code } = await sheep.$api.user.logoff();
@@ -142,8 +142,8 @@
 
   function onLogout() {
     uni.showModal({
-      title: $t('public.setting.tips'),
-      content: $t('public.setting.tipsLogout'),
+      title: uni.getLocale() == 'en' ? 'tips' : '提示',
+      content: uni.getLocale() == 'en' ? 'Confirm to log out of your account?' : '确认退出账号?',
       success: async function (res) {
         if (res.confirm) {
           const result = await sheep.$store('user').logout();

+ 5 - 5
sheep/components/s-auth-modal/components/account-login.vue

@@ -5,11 +5,11 @@
     <view class="head-box ss-m-b-60 ss-flex-col">
       <view class="ss-flex ss-m-b-20">
         <view class="head-title ss-m-r-40 head-title-animation">{{$t('sheep.auth.accountLogin')}}</view>
-        <view class="head-title-active head-title-line" @tap="showAuthModal('smsLogin')">
+        <!-- <view class="head-title-active head-title-line" @tap="showAuthModal('smsLogin')">
           {{$t('sheep.auth.smsLogin')}}
-        </view>
+        </view> -->
       </view>
-      <view class="head-subtitle">{{$t('sheep.auth.tipsForgot')}}</view>
+      <!-- <view class="head-subtitle">{{$t('sheep.auth.tipsForgot')}}</view> -->
     </view>
 
     <!-- 表单项 -->
@@ -23,11 +23,11 @@
     >
       <uni-forms-item name="account" :label="$t('sheep.auth.account')">
         <uni-easyinput :placeholder="$t('sheep.auth.enterAccount')" v-model="state.model.account" :inputBorder="false">
-          <template v-slot:right>
+          <!-- <template v-slot:right>
             <button class="ss-reset-button forgot-btn" @tap="showAuthModal('resetPassword')">
               {{$t('sheep.auth.fotgot')}}
             </button>
-          </template>
+          </template> -->
         </uni-easyinput>
       </uni-forms-item>
 

+ 1 - 1
sheep/components/s-auth-modal/components/sms-login.vue

@@ -7,7 +7,7 @@
         <view class="head-title-active ss-m-r-40" @tap="showAuthModal('accountLogin')"
           >{{$t('sheep.auth.accountLogin')}}</view
         >
-        <view class="head-title head-title-line head-title-animation">{{$t('sheep.auth.smsLogin')}}</view>
+        <!-- <view class="head-title head-title-line head-title-animation">{{$t('sheep.auth.smsLogin')}}</view> -->
       </view>
       <view class="head-subtitle">{{$t('sheep.auth.tipsLogin')}}</view>
     </view>

+ 4 - 4
sheep/components/s-auth-modal/components/sms-register.vue

@@ -23,7 +23,7 @@
           type="number"
           :inputBorder="false"
         >
-          <template v-slot:right>
+          <!-- <template v-slot:right>
             <button
               class="ss-reset-button code-btn code-btn-start"
               :disabled="state.isMobileEnd"
@@ -32,11 +32,11 @@
             >
               {{ getSmsTimer('smsRegister') }}
             </button>
-          </template>
+          </template> -->
         </uni-easyinput>
       </uni-forms-item>
 
-      <uni-forms-item name="code" :label="$t('sheep.auth.code')">
+      <!-- <uni-forms-item name="code" :label="$t('sheep.auth.code')">
         <uni-easyinput
           :placeholder="$t('sheep.auth.enterCode')"
           v-model="state.model.code"
@@ -44,7 +44,7 @@
           type="number"
           maxlength="4"
         ></uni-easyinput>
-      </uni-forms-item>
+      </uni-forms-item> -->
 
       <uni-forms-item name="password" :label="$t('sheep.auth.password')">
         <uni-easyinput

+ 4 - 4
sheep/components/s-select-sku/s-select-sku.vue

@@ -176,24 +176,24 @@
   function onAddCart() {
     if (state.selectedSkuPrice.goods_id) {
       if (state.selectedSkuPrice.stock <= 0) {
-        sheep.$helper.toast('库存不足');
+        sheep.$helper.toast(uni.getLocale() == 'en' ? 'Inventory shortage' : '库存不足');
       } else {
         emits('addCart', state.selectedSkuPrice);
       }
     } else {
-      sheep.$helper.toast('请选择规格');
+      sheep.$helper.toast(uni.getLocale() == 'en' ? 'Please select specifications' : '请选择规格');
     }
   }
 
   function onBuy() {
     if (state.selectedSkuPrice.goods_id) {
       if (state.selectedSkuPrice.stock <= 0) {
-        sheep.$helper.toast('库存不足');
+        sheep.$helper.toast(uni.getLocale() == 'en' ? 'Inventory shortage' : '库存不足');
       } else {
         emits('buy', state.selectedSkuPrice);
       }
     } else {
-      sheep.$helper.toast('请选择规格');
+      sheep.$helper.toast(uni.getLocale() == 'en' ? 'Please select specifications' : '请选择规格');
     }
   }
   // 改变禁用状态

+ 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.eec03726.css">
+    <link rel="stylesheet" href="/h5/assets/uni.9ddc98ad.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.62158469.js"></script>
+    <script type="module" crossorigin src="/h5/assets/index.1e08ac8b.js"></script>
     <link rel="stylesheet" href="/h5/assets/index.81956fb0.css">
   </head>
   <body>