2 Commits fb7dbce276 ... 771c1d6c54

Author SHA1 Message Date
  Mcal 771c1d6c54 Merge branch 'lyz_dev' of http://1.94.207.143:3000/chongqing/store-admin into lyz_dev 1 week ago
  Mcal 11998f9c69 fix:店铺改成百分比模式 1 week ago
5 changed files with 16 additions and 13 deletions
  1. 3 3
      src/locales/en.json
  2. 3 3
      src/locales/ru.json
  3. 3 3
      src/locales/sr.json
  4. 2 2
      src/locales/zh.json
  5. 5 2
      src/views/store/list.vue

+ 3 - 3
src/locales/en.json

@@ -279,11 +279,11 @@
   },
   "storeList": {
     "list": {
-      "serviceFeeRequired": "Service fee is required",
+      "serviceFeeRequired": "Service fee cannot be empty",
       "serviceFee": "Service Fee",
       "pleaseEnterServiceFee": "Please enter the service fee",
-            "serviceFeeMustBeNumber": "Service fee must be a number",
-      "serviceFeeRangeError": "Service fee must be between 0 and 1",
+      "serviceFeeMustBeNumber": "Service fee must be a number",
+      "serviceFeeRangeError": "Service fee must be between 0 and 100",
       "storeName": "Store Name",
       "pleaseEnterStoreName": "Please enter the store name",
       "status": "Status",

+ 3 - 3
src/locales/ru.json

@@ -266,11 +266,11 @@
 
       "storeList": {
         "list": {
-          "serviceFeeRequired":"Стоимость услуги обязательна",
+          "serviceFeeRequired": "Стоимость услуги не может быть пустой",
           "serviceFee": "Стоимость услуги",
           "pleaseEnterServiceFee": "Пожалуйста, введите стоимость услуги",
-                "serviceFeeMustBeNumber": "Стоимость услуги должна быть числом",
-      "serviceFeeRangeError": "Стоимость услуги должна быть между 0 и 1",
+          "serviceFeeMustBeNumber": "Стоимость услуги должна быть числом",
+          "serviceFeeRangeError": "Стоимость услуги должна быть между 0 и 100",
           "storeName": "Название магазина",
           "pleaseEnterStoreName": "Пожалуйста, введите название магазина",
           "status": "Статус",

+ 3 - 3
src/locales/sr.json

@@ -335,11 +335,11 @@
 
   "storeList": {
     "list": {
-      "serviceFeeRequired":"Cena usluge je obavezna",
+      "serviceFeeRequired": "Cena usluge ne sme biti prazna",
       "serviceFee": "Cena usluge",
       "pleaseEnterServiceFee": "Molimo, unesite cenu usluge",
-            "serviceFeeMustBeNumber": "Cena usluge mora biti broj",
-      "serviceFeeRangeError": "Cena usluge mora biti između 0 i 1",
+      "serviceFeeMustBeNumber": "Cena usluge mora biti broj",
+      "serviceFeeRangeError": "Service fee must be between 0 and 100",
       "storeName": "Ime prodavnice",
       "pleaseEnterStoreName": "Unesite ime prodavnice",
       "status": "Status",

+ 2 - 2
src/locales/zh.json

@@ -275,11 +275,11 @@
   },
   "storeList":{
     "list":{
-      "serviceFeeRequired":"服务费是必需的",
+      "serviceFeeRequired":"服务费不能为空",
       "serviceFee": "服务费",
       "pleaseEnterServiceFee": "请输入服务费",
       "serviceFeeMustBeNumber": "服务费必须是数字",
-      "serviceFeeRangeError": "服务费必须在 0 到 1 之间",
+      "serviceFeeRangeError": "服务费必须在 0 到 100 之间",
       "storeName": "店铺名称",
       "pleaseEnterStoreName": "请输入店铺名称",
       "status": "状态",

+ 5 - 2
src/views/store/list.vue

@@ -243,7 +243,9 @@
                   v-model="form.serviceFeeRate"
                   :placeholder="$t('storeList.list.pleaseEnterServiceFee')"
                   maxlength="30"
-                />
+                >
+                <template slot="append">%</template>
+              </el-input>
               </el-form-item>
             </el-col>
             </el-row>
@@ -644,7 +646,7 @@ export default {
             validator: (rule, value, callback) => {
               if (isNaN(value)) {
                 callback(new Error(this.$t('storeList.list.serviceFeeMustBeNumber')));
-              } else if (value < 0 || value > 1) {
+              } else if (value < 0 || value > 100) {
                 callback(new Error(this.$t('storeList.list.serviceFeeRangeError')));
               } else {
                 callback();
@@ -751,6 +753,7 @@ export default {
     submitForm: function () {
         this.$refs['form'].validate((valid) => {
             if (valid) {
+              this.form.serviceFeeRate = (this.form.serviceFeeRate / 100).toFixed(2)
                 if (this.form.id) {
                     saveStore(this.form).then((response) => {
                         this.$modal.msgSuccess(this.$t('storeList.list.modifySuccess'));