更新

src/App.vue

@@ -1,6 +1,11 @@
 <script>
 export default {
     onLaunch(options) {
+        console.log(options);
+        if (options.query && options.query.local === 'en') {
+            this.$i18n.set('en');
+            this.checkTabBar();
+        }
         wx.login({
             success: res => {
                 console.log(res);

src/locales/en.json

@@ -436,8 +436,8 @@
   "bian-hao": "Serial number",
   "chan-pin-jiao-yi-deng-ji": "Deal record",
   "chu-jing-bei-an-dan-hao": "Exit record No.",
-  "hai-guan-bian-ma": "HS code of Customs",
-  "hai-guan-bian-ma-ge-shi-cuo-wu": "Format error",
+  "hai-guan-bian-ma": "Format error for HS code",
+  "hai-guan-bian-ma-ge-shi-cuo-wu": "Format error for HS code",
   "jiao-yi-gong-si": "Deal partner",
   "jiao-yi-jia-ge": "Value",
   "jiao-yi-shi-jian": "Date of the deal",
@@ -445,12 +445,12 @@
   "jin-kou-bao-guan-dan-hao": "Customs declaration No.",
   "qing-shu-ru-10-wei-hai-guan-bian-ma": "Pls input 10-digit HS code",
   "qing-shu-ru-18-wei-bian-hao": "Pls input 18-digit code",
-  "qing-shu-ru-18-wei-shu-zi-chu-jing-bei-an-dan-hao": "Pls input 18-digit code of Exit record No.",
-  "qing-shu-ru-18-wei-shu-zi-jin-kou-bao-guan-dan-hao": "Pls input 18-digit code of Customs declaration No.",
+  "qing-shu-ru-18-wei-shu-zi-chu-jing-bei-an-dan-hao": "Format error for Exit record No.",
+  "qing-shu-ru-18-wei-shu-zi-jin-kou-bao-guan-dan-hao": "Format error for Customs declaration No.",
   "qing-shu-ru-chan-pin-xing-hao": "Pls input model",
   "qing-shu-ru-huo-zhi": "Pls input cargo value",
   "qing-shu-ru-jiao-yi-gong-si": "Pls input the deal partner",
   "qing-xuan-ze-jiao-yi-shi-jian": "Pls select date of the deal",
   "chan-pin-xu-qiu-qing-dan": "Requirement List",
-  "qing-shu-ru-18-wei-jin-jing-bei-an-dan-hao": "Pls input 18-digit code of Entry record No."
+  "qing-shu-ru-18-wei-jin-jing-bei-an-dan-hao": "Format error for Entry record No."
 }

src/locales/zh.json

@@ -447,10 +447,10 @@
   "qing-shu-ru-10-wei-hai-guan-bian-ma": "请输入10位海关编码",
   "qing-xuan-ze-jiao-yi-shi-jian": "请选择交易时间",
   "hai-guan-bian-ma-ge-shi-cuo-wu": "海关编码格式错误",
-  "qing-shu-ru-18-wei-shu-zi-jin-kou-bao-guan-dan-hao": "请输入18位数字进口报关单号",
-  "qing-shu-ru-18-wei-shu-zi-chu-jing-bei-an-dan-hao": "请输入18位数字出境备案单号",
+  "qing-shu-ru-18-wei-shu-zi-jin-kou-bao-guan-dan-hao": "进口报关单号格式错误",
+  "qing-shu-ru-18-wei-shu-zi-chu-jing-bei-an-dan-hao": "出境备案单号格式错误",
   "qing-shu-ru-huo-zhi": "请输入货值",
   "jin-jing-bei-an-dan-hao": "进境备案单号",
   "chan-pin-xu-qiu-qing-dan": "产品交易登记",
-  "qing-shu-ru-18-wei-jin-jing-bei-an-dan-hao": "请输入18位进境备案单号"
+  "qing-shu-ru-18-wei-jin-jing-bei-an-dan-hao": "进境备案单号格式错误"
 }

src/main.js

@@ -41,7 +41,7 @@ Vue.i18n.set('zh');
 
 Vue.prototype.$store = store;
 
-Vue.prototype.$toast = function (title, icon) {
+Vue.prototype.$toast = function(title, icon) {
     if (!icon) {
         icon = 'none';
     }

src/pages/Home.vue

@@ -372,10 +372,7 @@ export default {
         }
     },
     onLoad(options) {
-        if (options.local === 'en') {
-            this.$i18n.set('en');
-            this.checkTabBar();
-        }
+       
         this.$nextTick(() => {
             getBanner('HOME', !this.isChinese).then(res => {
                 console.log(res);

src/pagesMine/ProductsTransactionEdit.vue

@@ -273,10 +273,8 @@ export default {
                 this.form.chName &&
                 this.form.brand &&
                 this.form.introduction &&
+                this.form.productCategoryId &&
                 this.form.applicationField.length > 0 &&
-                this.form.exitRecordNumber &&
-                this.form.importDeclarationNumber &&
-                this.form.entryRecordNumber &&
                 this.form.customsHsCode &&
                 this.form.price &&
                 this.form.transactionTime &&
@@ -347,17 +345,17 @@ export default {
                 return;
             }
 
-            if (!form.entryRecordNumber || !/[0-9]{18}/g.test(form.entryRecordNumber)) {
+            if (form.entryRecordNumber && !/[0-9]{18}/g.test(form.entryRecordNumber)) {
                 this.toast(this.$t('qing-shu-ru-18-wei-jin-jing-bei-an-dan-hao'));
                 return;
             }
 
-            if (!form.importDeclarationNumber || !/[0-9]{18}/g.test(form.importDeclarationNumber)) {
+            if (form.importDeclarationNumber && !/[0-9]{18}/g.test(form.importDeclarationNumber)) {
                 this.toast(this.$t('qing-shu-ru-18-wei-shu-zi-jin-kou-bao-guan-dan-hao'));
                 return;
             }
 
-            if (!form.exitRecordNumber || !/[0-9]{18}/g.test(form.exitRecordNumber)) {
+            if (form.exitRecordNumber && !/[0-9]{18}/g.test(form.exitRecordNumber)) {
                 this.toast(this.$t('qing-shu-ru-18-wei-shu-zi-chu-jing-bei-an-dan-hao'));
                 return;
             }