update

locale/en.json

@@ -719,9 +719,11 @@
 	"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.code": "Verify code",
+	"sheep.auth.enterCode": "enter verify code",
 	"sheep.auth.confirm": "Confirm",
+	"sheep.auth.inviteCode": "Invite code",
+	"sheep.auth.enterInviteCode": "enter invite code",
 	"sheep.auth.useWxmobile": "Use WeChat mobile number",
 	"sheep.auth.updatePassword": "Change password",
 	"sheep.auth.tipsUpdatePassword": "If the password is lost or not set, please click Forgot Password to reset it",

locale/zh-Hans.json

@@ -714,6 +714,8 @@
 	"sheep.auth.fotgot": "忘记密码",
 	"sheep.auth.password": "密码",
 	"sheep.auth.enterPassword": "请输入密码",
+	"sheep.auth.inviteCode": "邀请码",
+	"sheep.auth.enterInviteCode": "请输入邀请码",
 	"sheep.auth.login": "登录",
 	"sheep.auth.changeMobile": "更换手机号",
 	"sheep.auth.bindMobile": "绑定手机号",

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

@@ -16,6 +16,16 @@
       labelWidth="140"
       labelAlign="center"
     >
+	
+	<uni-forms-item name="invite_code" :label="$t('sheep.auth.inviteCode')">
+	  <uni-easyinput
+	    :placeholder="$t('sheep.auth.enterInviteCode')"
+	    v-model="state.model.invite_code"
+	    :inputBorder="false"
+	    type="text"
+	    maxlength="6"
+	  ></uni-easyinput>
+	</uni-forms-item>
       <uni-forms-item name="mobile" :label="$t('sheep.auth.mobile')">
         <uni-easyinput
           :placeholder="$t('sheep.auth.enterMobile')"
@@ -23,7 +33,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 +42,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 +54,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
@@ -89,6 +99,7 @@
   const state = reactive({
     isMobileEnd: false, // 手机号输入完毕
     model: {
+		invite_code: '',
       mobile: '', // 手机号
       code: '', // 验证码
       password: '', // 密码

sheep/components/s-goods-column/s-goods-column.vue

@@ -120,7 +120,13 @@
         </view>
 
         <view class="ss-m-t-16 ss-flex ss-col-center ss-flex-wrap">
-          <view class="sales-text">{{ salesAndStock }}</view>
+          <view class="sales-text" style="margin-left: -12px;">
+		  <text style="padding-right: 5px;">{{ salesAndStock }}</text>
+		  <text style="background: #ee1d5a;padding: 3px 5px;border-radius: 3px;color: #fff;">
+			  Cash back 
+		  <text style="color:yellow;">{{ data.rate }}%</text>
+		  </text>
+		  </view>
         </view>
       </view>
 

sheep/components/s-share-modal/canvas-poster/index.vue

@@ -10,7 +10,7 @@
           width: poster.width + 'px',
         }"
       >
-        海报加载中...
+        Loading...
       </view>
       <image
         v-else
@@ -38,8 +38,8 @@
         <button class="save-btn ss-reset-button ui-BG-Main" @tap="onSavePoster">
           {{
             ['wechatOfficialAccount', 'H5'].includes(sheep.$platform.name)
-              ? '长按图片保存'
-              : '保存图片'
+              ? 'Long press to save picture'
+              : 'Save picture'
           }}
         </button>
       </view>
@@ -77,7 +77,7 @@
   };
   const onSavePoster = () => {
     if (['WechatOfficialAccount', 'H5'].includes(sheep.$platform.name)) {
-      sheep.$helper.toast('请长按图片保存');
+      sheep.$helper.toast('Long press to save picture');
       return;
     }
 
@@ -85,10 +85,10 @@
       filePath: poster.src,
       success: (res) => {
         onClosePoster();
-        sheep.$helper.toast('保存成功');
+        sheep.$helper.toast('save success');
       },
       fail: (err) => {
-        sheep.$helper.toast('保存失败');
+        sheep.$helper.toast('save failed');
         console.log('图片保存失败:', err);
       },
     });

sheep/helper/index.js

@@ -655,10 +655,10 @@ export function copyText(text) {
   uni.setClipboardData({
     data: text,
     success: function () {
-      toast('复制成功!');
+      toast('copy success!');
     },
     fail: function () {
-      toast('复制失败!');
+      toast('copy failed!');
     },
   });
   // #endif
@@ -670,7 +670,7 @@ export function copyText(text) {
   document.execCommand('Copy');
   createInput.className = 'createInput';
   createInput.style.display = 'none';
-  toast('复制成功');
+  toast('copy success');
   // #endif
 }
 

sheep/hooks/useModal.js

@@ -75,10 +75,10 @@ export function getSmsCode(event, mobile = '') {
     return;
   }
 
-  if (!test.mobile(mobile)) {
-    $helper.toast(uni.getLocale() == 'en' ? 'Mobile phone number format is incorrect' : '手机号码格式不正确');
-    return;
-  }
+  // if (!test.mobile(mobile)) {
+  //   $helper.toast(uni.getLocale() == 'en' ? 'Mobile phone number format is incorrect' : '手机号码格式不正确');
+  //   return;
+  // }
   const changeEvent = {
     changeMobile: 'changemobile',
     smsLogin: 'mobilelogin',

sheep/ui/su-coupon/su-coupon.vue

@@ -110,8 +110,8 @@
   // 数据
   const state = reactive({
     stateMap: {
-      0: '立即领取',
-      1: '去使用',
+      0: 'get it',
+      1: 'to use',
     },
   });
 
@@ -147,7 +147,7 @@
     },
     title: {
       type: String,
-      default: '这是优惠券',
+      default: 'coupon',
     },
     value: {
       type: [Number, String],

sheep/ui/su-data-checkbox/su-data-checkbox.vue

@@ -193,7 +193,7 @@
       },
       emptyText: {
         type: String,
-        default: '暂无数据',
+        default: 'no data',
       },
       disabled: {
         type: Boolean,
@@ -242,9 +242,9 @@
         dataList: [],
         range: [],
         contentText: {
-          contentdown: '查看更多',
+          contentdown: 'more',
           contentrefresh: uni.getLocale() == 'en' ? 'Loading' : '加载中',
-          contentnomore: '没有更多',
+          contentnomore: 'no more',
         },
         isLocal: true,
         styles: {

sheep/ui/su-dialog/su-dialog.vue

@@ -109,10 +109,10 @@
     },
     computed: {
       okText() {
-        return this.confirmText || '确认';
+        return this.confirmText || 'confirm';
       },
       closeText() {
-        return this.cancelText || '取消';
+        return this.cancelText || 'cancel';
       },
       placeholderText() {
         return this.placeholder || '';

sheep/ui/su-image/su-image.vue

@@ -108,7 +108,7 @@
       urls: props.previewList.length < 1 ? [props.src] : props.previewList,
       current: props.current,
       longPressActions: {
-        itemList: ['发送给朋友', '保存图片', '收藏'],
+        itemList: ['send to friend', 'save picture', 'collect'],
         success: function (data) {
           console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
         },

sheep/ui/su-region-picker/su-region-picker.vue

@@ -6,7 +6,7 @@
         :confirmColor="confirmColor"
         :cancelText="cancelText"
         :confirmText="confirmText"
-        title="选择区域"
+        title="choose area"
         @cancel="onCancel"
         @confirm="onConfirm('confirm')"
       ></su-toolbar>
@@ -77,12 +77,12 @@
     // 取消按钮的文字
     cancelText: {
       type: String,
-      default: '取消',
+      default: 'cancel',
     },
     // 确认按钮的文字
     confirmText: {
       type: String,
-      default: '确认',
+      default: 'confirm',
     },
   });
   const areaData = uni.getStorageSync('areaData');

sheep/validate/form.js

@@ -13,9 +13,9 @@ export const mobile = {
     },
     {
       validateFunction: function (rule, value, data, callback) {
-        if (!test.mobile(value)) {
-          callback(uni.getLocale() == 'en' ? 'Mobile phone number format is incorrect' : '手机号码格式不正确');
-        }
+        // if (!test.mobile(value)) {
+        //   callback(uni.getLocale() == 'en' ? 'Mobile phone number format is incorrect' : '手机号码格式不正确');
+        // }
         return true;
       },
     },

unpackage/dist/build/h5/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <link rel="stylesheet" href="/h5/assets/uni.9ddc98ad.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.1e08ac8b.js"></script>
+    <script type="module" crossorigin src="/h5/assets/index.90aa640f.js"></script>
     <link rel="stylesheet" href="/h5/assets/index.81956fb0.css">
   </head>
   <body>