update

locale/en.json

@@ -98,7 +98,7 @@
   "chat.index.online": "Online",
   "chat.index.offline": "offline",
   "chat.index.busy": "Busy",
-  "chat.index.viewMore": "View more",
+  "chat.index.viewMore": "More",
   "chat.index.noMore": "No more",
   "chat.index.loading": "Loading...",
   "chat.index.dropped": "You have been dropped! Please come back and try again",
@@ -251,7 +251,7 @@
   "index.search.tips": "Tips",
   "index.search.sureClearHistory": "Are you sure you want to clear your search history?",
   "index.user.title": "My",
-  "common.viewMore": "View more",
+  "common.viewMore": "More",
   "order.confirm.title": "Confirm order",
   "order.confirm.delivery": "delivery method",
   "order.confirm.remark": "Order Remarks",
@@ -529,7 +529,7 @@
   "public.feedback.enterDesc": "Guest~Please describe the problem you encountered, and it is recommended to upload a photo",
   "public.feedback.contact": "Contact information",
   "public.feedback.enterContact": "Please enter your contact number",
-  "public.feedback.service": "Contact customer service",
+  "public.feedback.service": "Contact service",
   "public.feedback.submit": "Submit",
   "public.feedback.product": "Feedback on product function issues",
   "public.feedback.advice": "Suggestions and feedback",
@@ -703,13 +703,13 @@
 	"sheep.auth.login": "Quick login",
 	"sheep.auth.or": "or",
 	"sheep.auth.and": "with",
-	"sheep.auth.read": "I have read",
+	"sheep.auth.read": "I have read and agree",
 	"sheep.auth.agree": "Please check to agree",
 	"sheep.auth.accountLogin": "Account Login",
 	"sheep.auth.smsLogin": "SMS login",
 	"sheep.auth.tipsForgot": "If you have not set a password, please click Forget Password",
-	"sheep.auth.account": "account",
-	"sheep.auth.enterAccount": "enter account number",
+	"sheep.auth.account": "phone number",
+	"sheep.auth.enterAccount": "enter phone number",
 	"sheep.auth.fotgot": "Forgot",
 	"sheep.auth.password": "password",
 	"sheep.auth.enterPassword": "enter password",
@@ -794,7 +794,7 @@
 	"sheep.auth.createPoster": "Generate poster",
 	"sheep.auth.copyLink": "Copy Link",
 	"sheep.auth.cancle": "Cancel",
-	"sheep.auth.viewMore": "View More",
+	"sheep.auth.viewMore": "More",
 	"sheep.auth.chooseFile": "Choose file",
 	"sheep.auth.retry": "Click to try again",
 	"sheep.auth.toBind": "To bind",

pages/goods/index.vue

@@ -34,7 +34,12 @@
               <view class="price-box ss-flex ss-col-bottom">
                 <view class="price-text ss-m-r-16">
                   {{ state.selectedSkuPrice.price || formatPrice(state.goodsInfo.price) }}
+				  <text style="background: #ee1d5a;padding: 3px 5px;border-radius: 3px;color: #fff;font-size:11px;">
+				  			  Cash back 
+				  <text style="color:yellow;">{{ state.goodsInfo.rate }}%</text>
+				  </text>
                 </view>
+				
                 <!-- <view class="origin-price-text" v-if="state.goodsInfo.original_price > 0">
                   {{ state.selectedSkuPrice.original_price || state.goodsInfo.original_price }}
                 </view> -->

pages/goods/list.vue

@@ -110,7 +110,7 @@
       }"
       @tap="loadmore"
     />
-    <s-empty v-if="state.pagination.total === 0" icon="/static/soldout-empty.png" text="暂无商品">
+    <s-empty v-if="state.pagination.total === 0" icon="/static/soldout-empty.png" :text="$t('coupon.detail.noGoods')">
     </s-empty>
   </s-layout>
 </template>
@@ -148,32 +148,32 @@
     categoryId: 0,
     tabList: [
       {
-        name: $t('goods.list.comprehensive'),
+        name: uni.getLocale() == 'en' ? 'Comprehensive' : '综合推荐',
         value: 'weigh',
         list: [
           {
-            label: $t('goods.list.comprehensive'),
+            label: uni.getLocale() == 'en' ? 'Comprehensive' : '综合推荐',
             sort: 'weigh',
             order: 'desc',
           },
           {
-            label: $t('goods.list.priceAsc'),
+            label: uni.getLocale() == 'en' ? 'Price asc' : '价格升序',
             sort: 'price',
             order: 'asc',
           },
           {
-            label: $t('goods.list.priceDesc'),
+            label: uni.getLocale() == 'en' ? 'Price desc' : '价格降序',
             sort: 'price',
             order: 'desc',
           },
         ],
       },
       {
-        name: $t('goods.list.sale'),
+        name: uni.getLocale() == 'en' ? 'Sales' : '销量',
         value: 'total_sales',
       },
       {
-        name: $t('goods.list.newGoods'),
+        name: uni.getLocale() == 'en' ? 'New first' : '新品优先',
         value: 'createtime',
       },
     ],

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

@@ -22,7 +22,10 @@
       labelAlign="center"
     >
       <uni-forms-item name="account" :label="$t('sheep.auth.account')">
-        <uni-easyinput :placeholder="$t('sheep.auth.enterAccount')" v-model="state.model.account" :inputBorder="false">
+		  <view class="" style="display: inline-block;width: 30px;float: left;margin-top: 8px;color: #333;">
+		  			  <text>+63</text>
+		  </view>
+        <uni-easyinput :placeholder="$t('sheep.auth.enterAccount')" v-model="state.model.account" :inputBorder="false" style="float: left;width:86%;">
           <!-- <template v-slot:right>
             <button class="ss-reset-button forgot-btn" @tap="showAuthModal('resetPassword')">
               {{$t('sheep.auth.fotgot')}}

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

@@ -27,10 +27,14 @@
 	  ></uni-easyinput>
 	</uni-forms-item>
       <uni-forms-item name="mobile" :label="$t('sheep.auth.mobile')">
+		  <view class="" style="display: inline-block;width: 30px;float: left;margin-top: 8px;color: #333;">
+			  <text>+63</text>
+		  </view>
         <uni-easyinput
           :placeholder="$t('sheep.auth.enterMobile')"
           v-model="state.model.mobile"
           type="number"
+		  style="float: left;width:86%;"
           :inputBorder="false"
         >
           <template v-slot:right>

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

@@ -106,13 +106,13 @@
             >
               《{{ appInfo.user_protocol.title }}》
             </view>
-            <view class="agreement-text">{{$t('sheep.auth.and')}}</view>
+            <!-- <view class="agreement-text">{{$t('sheep.auth.and')}}</view>
             <view
               class="tcp-text"
               @tap.stop="onProtocol(appInfo.privacy_protocol.id, appInfo.privacy_protocol.title)"
             >
               《{{ appInfo.privacy_protocol.title }}》
-            </view>
+            </view> -->
           </view>
         </label>
       </view>

sheep/config/index.js

@@ -2,9 +2,9 @@
 export let baseUrl;
 export let version;
 if (process.env.NODE_ENV === 'development') {
-  baseUrl = 'http://8.217.120.52:882';//import.meta.env.SHOPRO_DEV_BASE_URL;
+  baseUrl = 'http://8.218.60.167:882';//import.meta.env.SHOPRO_DEV_BASE_URL;
 } else {
-  baseUrl = 'http://8.217.120.52:882';//import.meta.env.SHOPRO_BASE_URL;
+  baseUrl = 'http://8.218.60.167:882';//import.meta.env.SHOPRO_BASE_URL;
 }
 version = import.meta.env.SHOPRO_VERSION;
 console.log(`[Shopro ${version}]  https://www.sheepjs.com/`);

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.79134f79.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.90aa640f.js"></script>
+    <script type="module" crossorigin src="/h5/assets/index.c4b56c50.js"></script>
     <link rel="stylesheet" href="/h5/assets/index.81956fb0.css">
   </head>
   <body>