diff --git a/src/App.vue b/src/App.vue
index ec9032c1c638e918ec97e413aa081993a95048f4..dd950d155e3c6fe0a957cc98ff73888b50c6515d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,6 +6,9 @@
 
 <script>
 export default {
-  name: 'App'
+  name: 'App',
+  mounted(){
+    document.title = this.$t('router.title')
+  }
 }
 </script>
diff --git a/src/api/distribution.js b/src/api/distribution.js
index e32aa1929785534eec753c4aa63aecd9fb7356c7..1d6594ec76f9f18b4f403362a7f8945b2dc0a5ac 100644
--- a/src/api/distribution.js
+++ b/src/api/distribution.js
@@ -10,6 +10,14 @@ export function login(data) {
   })
 }
 
+// export function getCoin(data={}) {
+// 	return request({
+// 		url: '/coupon/activity/rule/query',
+// 		method: 'post',
+// 		data
+// 	})
+// }
+
 
 export function getMenulist(data={}) {
   return request({
@@ -54,7 +62,7 @@ export function personList(data={}) {
 
 export function excelDown(data={}) {
   return request({
-    url: '/excel/download',
+    url: '/member/importMemberInFoFile',
     method: 'post',
     data,
     responseType: 'blob',
@@ -222,6 +230,8 @@ export function importExcel (headers = {}, data={}) {
   })
 }
 
+
+
 // 更新餐厅状态或删除
 export function updateStatus (data={}) {
   return request({
@@ -326,3 +336,13 @@ export function getMsg (data={}) {
     data
   })
 }
+
+
+//校验排序
+export function checkSort (data={}) {
+  return request({
+    url: '/distributor/checkGoodsSort',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/components/addTabs.vue b/src/components/addTabs.vue
index f62ae85790615a7bc9f7dc7fe6e6f343e4c9721f..8f472aa0f4480d6f2b4490a87396c6d08577ad8c 100644
--- a/src/components/addTabs.vue
+++ b/src/components/addTabs.vue
@@ -111,4 +111,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/createdUser/index.vue b/src/components/createdUser/index.vue
index 594ed97307b20dcf028a21fc191dacec3829fb4f..f19b6a64d1b290fefc92ab06dad38bf9288b31cc 100644
--- a/src/components/createdUser/index.vue
+++ b/src/components/createdUser/index.vue
@@ -8,7 +8,7 @@
     <el-button :type="activeIndex == 1 ? 'primary' : ''" @click="changeIndex(1)">{{$t('addUser.au2')}}</el-button>
     <div class="step-view">
       <restaurant-user v-if="activeIndex == 0" :formData="legalInfo" @next="submitUserData"/>
-      <restaurant-info v-if="activeIndex == 1" @submit="createUserData"/>
+      <restaurant-info v-if="activeIndex == 1" :country='countryMsg' @submit="createUserData"/>
       <!-- <div class="step-button">
         <el-button type="primary" @click="nextStepHandle">{{activeIndex == 1 ? '确定并生成账号' : '下一步'}}</el-button>
       </div> -->
@@ -29,7 +29,8 @@ export default {
   data () {
     return {
       activeIndex: 0,
-      legalInfo: {}
+      legalInfo: {},
+      countryMsg: ''
     }
   },
   computed: {
@@ -37,17 +38,17 @@ export default {
   },
   methods: {
     changeIndex (index) {
-      if (index == 1 && Object.keys(this.legalInfo).length <= 0) {
-        let that = this;
-        this.$confirm(that.$t('addUser.au3'), that.$t('addUser.au4'), {
-          confirmButtonText: that.$t('addUser.au5'),
-          cancelButtonText: that.$t('addUser.au6'),
-          type: 'warning'
-        }).then(() => {
+      // if (index == 1 && Object.keys(this.legalInfo).length <= 0) {
+      //   let that = this;
+      //   this.$confirm(that.$t('addUser.au3'), that.$t('addUser.au4'), {
+      //     confirmButtonText: that.$t('addUser.au5'),
+      //     cancelButtonText: that.$t('addUser.au6'),
+      //     type: 'warning'
+      //   }).then(() => {
 
-        }).catch(err => {})
-        return
-      };
+      //   }).catch(err => {})
+      //   return
+      // };
       this.activeIndex = index;
     },
     nextStepHandle () {
@@ -55,8 +56,8 @@ export default {
     },
     submitUserData (userData) {
       this.legalInfo = userData;
+      this.countryMsg = this.legalInfo.country
       this.changeIndex(this.activeIndex + 1);
-      console.log(userData);
     },
     async createUserData (data) {
       try {
@@ -76,7 +77,6 @@ export default {
         )
         if (result) {
           let item = result.data[0];
-          console.log(item);
           const h = this.$createElement;
           let that = this;
           this.$msgbox({
diff --git a/src/components/createdUser/restaurantInfo.vue b/src/components/createdUser/restaurantInfo.vue
index 0a5ce6fa6ef9d4bae0f68b3c840294d04b1a2bd5..a82a34d585b2f4168822627c97e08df43e4536b9 100644
--- a/src/components/createdUser/restaurantInfo.vue
+++ b/src/components/createdUser/restaurantInfo.vue
@@ -1,224 +1,261 @@
-<template>
-  <div class="restaurant-info">
-    <el-form ref="restaurantForm" :model="form" :rules="rules" label-width="130px">
-      <el-form-item :label="$t('restaurantInfo.ri1')" prop="restaurantName">
-        <el-input v-model="form.restaurantName"></el-input>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri2')" prop="restaurantType">
-        <el-input v-model="form.restaurantType"></el-input>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri3')">
-        <!-- :disabled ="fileLogoList.length > 0" -->
-        <el-upload
-          :action="uploadFile"
-          list-type="picture-card"
-          :on-success="uploadLogo"
-          :file-list="fileLogoList"
-          :on-remove="handleLogoRemove"
-        >
-        <!-- v-if="fileLogoList.length <= 0" -->
-          <i class="el-icon-plus"></i>
-        </el-upload>
-      </el-form-item>
-      <el-divider content-position="left">{{$t('restaurantInfo.ri4')}}</el-divider>
-      <el-form-item :label="$t('restaurantInfo.ri5')" prop="country">
-        <el-select v-model="form.country" :placeholder="$t('restaurantInfo.ri6')">
-          <el-option
-            v-for="item in countryList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri7')" prop="province">
-        <el-input v-model="form.province"></el-input>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri8')" prop="city">
-        <el-input v-model="form.city"></el-input>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri9')" prop="street">
-        <el-input v-model="form.street"></el-input>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.rin9')" prop="street">
-        <el-input v-model="form.restaurantAddr"></el-input>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri10')" prop="restaurantPhone">
-        <!-- type="number" -->
-        <el-input v-model="form.restaurantPhone"></el-input>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri11')" prop="email">
-        <el-input v-model="form.email"></el-input>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri12')" prop="industry">
-        <el-input v-model="form.industry"></el-input>
+<template>
+  <div class="restaurant-info">
+    <el-form ref="restaurantForm" :model="form" :rules="rules" label-width="200px">
+      <el-form-item :label="$t('restaurantInfo.ri1')" prop="restaurantName">
+        <el-input v-model="form.restaurantName"></el-input>
+      </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri2')" prop="restaurantType">
+        <el-input v-model="form.restaurantType"></el-input>
+      </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri3')">
+        <!-- :disabled ="fileLogoList.length > 0" -->
+        <el-upload
+          :action="uploadFile"
+          list-type="picture-card"
+          :on-success="uploadLogo"
+          :file-list="fileLogoList"
+          :on-remove="handleLogoRemove"
+        >
+        <!-- v-if="fileLogoList.length <= 0" -->
+          <i class="el-icon-plus"></i>
+        </el-upload>
+      </el-form-item>
+      <el-divider content-position="left">{{$t('restaurantInfo.ri4')}}</el-divider>
+      <el-form-item :label="$t('restaurantInfo.ri5')" prop="country" >
+        <el-select v-model="form.country" :placeholder="$t('restaurantInfo.ri6')" @change="getTimeZoneData">
+          <el-option
+            v-for="item in countryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+    <!-- 时区 -->
+      <el-form-item :label="$t('restaurantInfo.ri59')" prop="timeZone" >
+        <el-select v-model="form.timeZone" :placeholder="$t('restaurantInfo.ri60')">
+          <el-option
+            v-for="item in timeZoneData"
+            :key="item.zoneName"
+            :label="item.zoneName"
+            :value="item.zoneName">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item :label="$t('restaurantInfo.ri7')" prop="province">
+        <el-input v-model="form.province"></el-input>
+      </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri8')" prop="city">
+        <el-input v-model="form.city"></el-input>
+      </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri9')" prop="street">
+        <el-input v-model="form.street"></el-input>
+      </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.rin9')" prop="street">
+        <el-input v-model="form.restaurantAddr"></el-input>
+      </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri10')" prop="restaurantPhone">
+        <!-- type="number" -->
+        <el-input v-model="form.restaurantPhone"></el-input>
+      </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri11')" prop="email">
+        <el-input v-model="form.email"></el-input>
+      </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri12')" prop="industry">
+        <el-input v-model="form.industry"></el-input>
       </el-form-item>
       <el-form-item label="restaurantId:">
-        <el-input v-model="form.restaurantId" placeholder="super-menu"></el-input>
+        <el-input v-model="form.superMenuId" placeholder="super-menu"></el-input>
       </el-form-item>
       <el-form-item label="password:">
-        <el-input v-model="form.password" placeholder="super-menu"></el-input>
+        <el-input v-model="form.superMenuPwd" placeholder="super-menu"></el-input>
       </el-form-item>
       <el-form-item label="shopCode:">
         <el-input v-model="form.shopCode" placeholder="posCube"></el-input>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri13')">
-        <el-input v-model="form.taxRate" placeholder=""></el-input>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri14')">
-        <el-input v-model="form.tip" placeholder=""></el-input>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri15')">
-        <el-select v-model="weekTime" multiple  :placeholder="$t('restaurantInfo.ri16')" @change="selectWeek">
-          <el-option
-            v-for="item in weekList"
-            :key="item.name"
-            :label="item.label"
-            :value="item.name">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <template v-if="weekTime">
-        <el-form-item :label="item.week + '：'" v-for="(item, i) in weekData" :key="item.code">
-          <!-- {{item}} -->
-          <div class="tag-item">
-            <el-tag
-              :key="index"
-              v-for="(tag, index) in item.detail"
-              closable
-              :disable-transitions="true"
-              @click="edidWeekTime(item, index)"
-              @close="removeWeekTime(item, index)">
-              {{filterType(tag.type)}} {{tag.time}}
-            </el-tag>
-            <el-select v-model="item.type" :placeholder="$t('restaurantInfo.ri16')" v-if="item.showInput">
-              <el-option
-                v-for="item in timeType"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-            <el-input
-              class="input-new-tag"
-              v-if="item.showInput"
-              v-model="item.inputValue"
-              :ref="'weekItem' + i"
-              @keyup.enter.native="addWekkTime(item, i)"
-              @blur="addWekkTime(item, i)"
-            >
-            </el-input>
-            <el-button class="button-new-tag" @click="item.showInput = true;">+ {{$t('restaurantInfo.ri16')}}</el-button>
-          </div>
-        </el-form-item>
-      </template>
-      <!-- <el-form-item label="餐厅营业时间：">
-        <div class="tag-item">
-          <el-tag
-            :key="index"
-            v-for="(tag, index) in week.list"
-            closable
-            :disable-transitions="false"
-            @close="handleClose(week, index)">
-            {{tag.weekName}}
-          </el-tag>
-          <el-input
-            class="input-new-tag"
-            v-if="week.showInput"
-            v-model="week.inputValue"
-            ref="week"
-            @keyup.enter.native="handleInputConfirm(week)"
-            @blur="handleInputConfirm(week)"
-          >
-          </el-input>
-          <el-button v-else class="button-new-tag" @click="showInput(week, week.name)">+ 增加</el-button>
-        </div>
-      </el-form-item>
-      <el-form-item :label="formItem.weekName" v-for="(formItem, i) in week.list" :key="i">
-        <div class="tag-item">
-          <el-tag
-            :key="index"
-            v-for="(tag, index) in formItem.list"
-            closable
-            :disable-transitions="false"
-            @close="handleClose(formItem, index)">
-            {{filterType(tag.type)}} {{tag.time}}
-          </el-tag>
-           <el-select v-model="formItem.type" placeholder="请选择"  v-if="formItem.showInput">
-            <el-option
-              v-for="item in timeType"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-          <el-input
-            class="input-new-tag"
-            v-if="formItem.showInput"
-            v-model="formItem.inputValue"
-            :ref="'weekItem' + i"
-            @keyup.enter.native="handleWeekConfirm(formItem, i)"
-            @blur="handleWeekConfirm(formItem, i)"
-          >
-          </el-input>
-          <el-button v-else class="button-new-tag" @click="showInput(formItem, 'weekItem' + i, true)">+ 增加</el-button>
-        </div>
-      </el-form-item> -->
-      <el-form-item :label="$t('restaurantInfo.ri17')">
-        <el-input v-model="form.story" type="textarea"></el-input>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri18')">
-        <el-upload
-          :action="uploadFile"
-          list-type="picture-card"
-          multiple
-          :limit="9"
-          :before-upload="handleBeforeUpload"
-          :on-preview="handlePictureCardPreview"
-          :on-exceed="handelExceed"
-          :on-remove="handleRemove"
-          :on-success="updateSuccess"
-          :file-list="fileList"
-        >
-          <i class="el-icon-plus"></i>
-        </el-upload>
-        <!-- <span class="image-tip">（最多添加9张餐厅环境图 尺寸：500 X500px  大小在2M以内）</span> -->
-        <el-dialog :visible.sync="showDialog">
-          <img width="100%" :src="dialogImageUrl" alt="">
-        </el-dialog>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri19')" prop="baseLang">
-        <el-select v-model="form.baseLang" :placeholder="$t('restaurantInfo.ri6')" clearable>
-          <el-option
-            v-for="item in langList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri20')">
-        <el-select v-model="form.international" multiple :placeholder="$t('restaurantInfo.ri6')">
-          <el-option
-            v-for="item in langList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
       </el-form-item>
+       <el-form-item label="payeezyToken:">
+        <el-input v-model="form.payeezyToken" placeholder="payeezyToken"></el-input>
+      </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri13')">
+        <el-input v-model="form.taxRate" placeholder=""></el-input>
+      </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri14')">
+        <el-input v-model="form.tip" placeholder=""></el-input>
+      </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri15')">
+        <el-select v-model="weekTime" multiple  :placeholder="$t('restaurantInfo.ri16')" @change="selectWeek">
+          <el-option
+            v-for="item in weekList"
+            :key="item.name"
+            :label="item.label"
+            :value="item.name">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <template v-if="weekTime">
+        <el-form-item :label="item.week" v-for="(item, i) in weekData" :key="item.code">
+          <!-- {{item}} -->
+          <div class="tag-item">
+            <el-tag
+              :key="index"
+              v-for="(tag, index) in item.detail"
+              closable
+              :disable-transitions="true"
+              @click="edidWeekTime(item, index)"
+              @close="removeWeekTime(item, index)">
+              {{filterType(tag.type)}} {{tag.time}}
+            </el-tag>
+            <el-select v-model="item.type" :placeholder="$t('restaurantInfo.ri16')" v-if="item.showInput">
+              <el-option
+                v-for="item in timeType"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+            <el-input
+              class="input-new-tag"
+              v-if="item.showInput"
+              v-model="item.inputValue"
+              :ref="'weekItem' + i"
+              @keyup.enter.native="addWekkTime(item, i)"
+              @blur="addWekkTime(item, i)"
+            >
+            </el-input>
+            <el-button class="button-new-tag" @click="item.showInput = true;">+ {{$t('restaurantInfo.ri16')}}</el-button>
+          </div>
+        </el-form-item>
+      </template>
+      <!-- <el-form-item label="餐厅营业时间：">
+        <div class="tag-item">
+          <el-tag
+            :key="index"
+            v-for="(tag, index) in week.list"
+            closable
+            :disable-transitions="false"
+            @close="handleClose(week, index)">
+            {{tag.weekName}}
+          </el-tag>
+          <el-input
+            class="input-new-tag"
+            v-if="week.showInput"
+            v-model="week.inputValue"
+            ref="week"
+            @keyup.enter.native="handleInputConfirm(week)"
+            @blur="handleInputConfirm(week)"
+          >
+          </el-input>
+          <el-button v-else class="button-new-tag" @click="showInput(week, week.name)">+ 增加</el-button>
+        </div>
+      </el-form-item>
+      <el-form-item :label="formItem.weekName" v-for="(formItem, i) in week.list" :key="i">
+        <div class="tag-item">
+          <el-tag
+            :key="index"
+            v-for="(tag, index) in formItem.list"
+            closable
+            :disable-transitions="false"
+            @close="handleClose(formItem, index)">
+            {{filterType(tag.type)}} {{tag.time}}
+          </el-tag>
+           <el-select v-model="formItem.type" placeholder="请选择"  v-if="formItem.showInput">
+            <el-option
+              v-for="item in timeType"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+          <el-input
+            class="input-new-tag"
+            v-if="formItem.showInput"
+            v-model="formItem.inputValue"
+            :ref="'weekItem' + i"
+            @keyup.enter.native="handleWeekConfirm(formItem, i)"
+            @blur="handleWeekConfirm(formItem, i)"
+          >
+          </el-input>
+          <el-button v-else class="button-new-tag" @click="showInput(formItem, 'weekItem' + i, true)">+ 增加</el-button>
+        </div>
+      </el-form-item> -->
+      <el-form-item :label="$t('restaurantInfo.ri17')">
+        <el-input v-model="form.story" type="textarea"></el-input>
+      </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri18')">
+        <el-upload
+          :action="uploadFile"
+          list-type="picture-card"
+          multiple
+          :limit="9"
+          :before-upload="handleBeforeUpload"
+          :on-preview="handlePictureCardPreview"
+          :on-exceed="handelExceed"
+          :on-remove="handleRemove"
+          :on-success="updateSuccess"
+          :file-list="fileList"
+        >
+          <i class="el-icon-plus"></i>
+        </el-upload>
+        <!-- <span class="image-tip">（最多添加9张餐厅环境图 尺寸：500 X500px  大小在2M以内）</span> -->
+        <el-dialog :visible.sync="showDialog">
+          <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+      </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri19')" prop="baseLang">
+        <el-select v-model="form.baseLang" :placeholder="$t('restaurantInfo.ri6')" clearable>
+          <el-option
+            v-for="item in langList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri20')" prop="international">
+        <el-select v-model="form.international" multiple :placeholder="$t('restaurantInfo.ri6')">
+          <el-option
+            v-for="item in langList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <!-- 是否支持红包活动 -->
+      <div class="button-printer" v-if="coinTab">
+        <el-form-item :label="$t('restaurantInfo.ri55')">
+          <el-switch
+            v-model="form.isCoin"
+            active-color="#13ce66"
+            inactive-color="#ff4949">
+          </el-switch>
+        </el-form-item>
+      </div>
+      <el-form-item :label="$t('restaurantInfo.ri56')" prop="activeRuler" v-if="form.isCoin && source == 1">
+        <el-select v-model="form.activeRuler" :placeholder="$t('restaurantInfo.ri6')" clearable>
+          <el-option
+            v-for="item in rulerList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <!-- 打印机模块 -->
       <div class="button-printer" v-if="btnPrinterTab">
         <el-form-item :label="$t('restaurantInfo.ri47')">
           <el-switch
-            v-model="form.supportPrinter"
+            v-model="form.printer"
             active-color="#13ce66"
             inactive-color="#ff4949">
           </el-switch>
         </el-form-item>
-        <el-button v-if="form.supportPrinter" class="add-printer" type="primary" @click="addPrinter">+</el-button>
+        <el-button v-if="form.printer" class="add-printer" type="primary" @click="addPrinter">+</el-button>
       </div>
-      <el-table :data="printerMsg" class="table-printer" v-if="form.supportPrinter">
-        <el-table-column :label="$t('restaurantInfo.ri49')">
+
+      <el-table :data="printerMsg" class="table-printer" v-if="form.printer">
+        <el-table-column :label="$t('restaurantInfo.ri51')">
           <template slot-scope="scope">
             <span>{{ scope.row.printerType}}</span>
           </template>
@@ -228,7 +265,7 @@
             <span>{{ scope.row.printerSn}}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('restaurantInfo.ri51')">
+        <el-table-column :label="$t('restaurantInfo.ri49')">
           <template slot-scope="scope">
             <span>{{ scope.row.printerName}}</span>
           </template>
@@ -238,78 +275,89 @@
             <el-button type="text" class="del" @click="deletePrinter(scope.row)">{{$t('menu.m26')}}</el-button>
           </template>
         </el-table-column>
-      </el-table>
-      <el-form-item :label="$t('restaurantInfo.ri21')">
-        <el-switch
-          v-model="form.salesMethodWm"
-          active-color="#13ce66"
-          inactive-color="#ff4949">
-        </el-switch>
-      </el-form-item>
-      <template v-if="form.salesMethodWm">
-        <el-form-item :label="$t('restaurantInfo.ri22')">
-          <div class="wm-time" v-for="(item, i) in wmTimeList" :key="i">
-            <!-- {{wmTimeList}} -->
-            <p>{{item.week}}</p>
-            <el-time-select
-              :placeholder="$t('restaurantInfo.ri23')"
-              v-model="item.beginTime"
-              :picker-options="{...item.pickerOptions, maxTime: item.overTime}">
-            </el-time-select>
-            <i>-</i>
-            <el-time-select
-              :placeholder="$t('restaurantInfo.ri24')"
-              v-model="item.overTime"
-              :picker-options="{...item.pickerOptions, minTime: item.beginTime}">
-            </el-time-select>
-          </div>
-          <!-- <el-time-select
-            placeholder="起始时间"
-            v-model="form.distributionTimeStart"
-            :picker-options="pickerOptions">
-          </el-time-select>
-          <el-form-item prop="distributionTimeEnd">
-            <el-time-select
-              placeholder="结束时间"
-              v-model="form.distributionTimeEnd"
-              :picker-options="{...pickerOptions, minTime: form.distributionTimeStart}">
-            </el-time-select>
-          </el-form-item> -->
-        </el-form-item>
-        <el-form-item :label="$t('restaurantInfo.ri25')">
-          {{form.receivingTime}}
-        </el-form-item>
-        <el-form-item :label="$t('restaurantInfo.ri26')" prop="receivingNum">
-          <el-input type="number" v-model="form.receivingNum"></el-input>
-        </el-form-item>
-        <el-form-item :label="$t('restaurantInfo.ri27')"  prop="distributionDistance">
-          <el-input class="range" type="number" v-model="form.distributionDistance"></el-input>
-          <span>km</span>
-        </el-form-item>
-      </template>
-      <el-form-item :label="$t('restaurantInfo.ri28')">
-        <el-switch
-          v-model="form.salesMethodZq"
-          active-color="#13ce66"
-          inactive-color="#ff4949">
-        </el-switch>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri29')">
-        <el-row justify="space-between">
-          <el-col :span="11"><el-input  type="number" v-model="form.latitude" :placeholder="$t('restaurantInfo.ri30')"></el-input></el-col>
-          <el-col :span="11" :offset="1"><el-input type="number" v-model="form.longitude" :placeholder="$t('restaurantInfo.ri31')"></el-input></el-col>
-        </el-row>
-      </el-form-item>
-      <el-form-item :label="$t('restaurantInfo.ri32')">
-        <el-switch
-          v-model="form.cooperation"
-          active-color="#13ce66"
-          inactive-color="#ff4949">
-        </el-switch>
-      </el-form-item>
-    </el-form>
-    <div class="step-button">
-      <el-button type="primary" @click="onSubmit" :loading="loading"> {{itemData ? $t('restaurantInfo.ri33') : $t('restaurantInfo.ri34')}}</el-button>
+      </el-table>
+
+      <el-form-item :label="$t('restaurantInfo.ri21')">
+        <el-switch
+          v-model="form.salesMethodWm"
+          active-color="#13ce66"
+          inactive-color="#ff4949">
+        </el-switch>
+      </el-form-item>
+      <template v-if="form.salesMethodWm">
+        <el-form-item :label="$t('restaurantInfo.ri22')">
+          <div class="wm-time" v-for="(item, i) in wmTimeList" :key="i">
+            <!-- {{wmTimeList}} -->
+            <p>{{item.week}}</p>
+            <el-time-select
+              :placeholder="$t('restaurantInfo.ri23')"
+              v-model="item.beginTime"
+              :picker-options="{...item.pickerOptions, maxTime: item.overTime}">
+            </el-time-select>
+            <i>-</i>
+            <el-time-select
+              :placeholder="$t('restaurantInfo.ri24')"
+              v-model="item.overTime"
+              :picker-options="{...item.pickerOptions, minTime: item.beginTime}">
+            </el-time-select>
+          </div>
+          <!-- <el-time-select
+            placeholder="起始时间"
+            v-model="form.distributionTimeStart"
+            :picker-options="pickerOptions">
+          </el-time-select>
+          <el-form-item prop="distributionTimeEnd">
+            <el-time-select
+              placeholder="结束时间"
+              v-model="form.distributionTimeEnd"
+              :picker-options="{...pickerOptions, minTime: form.distributionTimeStart}">
+            </el-time-select>
+          </el-form-item> -->
+        </el-form-item>
+        <el-form-item :label="$t('restaurantInfo.ri25')">
+          {{form.receivingTime}}
+        </el-form-item>
+        <el-form-item :label="$t('restaurantInfo.ri58') + '：'" prop="deliveryPrice">
+          <el-input type="number" v-model="form.deliveryPrice"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('restaurantInfo.ri26')" prop="receivingNum">
+          <el-input type="number" v-model="form.receivingNum"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('restaurantInfo.ri27')"  prop="distributionDistance">
+          <el-input class="range" type="number" v-model="form.distributionDistance"></el-input>
+          <span>Mile(s)</span>
+        </el-form-item>
+      </template>
+      <el-form-item :label="$t('restaurantInfo.ri28')">
+        <el-switch
+          v-model="form.salesMethodZq"
+          active-color="#13ce66"
+          inactive-color="#ff4949">
+        </el-switch>
+      </el-form-item>
+	  <el-form-item :label="$t('restaurantInfo.ri57')">
+	    <el-switch
+	      v-model="form.salesMethodTs"
+	      active-color="#13ce66"
+	      inactive-color="#ff4949">
+	    </el-switch>
+	  </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri29')">
+        <el-row justify="space-between">
+          <el-col :span="11"><el-input  type="number" v-model="form.latitude" :placeholder="$t('restaurantInfo.ri30')"></el-input></el-col>
+          <el-col :span="11" :offset="1"><el-input type="number" v-model="form.longitude" :placeholder="$t('restaurantInfo.ri31')"></el-input></el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri32')">
+        <el-switch
+          v-model="form.cooperation"
+          active-color="#13ce66"
+          inactive-color="#ff4949">
+        </el-switch>
+      </el-form-item>
+    </el-form>
+    <div class="step-button">
+      <el-button type="primary" @click="onSubmit" :loading="loading"> {{itemData ? $t('restaurantInfo.ri33') : $t('restaurantInfo.ri34')}}</el-button>
     </div>
     <div class="wrapper" v-if="printerTab">
       <img src="@/assets/images/close.png" alt="" @click="closePrinter">
@@ -322,8 +370,8 @@
           <el-form-item :label="$t('restaurantInfo.ri50') + ':'">
             <el-input type="number" v-model="form.printerNumber"></el-input>
           </el-form-item>
-          <el-form-item :label="$t('restaurantInfo.ri51') + ':'" prop="printer">
-            <el-select v-model="form.printer" :placeholder="printerPlace">
+          <el-form-item :label="$t('restaurantInfo.ri51') + ':'" prop="printerType">
+            <el-select v-model="printerPlace" :placeholder="printerPlace">
               <el-option
                 v-for="item in printerList"
                 :key="item.value"
@@ -335,303 +383,372 @@
         </el-form>
       </div>
       <el-button type="primary" @click="surePrinter">{{$t('addUser.au5')}}</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import {uploadFile} from '@/api/distribution'
+    </div>
+  </div>
+</template>
+
+<script>
+import {uploadFile, getCoin} from '@/api/distribution'
 import {conversionTime, timeStr} from '@/utils/time'
+import {apisUrl} from '../../utils/request'
 import axios from 'axios'
-import Cookies from 'js-cookie'
-export default {
-  props: ['itemData', 'loading'],
-  data () {
-    let verification = (rule, value, callback) => {
-      let key = rule.field;
-      let keyText = {
-        distributionTimeStart: this.$t('restaurantInfo.ri42'),
-        distributionTimeEnd: this.$t('restaurantInfo.ri43'),
-        receivingNum: this.$t('restaurantInfo.ri44'),
-        distributionDistance: this.$t('restaurantInfo.ri45')
-      }
-      if (this.form.salesMethodWm) {
-        if (!value) {
-          let text = keyText[key];
-          return callback(new Error(`${this.$t('restaurantInfo.ri46')}${text}`));
-        }
-        callback();
-        // else if(!Number.isInteger(value)) {
-        //   return callback(new Error(`请输入数字值`));
-        // }
-      }
-     };
-    return {
-      uploadFile,
-      serviceTime: [],
-      week: {
-        name: 'week',
-        showInput: '',
-        inputValue: '',
-        list: []
-      },
-      envUrl: [],
+import request from '../../utils/fetch.js'
+import Cookies from 'js-cookie'
+import {countryData } from '@/utils/timeZone'
+export default {
+  props: ['itemData', 'loading', 'country'],
+  data () {
+    let verification = (rule, value, callback) => {
+      let key = rule.field;
+      let keyText = {
+        distributionTimeStart: this.$t('restaurantInfo.ri42'),
+        distributionTimeEnd: this.$t('restaurantInfo.ri43'),
+        receivingNum: this.$t('restaurantInfo.ri44'),
+        deliveryPrice: this.$t('restaurantInfo.ri58'),
+        distributionDistance: this.$t('restaurantInfo.ri45')
+      }
+      if (this.form.salesMethodWm) {
+        if (!value) {
+          let text = keyText[key];
+          return callback(new Error(`${this.$t('restaurantInfo.ri46')}${text}`));
+        }
+        callback();
+        // else if(!Number.isInteger(value)) {
+        //   return callback(new Error(`请输入数字值`));
+        // }
+      }
+     };
+    return {
+      uploadFile,
+      serviceTime: [],
+      week: {
+        name: 'week',
+        showInput: '',
+        inputValue: '',
+        list: []
+      },
+      envUrl: [],
       fileList: [],
       printerTab: false,
       printerMsg: [],
       btnPrinterTab: false,
-      printerPlace: this.$t('restaurantInfo.ri6'),
-      // 营业时间  餐厅电话  餐厅介绍描述 餐厅账号 餐厅密码
-      form: {
-        restaurantName: '',
-        restaurantType: '',
-        restaurantPhone: '',
-        serviceTime: '',
+      coinTab: false,
+      printerPlace: this.$t('restaurantInfo.ri6'),
+      // 营业时间  餐厅电话  餐厅介绍描述 餐厅账号 餐厅密码
+      form: {
+        restaurantName: '',
+        restaurantType: '',
+        restaurantPhone: '',
+        serviceTime: '',
         email: '',
         // supermenu//
-        restaurantId: '',
-        password: '',
+        superMenuId: '',
+        superMenuPwd: '',
         //posCube//
-        shopCode: '',
-        salesMethodWm: false,
+        shopCode: '',
+        payeezyToken:"",  //payeezyToken
+        salesMethodWm: false,
         salesMethodZq: false,
-        supportPrinter: false,
+        salesMethodTs: false,
+        printer: false,
+        //活动
+        isCoin: false,
+        activeRuler: [],
         printerName: '',
-        printerNumber: '',
-        receivingNum: '',
-        distributionTimeStart: '',
-        distributionTimeEnd: '',
-        receivingTime: 15,
-        distributionDistance: '',
-        country: '',
-        province: '',
-        city: '',
+        printerNumber: '',
+        receivingNum: '',
+        deliveryPrice: '',
+        distributionTimeStart: '',
+        distributionTimeEnd: '',
+        receivingTime: 15,
+        distributionDistance: '',
+        timeZone:'',
+        country: '',
+        province: '',
+        city: '',
         street: '',
-        printer: '',
-        international: [],
-        baseLang: '',
-        cooperation: false,
-        industry: '',
-        story: '',
-        latitude: '',
-        longitude: '',
-        taxRate: '',
-        tip: '',
-        logo: '',
-        restaurantAddr: ''
-      },
-      rules: {
-        restaurantName: [
-          { required: true, message: this.$t('restaurantInfo.rules.r1'), trigger: 'blur' },
-        ],
-        restaurantType: [
-          { required: true, message: this.$t('restaurantInfo.rules.r2'), trigger: 'blur' },
-        ],
-        country: [
-          { required: true, message: this.$t('restaurantInfo.rules.r3'), trigger: 'change' },
-        ],
-        city: [
-          { required: true, message: this.$t('restaurantInfo.rules.r4'), trigger: 'blur' },
-        ],
-        province: [
-          { required: true, message: this.$t('restaurantInfo.rules.r5'), trigger: 'blur' },
-        ],
-        street: [
-          { required: true, message: this.$t('restaurantInfo.rules.r6'), trigger: 'blur' },
-        ],
-        industry: [
-          {required: true, message: this.$t('restaurantInfo.rules.r7'), trigger: 'blur'}
-        ],
-        restaurantPhone: [
-          { required: true, message: this.$t('restaurantInfo.rules.r8'), trigger: 'blur' },
-          // { min: 6, max: 11, message: this.$t('restaurantInfo.rules.r9'), trigger: 'blur' }
-        ],
-        baseLang: [
-          { required: true, message: this.$t('restaurantInfo.rules.r10'), trigger: 'change' }
-        ],
-        email: [
-          {required: true, message: this.$t('restaurantInfo.rules.r11'), trigger: 'blur'},
-          { pattern:/^([0-9A-Za-z\-_\.]+)@([0-9a-z]+\.[a-z]{2,3}(\.[a-z]{2})?)$/g, message: this.$t('restaurantInfo.rules.r12'), trigger: "blur"}
-        ],
-        serviceTime: [
-          { required: true, message: this.$t('restaurantInfo.rules.r13'), trigger: 'blur' },
-        ],
-
-        // distributionTimeStart: [
-        //   { validator: verification, trigger: 'blur' }
-        // ],
-        // distributionTimeEnd: [
-        //   { validator: verification, trigger: 'blur' }
-        // ],
-        receivingNum: [
-          { validator: verification, trigger: 'blur' }
-        ],
-        distributionDistance: [
-          { validator: verification, trigger: 'blur' }
-        ]
-      },
-      showDialog: false,
-      dialogImageUrl: '',
-      pickerOptions: {
-        start: '00:00',
-        step: '00:15',
-        end: '24:00',
-      },
-      countryList: [
-        {
-          value: 'de',
-          label: 'Deutschland'
-        },
-        {
-          value: 'en',
-          label: 'USA'
-        },
-        {
-          value: 'ja',
-          label: this.$t('restaurantUser.rules.r13')
-        },
-        {
-          value: 'es',
-          label: 'España'
-        },
-        {
-          value: 'ko',
-          label: '대한민국'
-        },
-      ],
+        international: [],
+        baseLang: '',
+        cooperation: false,
+        industry: '',
+        story: '',
+        latitude: '',
+        longitude: '',
+        taxRate: '',
+        tip: '',
+        logo: '',
+        restaurantAddr: '',
+        source: '',
+      },
+      rules: {
+        restaurantName: [
+          { required: true, message: this.$t('restaurantInfo.rules.r1'), trigger: 'blur' },
+        ],
+        restaurantType: [
+          { required: true, message: this.$t('restaurantInfo.rules.r2'), trigger: 'blur' },
+        ],
+        country: [
+          { required: true, message: this.$t('restaurantInfo.rules.r3'), trigger: 'change' },
+        ],
+        city: [
+          { required: true, message: this.$t('restaurantInfo.rules.r4'), trigger: 'blur' },
+        ],
+        province: [
+          { required: true, message: this.$t('restaurantInfo.rules.r5'), trigger: 'blur' },
+        ],
+        street: [
+          { required: true, message: this.$t('restaurantInfo.rules.r6'), trigger: 'blur' },
+        ],
+        industry: [
+          {required: true, message: this.$t('restaurantInfo.rules.r7'), trigger: 'blur'}
+        ],
+        restaurantPhone: [
+          { required: true, message: this.$t('restaurantInfo.rules.r8'), trigger: 'blur' },
+          // { min: 6, max: 11, message: this.$t('restaurantInfo.rules.r9'), trigger: 'blur' }
+        ],
+        baseLang: [
+          { required: true, message: this.$t('restaurantInfo.rules.r10'), trigger: 'change' }
+        ],
+        email: [
+          {required: true, message: this.$t('restaurantInfo.rules.r11'), trigger: 'blur'},
+          { pattern:/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/, message: this.$t('restaurantInfo.rules.r12'), trigger: "blur"}
+        ],
+        serviceTime: [
+          { required: true, message: this.$t('restaurantInfo.rules.r13'), trigger: 'blur' },
+        ],
+
+        // distributionTimeStart: [
+        //   { validator: verification, trigger: 'blur' }
+        // ],
+        // distributionTimeEnd: [
+        //   { validator: verification, trigger: 'blur' }
+        // ],
+        receivingNum: [
+          { validator: verification, trigger: 'blur' }
+        ],
+        deliveryPrice: [
+          { validator: verification, trigger: 'blur' }
+        ],
+        distributionDistance: [
+          { validator: verification, trigger: 'blur' }
+        ],
+        international:[
+          { required: true, message: this.$t('restaurantInfo.ri6'), trigger: 'blur' },
+        ],
+        timeZone:[
+          { required: true, message: this.$t('restaurantInfo.ri60'), trigger: 'blur' },
+        ]
+      },
+      showDialog: false,
+      dialogImageUrl: '',
+      pickerOptions: {
+        start: '00:00',
+        step: '00:15',
+        end: '24:00',
+      },
+      countryList: countryData,
+      timeZoneData:[],
       printerList: [
         {value: 'front',label: this.$t('restaurantInfo.ri52')},
         {value: 'back',label: this.$t('restaurantInfo.ri53')}
-      ],
-      weekList: [
-        {label: this.$t('restaurantInfo.week.w1'), value: '1', name: this.$t('restaurantInfo.week.w1')},
-        {label: this.$t('restaurantInfo.week.w2'), value: '2', name: this.$t('restaurantInfo.week.w2')},
-        {label: this.$t('restaurantInfo.week.w3'), value: '3', name: this.$t('restaurantInfo.week.w3')},
-        {label: this.$t('restaurantInfo.week.w4'), value: '4', name: this.$t('restaurantInfo.week.w4')},
-        {label: this.$t('restaurantInfo.week.w5'), value: '5', name: this.$t('restaurantInfo.week.w5')},
-        {label: this.$t('restaurantInfo.week.w6'), value: '6', name: this.$t('restaurantInfo.week.w6')},
-        {label: this.$t('restaurantInfo.week.w7'), value: '7', name: this.$t('restaurantInfo.week.w7')}
-      ],
-      weekTime: '', // 2020-07-08 新增需求
-      weekData: [],
-      wmTimeList: [],
-      timeType: [
-        { label: this.$t('restaurantInfo.time.t1'), value: '0' },
-        { label: this.$t('restaurantInfo.time.t2'), value: '1' },
-        { label: this.$t('restaurantInfo.time.t3'), value: '2' },
-        { label: this.$t('restaurantInfo.time.t4'), value: '3' }
-      ],
-      langList: [
-        { label: 'English', value: 'en' },
-        { label: '日本語', value: 'ja' },
-        { label: '한국어', value: 'ko' },
-        { label: '简体中文', value: 'zh' },
-        { label: '繁体中文', value: 'zh-TW' },
-        { label: 'Deutsch', value: 'de' },
-        { label: 'русский', value: 'ru' },
-        { label: 'Français', value: 'fr' },
-        { label: 'Español', value: 'es' }
-      ],
-      fileLogoList: []
-    }
-  },
-  // watch: {
-  //   weekData: {
-  //     deep: true,
-  //     handler () {
-  //       // console.log(this.weekData);
-  //       if (this.weekData.length <= 0) return
-  //       this.getWeekList();
-  //     }
-  //   }
-  // },
-  created () {
-    if (this.itemData) {
+      ],
+      weekList: [
+        {label: this.$t('restaurantInfo.week.w1'), value: '1', name: this.$t('restaurantInfo.week.w1')},
+        {label: this.$t('restaurantInfo.week.w2'), value: '2', name: this.$t('restaurantInfo.week.w2')},
+        {label: this.$t('restaurantInfo.week.w3'), value: '3', name: this.$t('restaurantInfo.week.w3')},
+        {label: this.$t('restaurantInfo.week.w4'), value: '4', name: this.$t('restaurantInfo.week.w4')},
+        {label: this.$t('restaurantInfo.week.w5'), value: '5', name: this.$t('restaurantInfo.week.w5')},
+        {label: this.$t('restaurantInfo.week.w6'), value: '6', name: this.$t('restaurantInfo.week.w6')},
+        {label: this.$t('restaurantInfo.week.w7'), value: '7', name: this.$t('restaurantInfo.week.w7')}
+      ],
+      weekTime: '', // 2020-07-08 新增需求
+      weekData: [],
+      wmTimeList: [],
+      timeType: [
+        { label: this.$t('restaurantInfo.time.t1'), value: '0' },
+        { label: this.$t('restaurantInfo.time.t2'), value: '1' },
+        { label: this.$t('restaurantInfo.time.t3'), value: '2' },
+        { label: this.$t('restaurantInfo.time.t4'), value: '3' }
+      ],
+      langList: [
+        { label: 'English', value: 'en' },
+        { label: '日本語', value: 'ja' },
+        { label: '한국어', value: 'ko' },
+        { label: '简体中文', value: 'zh' },
+        { label: '繁体中文', value: 'zh-TW' },
+        { label: 'Deutsch', value: 'de' },
+        { label: 'русский', value: 'ru' },
+        { label: 'Français', value: 'fr' },
+        { label: 'Español', value: 'es' }
+      ],
+      rulerList: [
+
+      ],
+      fileLogoList: [],
+      base: '',
+      userLang: ''
+    }
+  },
+  // watch: {
+  //   weekData: {
+  //     deep: true,
+  //     handler () {
+  //       // console.log(this.weekData);
+  //       if (this.weekData.length <= 0) return
+  //       this.getWeekList();
+  //     }
+  //   }
+  // },
+  created () {
+    this.source = Cookies.get('source');
+    this.base = localStorage.getItem('lang');
+    this.userLang = localStorage.getItem('lang')
+    if (this.itemData) {
+      let parmas = {
+        productCode: 10025,
+        storeId: this.itemData.restaurantId
+      };
+      axios({
+        headers: {'userLanguage': this.userLang,'baseLanguage': this.base},
+        method: 'post',
+        url: apisUrl() + '/coupon/activity/rule/query',
+        data: parmas
+      })
+      .then(res => {
+        if(res.data.code == 0) {
+          res.data.data.ruleEntityList.map((item, index) => {
+            this.rulerList.push({ label: item.activityName, value: item.activityId})
+          })
+          this.form.activeRuler = res.data.data.exists[0]
+        }
+      })
       let item = this.itemData;
-      this.btnPrinterTab = true;
-      this.form = {
-        restaurantName: item.restaurantName,
-        restaurantType: item.restaurantType,
+      this.btnPrinterTab = true;
+      if(item.country == 'ja' && this.source == 1) this.coinTab = true;
+
+      this.form = {
+        restaurantName: item.restaurantName,
+        restaurantType: item.restaurantType,
         restaurantPhone: item.restaurantPhone,
         // supermenu//
-        restaurantId: item.restaurantId,
-        password: item.password,
+        superMenuId: item.superMenuId,
+        superMenuPwd: item.superMenuPwd,
         //posCube//
-        shopCode: item.shopCode,
-        serviceTime: '',//item.serviceTime ? JSON.parse(item.serviceTime) : '',
+        shopCode: item.shopCode,
+        payeezyToken: item.payeezyToken,
+        serviceTime: '',//item.serviceTime ? JSON.parse(item.serviceTime) : '',
         email: item.email,
-        supportPrinter: item.printer == 1 ? true : false,
-        salesMethodWm: !!parseInt(item.salesMethodWm),
-        salesMethodZq: !!parseInt(item.salesMethodZq),
-        receivingNum: item.receivingNum,
-        distributionTimeStart: item.distributionTimeStart,
-        distributionTimeEnd: item.distributionTimeEnd,
-        receivingTime: 15,
-        distributionDistance: item.distributionDistance,
-        country: item.country,
-        province: item.province,
-        city: item.city,
-        street: item.street,
-        international: item.international ? JSON.parse(item.international) : '',
-        baseLang: item.baseLang,
-        cooperation: !!item.cooperation,
-        industry: item.industry,
-        story: item.story,
-        latitude: item.latitude,
-        longitude: item.longitude,
-        restaurantId: item.restaurantId,
-        active: 99,
-        taxRate: item.taxRate,
-        tip: item.tip,
-        restaurantAddr: item.restaurantAddr
-      }
-      // console.log(item);
-      if (item.envUrl) {
-        let urlList = item.envUrl.split(',');
-        this.fileList = urlList.map(item => {
-          return {url: item}
-        });
-        this.envUrl = urlList;
-      }
-      if (item.logo) {
-        this.fileLogoList = [{url: item.logo}]
-      }
-      if (item.serviceTime) {
-        let serviceTime = JSON.parse(item.serviceTime);
-        let weekData = [];
-        this.weekTime = serviceTime.map(item => {
-          let itemData = this.weekList.filter(v => v.value == item.code)[0];
-          weekData.push({
-            code: itemData.value,
-            week: itemData.name,
-            showInput: false,
-            inputValue: '',
-            detail: item.detail
-          })
-          return item.week
-        });
-        this.weekData = weekData;
-      }
-      if (item.distributionTime) {
-        this.distributionTime = JSON.parse(item.distributionTime);
-         this.getWeekList();
-      }
-    }
+        isCoin: item.isCoin == 1 ? true : false,
+        activeRuler: '',
+        printer: item.printer == 1 ? true : false,
+        salesMethodWm: !!parseInt(item.salesMethodWm),
+        salesMethodZq: !!parseInt(item.salesMethodZq),
+        salesMethodTs: !!parseInt(item.salesMethodTs),
+        receivingNum: item.receivingNum,
+        deliveryPrice: item.deliveryPrice,
+        distributionTimeStart: item.distributionTimeStart,
+        distributionTimeEnd: item.distributionTimeEnd,
+        receivingTime: 15,
+        distributionDistance: item.distributionDistance,
+        country: item.country,
+        timeZone: item.timeZone,
+        province: item.province,
+        city: item.city,
+        street: item.street,
+        international: item.international ? JSON.parse(item.international) : [],
+        baseLang: item.baseLang,
+        cooperation: !!item.cooperation,
+        industry: item.industry,
+        story: item.story,
+        latitude: item.latitude,
+        longitude: item.longitude,
+        restaurantId: item.restaurantId,
+        active: 99,
+        taxRate: item.taxRate,
+        tip: item.tip,
+        restaurantAddr: item.restaurantAddr
+      }
+      this.getTimeZoneData(item.country,1)
+      // console.log(item);
+      if (item.envUrl) {
+        let urlList = item.envUrl.split(',');
+        this.fileList = urlList.map(item => {
+          return {url: item}
+        });
+        this.envUrl = urlList;
+      }
+      if (item.logo) {
+        this.fileLogoList = [{url: item.logo}]
+      }
+      if (item.serviceTime) {
+        let serviceTime = JSON.parse(item.serviceTime);
+        let weekData = [];
+        this.weekTime = serviceTime.map(item => {
+          let itemData = this.weekList.filter(v => v.value == item.code)[0];
+          weekData.push({
+            code: itemData.value,
+            week: itemData.name,
+            showInput: false,
+            inputValue: '',
+            detail: item.detail
+          })
+          return item.week
+        });
+        this.weekData = weekData;
+      }
+      if (item.distributionTime) {
+        this.distributionTime = JSON.parse(item.distributionTime);
+         this.getWeekList();
+      }
+    }
+  },
+   watch: {
+    'form.isCoin' () {
+
+    },
+    'form.deliveryPrice'() {
+      let a = this.form.deliveryPrice;
+      let b,c;
+      if(a&&a.indexOf('.') != -1) {
+        b = a.split('.')[0]
+        c = a.split('.')[1]
+        if(c.length > 2) {
+          c = c.slice(0, 2)
+        }
+        this.form.deliveryPrice = b + '.' + c
+      }
+    },
+    'form.printer' () {
+      const _this = this;
+      if(this.form.printer) {
+        this.getPrinterList()
+      }
+    }
   },
-   watch: {
    'form.supportPrinter' () {
-      const _this = this;
      if(this.form.supportPrinter) {
        this.getPrinterList()
      }
    }
  },
   methods: {
+    //获取对应国家的时区
+    getTimeZoneData(val,type){
+      if(!type){
+        this.form.timeZone = ''
+      }
+      this.countryList.map((item)=>{
+        if(val==item.value){
+          this.timeZoneData = item.timeZone
+        }
+      })
+    },
     getPrinterList() {
       let parmas = {
           restaurantId: this.form.restaurantId
         };
         axios({
           // url: 'http://10.214.23.171:8889/super-menu/printer/list-by-restaurant',
-          url: 'https://test-web-mgt.mr-menu.com/apis/super-menu/printer/list-by-restaurant',
+          headers: {'userLanguage': this.userLang,'baseLanguage': this.base},
+          url: apisUrl() + '/super-menu/printer/list-by-restaurant',
           method: 'post',
           data: parmas
         }).then(res => {
-          if(res.data.code == 200) {
+          if(res.data.code == 0) {
              this.printerMsg = res.data.data.result
              if(this.printerMsg.length != 0) {
                this.printerMsg.map(item => {
@@ -655,11 +772,12 @@ export default {
       };
       axios({
         // url: 'http://10.214.23.171:8889/super-menu/printer',
-        url: 'https://test-web-mgt.mr-menu.com/apis/super-menu/printer',
+        url:  apisUrl() + '/super-menu/printer',
+        headers: {'userLanguage': this.userLang,'baseLanguage': this.base},
         method: 'delete',
         data: parmas
       }).then(res => {
-        if(res.data.code == 200) {
+        if(res.data.code == 0) {
           this.$message.success(this.$t('menu.m48'));
           this.getPrinterList()
         }
@@ -676,16 +794,17 @@ export default {
         printerSn: this.form.printerNumber,
         printerName: this.form.printerName,
         restaurantId: this.form.restaurantId,
-        printerType: this.form.printer,
+        printerType: this.printerPlace,
         userId: Cookies.get('userId')
       }
       axios({
         // url: 'http://10.214.23.171:8889/super-menu/printer',
-        url: 'https://test-web-mgt.mr-menu.com/apis/super-menu/printer',
+        url:  apisUrl() + '/super-menu/printer',
+        headers: {'userLanguage': this.userLang,'baseLanguage': this.base},
         method: 'post',
         data: parmas
       }).then(res => {
-        if(res.data.code == 200) {
+        if(res.data.code == 0) {
           this.$message.success(this.$t('addHoliday.ah13'));
           this.form.printerName = '';
           this.form.printerNumber = '';
@@ -696,234 +815,237 @@ export default {
           this.$message.warning(this.$t('restaurantInfo.ri54'));
         }
       })
-    },
+    },
     onSubmit () {
-      if(this.form.supportPrinter) this.form.supportPrinter = 1;
-      else this.form.supportPrinter = 0;
-      if (this.weekData.length <= 0) {
-        this.$message({
-          message: this.$t('restaurantInfo.ri35'),
-          type: 'warning'
-        });
-        return;
-      } else {
-        this.form.serviceTime = this.weekData.map(item => {
-          //debugger
-          return {
-            code: item.code,
-            week: item.week,
-            detail: item.detail
-          }
-        })
-      }
-      if (this.form.salesMethodWm && this.wmTimeList) {
-        let check = this.wmTimeList.filter(v => !v.beginTime || !v.overTime);
-        if (check.length > 0) {
-          this.$message({
-            message: this.$t('restaurantInfo.ri36'),
-            type: 'warning'
-          });
-          return;
-        }
-        this.form.distributionTime = this.wmTimeList.map(item => {
-          return {
-            code: item.code,
-            week: item.week,
-            beginTime: item.beginTime,
-            overTime: item.overTime
-          }
-        })
-      }
-      this.form.envUrl = this.envUrl.join(',');
-      this.form.cooperation = Number(this.form.cooperation);
-      this.$refs.restaurantForm.validate((valid) => {
-        if (valid) {
-          this.$emit('submit', this.form)
-        } else {
-          console.log('error submit!!');
-          return false;
-        }
-      });
-    },
-    handleRemove(file) {
-      this.envUrl = this.envUrl.filter(item => item != file.url);
-    },
-    handlePictureCardPreview(file) {
-      this.dialogImageUrl = file.url;
-      this.showDialog = true;
-    },
-    handleBeforeUpload (file) {
-      console.log(file);
-    },
-    updateSuccess(response) {
-      console.log(response);
-      if (response.code == 200) {
-        this.envUrl.push(response.data)
-      }
-    },
-    uploadLogo (response) {
-      if (response.code == 200) {
-        this.form.logo = response.data;
-        this.fileLogoList = [{url: response.data}];
-      }
-    },
-    handelExceed (files, fileList) {
-      console.log(files, fileList);
-      this.$message.warning(this.$t('restaurantInfo.ri37'));
-    },
-    handleClose(item, i) {
-      item.list.splice(i, 1);
-    },
-    showInput(item, el, type) {
-      item.showInput = true;
-      this.$nextTick(_ => {
-        let element = this.$refs[el];
-        if (type) {
-          element = element[0];
-        }
-        element.$refs.input.focus();
-      });
-    },
-    handleInputConfirm(item, type) {
-      let inputValue = item.inputValue;
-      if (inputValue) {
-        if (type) {
-          item.list.push(inputValue);
-        } else {
-          item.list.push({
-            weekName: inputValue,
-            showInput: false,
-            list: []
-          });
-        }
-      }
-      item.showInput = false;
-      item.inputValue = '';
-    },
-    handleWeekConfirm (item, index) {
-      let value = item.list;
-      if (item.type != undefined && item.inputValue) {
-        item.list.push({
-          type: item.type,
-          time: item.inputValue
-        })
-        item.type = undefined;
-        item.inputValue = '';
-        item.showInput = false;
-      }
-    },
-    filterType (type) {
-      let item = this.timeType.filter(v => v.value == type)[0]
-      return item ? item.label : '';
-    },
-    selectWeek (list) {
-      // console.log(list)
-      this.weekData = list.map(item => {
-        let itemData = this.weekList.filter(v => v.label == item)[0];
-        console.log(this.weekData)
-        let weekData = this.weekData.filter(v => itemData.name == v.week)[0];
-        return {
-          code: itemData.value,
-          week: itemData.name,
-          showInput: false,
-          inputValue: '',
-          detail: weekData ? weekData.detail : []
-        }
-      });
-      this.getWeekList();
-    },
-    addWekkTime (item) {
-      if (item.type == null) {
-        this.$message.error(this.$t('restaurantInfo.ri38'));
-        return
-      }
-      let checkItem = item.detail.filter(v => v.type == item.type)[0];
-      if (checkItem) {
-        this.$message.error(this.$t('restaurantInfo.ri39'));
-        return
-      }
-      if (!item.inputValue) {
-        this.$message.error(this.$t('restaurantInfo.ri40'));
-        return
-      }
-      let time = item.inputValue.match(/^(\d{1,2})(:)(\d{1,2})-(\d{1,2})(:)(\d{1,2})$/);
-      if (!time) {
-        this.$message.error(this.$t('restaurantInfo.ri41'));
-        return
-      }
-      item.detail.push({
-        time: time[0],
-        type: item.type
-      })
-      item.inputValue = '';
-      item.showInput = false;
-      item.type = null;
-      this.getWeekList();
-    },
-    removeWeekTime (item, i) {
-      item.detail.splice(i, 1);
-      this.getWeekList();
-    },
-    edidWeekTime (item, i) {
-      let itemData = item.detail[i];
-      item.detail.splice(i, 1);
-      item.inputValue = itemData.time;
-      item.showInput = true;
-      item.type = itemData.type;
-    },
-    getWeekList () {
-      this.wmTimeList = this.weekData.map(item => {
-        let startTime = null;
-        let endTime = null;
-        if (item.detail.length <= 0) {
-          return {
-            week: item.week,
-            beginTime: '',
-            overTime: '',
-            pickerOptions: {
-              start: '00:00',
-              step: '00:15',
-              end: '00:00'
-            }
-          }
-        }
-        item.detail.forEach(v => {
-          let t = v.time.split('-');
-          let st = conversionTime(t[0]);
-          let et = conversionTime(t[1]);
-          if (startTime == null || st < startTime) startTime = st;
-          if (et == null || et > endTime) endTime = et;
-        })
-        // this.distributionTime
-        let itemData = null;
-        try {
-          itemData = this.distributionTime ? this.distributionTime.filter(v => v.week == item.week)[0] : null
-        } catch (error) {
-          // console.log(error);
-        }
-        return {
-          week: item.week,
-          code: item.code,
-          beginTime: itemData ? itemData.beginTime : '',
-          overTime: itemData ? itemData.overTime : '',
-          pickerOptions: {
-            start: startTime < endTime ? timeStr(startTime) : timeStr(endTime),
-            step: '00:15',
-            end: startTime < endTime ? timeStr(endTime) : timeStr(startTime)
-          }
-        }
-      })
-    },
-    handleLogoRemove(file, fileList) {
-      // console.log(file, fileList);
-      // this.fileLogoList = fileList;
-      this.form.logo = '';
-    }
-  }
-}
-</script>
-
-<style lang="scss">
+      if(this.form.printer) this.form.printer = 1;
+      else this.form.printer = 0;
+      if(this.form.isCoin) this.form.isCoin = 1;
+      else this.form.isCoin = 0;
+      if (this.weekData.length <= 0) {
+        this.$message({
+          message: this.$t('restaurantInfo.ri35'),
+          type: 'warning'
+        });
+        return;
+      } else {
+        this.form.serviceTime = this.weekData.map(item => {
+          //debugger
+          return {
+            code: item.code,
+            week: item.week,
+            detail: item.detail
+          }
+        })
+      }
+      if (this.form.salesMethodWm && this.wmTimeList) {
+        let check = this.wmTimeList.filter(v => !v.beginTime || !v.overTime);
+        if (check.length > 0) {
+          this.$message({
+            message: this.$t('restaurantInfo.ri36'),
+            type: 'warning'
+          });
+          return;
+        }
+        this.form.distributionTime = this.wmTimeList.map(item => {
+          return {
+            code: item.code,
+            week: item.week,
+            beginTime: item.beginTime,
+            overTime: item.overTime
+          }
+        })
+      }
+      this.form.envUrl = this.envUrl.join(',');
+      this.form.cooperation = Number(this.form.cooperation);
+      this.$refs.restaurantForm.validate((valid) => {
+        if (valid) {
+          console.log(this.form)
+          this.$emit('submit', this.form)
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    handleRemove(file) {
+      this.envUrl = this.envUrl.filter(item => item != file.url);
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.showDialog = true;
+    },
+    handleBeforeUpload (file) {
+      console.log(file);
+    },
+    updateSuccess(response) {
+      console.log(response);
+      if (response.code == 200) {
+        this.envUrl.push(response.data)
+      }
+    },
+    uploadLogo (response) {
+      if (response.code == 200) {
+        this.form.logo = response.data;
+        this.fileLogoList = [{url: response.data}];
+      }
+    },
+    handelExceed (files, fileList) {
+      console.log(files, fileList);
+      this.$message.warning(this.$t('restaurantInfo.ri37'));
+    },
+    handleClose(item, i) {
+      item.list.splice(i, 1);
+    },
+    showInput(item, el, type) {
+      item.showInput = true;
+      this.$nextTick(_ => {
+        let element = this.$refs[el];
+        if (type) {
+          element = element[0];
+        }
+        element.$refs.input.focus();
+      });
+    },
+    handleInputConfirm(item, type) {
+      let inputValue = item.inputValue;
+      if (inputValue) {
+        if (type) {
+          item.list.push(inputValue);
+        } else {
+          item.list.push({
+            weekName: inputValue,
+            showInput: false,
+            list: []
+          });
+        }
+      }
+      item.showInput = false;
+      item.inputValue = '';
+    },
+    handleWeekConfirm (item, index) {
+      let value = item.list;
+      if (item.type != undefined && item.inputValue) {
+        item.list.push({
+          type: item.type,
+          time: item.inputValue
+        })
+        item.type = undefined;
+        item.inputValue = '';
+        item.showInput = false;
+      }
+    },
+    filterType (type) {
+      let item = this.timeType.filter(v => v.value == type)[0]
+      return item ? item.label : '';
+    },
+    selectWeek (list) {
+      // console.log(list)
+      this.weekData = list.map(item => {
+        let itemData = this.weekList.filter(v => v.label == item)[0];
+        console.log(this.weekData)
+        let weekData = this.weekData.filter(v => itemData.name == v.week)[0];
+        return {
+          code: itemData.value,
+          week: itemData.name,
+          showInput: false,
+          inputValue: '',
+          detail: weekData ? weekData.detail : []
+        }
+      });
+      this.getWeekList();
+    },
+    addWekkTime (item) {
+      if (item.type == null) {
+        this.$message.error(this.$t('restaurantInfo.ri38'));
+        return
+      }
+      let checkItem = item.detail.filter(v => v.type == item.type)[0];
+      if (checkItem) {
+        this.$message.error(this.$t('restaurantInfo.ri39'));
+        return
+      }
+      if (!item.inputValue) {
+        this.$message.error(this.$t('restaurantInfo.ri40'));
+        return
+      }
+      let time = item.inputValue.match(/^(\d{1,2})(:)(\d{1,2})-(\d{1,2})(:)(\d{1,2})$/);
+      if (!time) {
+        this.$message.error(this.$t('restaurantInfo.ri41'));
+        return
+      }
+      item.detail.push({
+        time: time[0],
+        type: item.type
+      })
+      item.inputValue = '';
+      item.showInput = false;
+      item.type = null;
+      this.getWeekList();
+    },
+    removeWeekTime (item, i) {
+      item.detail.splice(i, 1);
+      this.getWeekList();
+    },
+    edidWeekTime (item, i) {
+      let itemData = item.detail[i];
+      item.detail.splice(i, 1);
+      item.inputValue = itemData.time;
+      item.showInput = true;
+      item.type = itemData.type;
+    },
+    getWeekList () {
+      this.wmTimeList = this.weekData.map(item => {
+        let startTime = null;
+        let endTime = null;
+        if (item.detail.length <= 0) {
+          return {
+            week: item.week,
+            beginTime: '',
+            overTime: '',
+            pickerOptions: {
+              start: '00:00',
+              step: '00:15',
+              end: '00:00'
+            }
+          }
+        }
+        item.detail.forEach(v => {
+          let t = v.time.split('-');
+          let st = conversionTime(t[0]);
+          let et = conversionTime(t[1]);
+          if (startTime == null || st < startTime) startTime = st;
+          if (et == null || et > endTime) endTime = et;
+        })
+        // this.distributionTime
+        let itemData = null;
+        try {
+          itemData = this.distributionTime ? this.distributionTime.filter(v => v.week == item.week)[0] : null
+        } catch (error) {
+          // console.log(error);
+        }
+        return {
+          week: item.week,
+          code: item.code,
+          beginTime: itemData ? itemData.beginTime : '',
+          overTime: itemData ? itemData.overTime : '',
+          pickerOptions: {
+            start: startTime < endTime ? timeStr(startTime) : timeStr(endTime),
+            step: '00:15',
+            end: startTime < endTime ? timeStr(endTime) : timeStr(startTime)
+          }
+        }
+      })
+    },
+    handleLogoRemove(file, fileList) {
+      // console.log(file, fileList);
+      // this.fileLogoList = fileList;
+      this.form.logo = '';
+    }
+  }
+}
+</script>
+
+<style lang="scss">
 .restaurant-info {
   .table-printer{
     margin-bottom: 25px;
@@ -970,96 +1092,96 @@ export default {
     .add-printer{
       margin-left: 22px;
     }
-  }
-  .image-tip {
-    color: #666;
-  }
-  // .address {
-  //   margin-bottom: 22px;
-  //   text-align: right;
-  //   width: 130px;
-  //   color: #606266;
-  //   font-weight: bold;
-  // }
-  .el-divider {
-    .el-divider__text {
-      left: 50px;
-      color: #606266;
-      font-weight: bold;
-    }
-  }
-  .el-select {
-    width: 100%;
-  }
-  .el-form-item {
-    .el-form-item{
-      display: inline-block;
-    }
-    .el-form-item__error {
-      z-index: 2;
-    }
-  }
-  .tag-item {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    .el-tag {
-      height: 36px;
-      line-height: 34px;
-      font-size: 14px;
-      margin-right: 10px;
-      margin-bottom: 15px;
-    }
-    .el-select {
-      width: 100px;
-      display: inline-block;
-      margin-right: 10px;
-      margin-bottom: 15px;
-    }
-    .el-input {
-      margin-right: 10px;
-    }
-    button {
-      margin-bottom: 15px;
-    }
-  }
-  .input-new-tag {
-    width: 155px;
-    vertical-align: bottom;
-    margin-bottom: 15px;
-  }
-  .range {
-    width: calc(100% - 40px);
-    margin-right: 10px;
-  }
-  .wm-time {
-    display: flex;
-    align-items: center;
-    margin-bottom: 10px;
-    &:last-child {
-      margin-bottom: 0;
-    }
-    p {
-      margin-right: 15px;
-    }
-    i {
-      padding: 0 5px;
-    }
-  }
-  .is-disabled + .el-upload {
-    display: none;
-  }
-  .el-form-item--medium .el-form-item__content, .el-form-item--medium .el-form-item__label {
-    line-height: 1.5;
+  }
+  .image-tip {
+    color: #666;
+  }
+  // .address {
+  //   margin-bottom: 22px;
+  //   text-align: right;
+  //   width: 130px;
+  //   color: #606266;
+  //   font-weight: bold;
+  // }
+  .el-divider {
+    .el-divider__text {
+      left: 50px;
+      color: #606266;
+      font-weight: bold;
+    }
+  }
+  .el-select {
+    width: 100%;
+  }
+  .el-form-item {
+    .el-form-item{
+      display: inline-block;
+    }
+    .el-form-item__error {
+      z-index: 2;
+    }
+  }
+  .tag-item {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    .el-tag {
+      height: 36px;
+      line-height: 34px;
+      font-size: 14px;
+      margin-right: 10px;
+      margin-bottom: 15px;
+    }
+    .el-select {
+      width: 100px;
+      display: inline-block;
+      margin-right: 10px;
+      margin-bottom: 15px;
+    }
+    .el-input {
+      margin-right: 10px;
+    }
+    button {
+      margin-bottom: 15px;
+    }
+  }
+  .input-new-tag {
+    width: 155px;
+    vertical-align: bottom;
+    margin-bottom: 15px;
+  }
+  .range {
+    width: calc(100% - 60px);
+    margin-right: 10px;
+  }
+  .wm-time {
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+    &:last-child {
+      margin-bottom: 0;
+    }
+    p {
+      margin-right: 15px;
+    }
+    i {
+      padding: 0 5px;
+    }
+  }
+  .is-disabled + .el-upload {
+    display: none;
+  }
+  .el-form-item--medium .el-form-item__content, .el-form-item--medium .el-form-item__label {
+    line-height: 1.5;
   }
   .el-form-item--medium .el-form-item__label{
     white-space: normal;
     word-wrap: break-word;
     word-break: break-all;
-  }
-}
-.el-time-panel__content::after, .el-time-panel__content::before {
-  margin-top: -7px !important;
-}
-
+  }
+}
+.el-time-panel__content::after, .el-time-panel__content::before {
+  margin-top: -7px !important;
+}
+
 </style>
diff --git a/src/i18n/langs/de.js b/src/i18n/langs/de.js
index 0bc529e12d2eb6db22a64def1de85533c7c25f82..f8b3e68747ecb5d3f1d3051dbaeedbd23331217f 100644
--- a/src/i18n/langs/de.js
+++ b/src/i18n/langs/de.js
@@ -1,172 +1,173 @@
 import deLocale from 'element-ui/lib/locale/lang/de'
 const de = {
-  "home": {
-    "userInfo": "Benutzerinformationen",
-    "order": "Anzahl der Bestellungen",
-    "menu": "Menüverwaltung",
-    "holiday": "Urlaubseinstellungen",
-    "registered": [
-      "7 Tage",
-      "14 Tage",
-      "30 Tage",
-      "90 Tage"
+  'home': {
+    'userInfo': 'Benutzerinformationen',
+    'order': 'Anzahl der Bestellungen',
+    'menu': 'Menüverwaltung',
+    'holiday': 'Urlaubseinstellungen',
+    'registered': [
+      '7 Tage',
+      '14 Tage',
+      '30 Tage',
+      '90 Tage'
     ],
-    "registeredTitle": "Menge an registrierten Händlern",
-    "signout": "Ausloggen/Abmelden"
+    'registeredTitle': 'Menge an registrierten Händlern',
+    'signout': 'Ausloggen/Abmelden'
   },
-  "router": {
-    "home": "Hauptseite",
-    "distributor": "Einzelhändler",
-    "restaurant": "Restaurantverwaltung",
-    "data": "Datenverwaltung",
-    "editUser": "Benutzer bearbeiten",
-    "addUser": "Neuer Nutzer",
-    "editRestaurant": "Restaurantinformationen bearbeiten",
-    "dishes": "Speisekarte",
-    "r1": "Benutzerinformationen verwalten",
-    "r2": "Bestellungsverwaltung",
-    "r3": "Bestelldetails",
-    "r4": "Menüverwaltung",
-    "r5": "Restaurant hinzufügen",
-    "r6": "Gericht hinzufügen",
-    "r7": "Angebotsart",
-    "r8": "Urlaubseinstellungen",
-    "r9": "QR-Code-Management",
+  'router': {
+    'home': 'Hauptseite',
+    'distributor': 'Einzelhändler',
+    'restaurant': 'Restaurantverwaltung',
+    'data': 'Datenverwaltung',
+    'editUser': 'Benutzer bearbeiten',
+    'addUser': 'Neuer Nutzer',
+    'editRestaurant': 'Restaurantinformationen bearbeiten',
+    'dishes': 'Speisekarte',
+    'r1': 'Benutzerinformationen verwalten',
+    'r2': 'Bestellungsverwaltung',
+    'r3': 'Bestelldetails',
+    'r4': 'Menüverwaltung',
+    'r5': 'Restaurant hinzufügen',
+    'r6': 'Gericht hinzufügen',
+    'r7': 'Angebotsart',
+    'r8': 'Urlaubseinstellungen',
+    'r9': 'QR-Code-Management',
     'r10': 'Benutzerverwaltung',
-    'r11': 'Benutzerdetails'
+    'r11': 'Benutzerdetails',
+    title:'Management System'
   },
-  "users": {
-    "u1": "Neuer Nutzer",
-    "u2": "Gruppenkontoliste",
-    "u3": "Liste der allgemeinen Konten",
-    "u4": "Nummer",
-    "u5": "Telefon",
-    "u6": "Nachname",
-    "u7": "Vorname",
-    "u8": "Adresse",
-    "u9": "Stadt",
-    "u10": "Bundesland",
-    "u11": "Postleitzahl",
-    "u12": "Land",
-    "u13": "E-Mail",
-    "u14": "Aufgabe",
-    "u15": "Bearbeiten"
+  'users': {
+    'u1': 'Neuer Nutzer',
+    'u2': 'Gruppenkontoliste',
+    'u3': 'Liste der allgemeinen Konten',
+    'u4': 'Nummer',
+    'u5': 'Telefon',
+    'u6': 'Nachname',
+    'u7': 'Vorname',
+    'u8': 'Adresse',
+    'u9': 'Stadt',
+    'u10': 'Bundesland',
+    'u11': 'Postleitzahl',
+    'u12': 'Land',
+    'u13': 'E-Mail',
+    'u14': 'Aufgabe',
+    'u15': 'Bearbeiten'
   },
-  "editUser": {
-    "eu1": "Telefon:",
-    "eu2": "Nachname:",
-    "eu3": "Vorname:",
-    "eu4": "Adresse:",
-    "eu5": "Stadt:",
-    "eu6": "Bundesland:",
-    "eu7": "Postleitzahl:",
-    "eu8": "Land:",
-    "eu9": "E-Mail-Adresse:",
-    "eu10": "Bestätigen",
-    "rules": {
-      "r1": "Bitte geben Sie die Kontaktinformationen ein",
-      "r2": "6 bis 11 Zeichen lang",
-      "r3": "Bitte geben Sie den Nachnamen ein",
-      "r4": "Bitte geben Sie den Vornamen ein",
-      "r5": "Bitte geben Sie eine ausführliche Adresse ein",
-      "r6": "Bitte geben Sie Ihre Stadt ein",
-      "r7": "Bitte geben Sie das Bundesland / die Provinz ein",
-      "r8": "Bitte geben Sie Ihr Land ein",
-      "r9": "Bitte geben Sie die E-Mail-Adresse ein",
-      "r10": "Bitte geben Sie eine gültige E-Mail-Adresse ein"
+  'editUser': {
+    'eu1': 'Telefon:',
+    'eu2': 'Nachname:',
+    'eu3': 'Vorname:',
+    'eu4': 'Adresse:',
+    'eu5': 'Stadt:',
+    'eu6': 'Bundesland:',
+    'eu7': 'Postleitzahl:',
+    'eu8': 'Land:',
+    'eu9': 'E-Mail-Adresse:',
+    'eu10': 'Bestätigen',
+    'rules': {
+      'r1': 'Bitte geben Sie die Kontaktinformationen ein',
+      'r2': '6 bis 11 Zeichen lang',
+      'r3': 'Bitte geben Sie den Nachnamen ein',
+      'r4': 'Bitte geben Sie den Vornamen ein',
+      'r5': 'Bitte geben Sie eine ausführliche Adresse ein',
+      'r6': 'Bitte geben Sie Ihre Stadt ein',
+      'r7': 'Bitte geben Sie das Bundesland / die Provinz ein',
+      'r8': 'Bitte geben Sie Ihr Land ein',
+      'r9': 'Bitte geben Sie die E-Mail-Adresse ein',
+      'r10': 'Bitte geben Sie eine gültige E-Mail-Adresse ein'
     }
   },
-  "addUser": {
-    "au1": "Informationen der für das Restaurant verantwortlichen Person",
-    "au2": "Restaurantinformationen",
-    "au3": "Bitte vervollständigen Sie die Angaben zu der verantwortlichen Person!",
-    "au4": "Hinweise",
-    "au5": "Bestätigen",
-    "au6": "Stornieren",
-    "au7": "Erfolgreich hinzugefügt",
-    "au8": "Restaurantkonto",
-    "au9": "Restaurantpasswort",
-    "au10": "Herunterladen",
-    "au11": "Die ID der verantwortlichen Person existiert nicht"
+  'addUser': {
+    'au1': 'Informationen der für das Restaurant verantwortlichen Person',
+    'au2': 'Restaurantinformationen',
+    'au3': 'Bitte vervollständigen Sie die Angaben zu der verantwortlichen Person!',
+    'au4': 'Hinweise',
+    'au5': 'Bestätigen',
+    'au6': 'Stornieren',
+    'au7': 'Erfolgreich hinzugefügt',
+    'au8': 'Restaurantkonto',
+    'au9': 'Restaurantpasswort',
+    'au10': 'Herunterladen',
+    'au11': 'Die ID der verantwortlichen Person existiert nicht'
   },
-  "restaurantUser": {
-    "ru1": "Nachname der verantwortlichen Person:",
-    "ru2": "Vorname der verantwortlichen Person:",
-    "ru3": "Telefon der verantwortlichen Person:",
-    "ru4": "Adresse der verantwortlichen Person:",
-    "ru5": "Stadt:",
-    "ru6": "Bundesland/Provinz:",
-    "ru7": "Postleitzahl:",
-    "ru8": "Land:",
-    "ru9": "bitte auswählen",
-    "ru10": "E-Mail-Adresse:",
-    "ru11": "Restauranttyp:",
-    "ru12": "Weiter",
-    "rules": {
-      "r1": "Bitte geben Sie die Kontaktinformationen ein",
-      "r2": "Bitte geben Sie den Nachnamen ein",
-      "r3": "Bitte geben Sie den Vornamen ein",
-      "r4": "Bitte geben Sie eine ausführliche Adresse ein",
-      "r5": "Bitte geben Sie Ihre Stadt ein",
-      "r6": "Bitte geben Sie das Bundesland / die Provinz ein",
-      "r7": "Bitte geben Sie Ihr Land ein",
-      "r8": "Bitte wählen Sie den Restauranttyp",
-      "r9": "Bitte geben Sie die E-Mail-Adresse ein",
-      "r10": "Bitte geben Sie eine gültige E-Mail-Adresse ein",
-      "r11": "Gruppenkonto",
-      "r12": "Konto des privaten Restaurants",
-      "r13": "Japan"
+  'restaurantUser': {
+    'ru1': 'Nachname der verantwortlichen Person:',
+    'ru2': 'Vorname der verantwortlichen Person:',
+    'ru3': 'Telefon der verantwortlichen Person:',
+    'ru4': 'Adresse der verantwortlichen Person:',
+    'ru5': 'Stadt:',
+    'ru6': 'Bundesland/Provinz:',
+    'ru7': 'Postleitzahl:',
+    'ru8': 'Land:',
+    'ru9': 'bitte auswählen',
+    'ru10': 'E-Mail-Adresse:',
+    'ru11': 'Restauranttyp:',
+    'ru12': 'Weiter',
+    'rules': {
+      'r1': 'Bitte geben Sie die Kontaktinformationen ein',
+      'r2': 'Bitte geben Sie den Nachnamen ein',
+      'r3': 'Bitte geben Sie den Vornamen ein',
+      'r4': 'Bitte geben Sie eine ausführliche Adresse ein',
+      'r5': 'Bitte geben Sie Ihre Stadt ein',
+      'r6': 'Bitte geben Sie das Bundesland / die Provinz ein',
+      'r7': 'Bitte geben Sie Ihr Land ein',
+      'r8': 'Bitte wählen Sie den Restauranttyp',
+      'r9': 'Bitte geben Sie die E-Mail-Adresse ein',
+      'r10': 'Bitte geben Sie eine gültige E-Mail-Adresse ein',
+      'r11': 'Gruppenkonto',
+      'r12': 'Konto des privaten Restaurants',
+      'r13': 'Japan'
     }
   },
-  "restaurantInfo": {
-    "ri1": "Name des Restaurants",
-    "ri2": "Restauranttyp:",
-    "ri3": "Logo des Restaurants:",
-    "ri4": "Restaurantadresse:",
-    "ri5": "Land:",
-    "ri6": "bitte auswählen",
-    "ri7": "Provinz:",
-    "ri8": "Stadt:",
-    "ri9": "Straße:",
-    "rin9": "Spezifische Adresse：",
-    "ri10": "Telefonnummer des Restaurants:",
-    "ri11": "E-Mail-Adresse des Restaurants:",
-    "ri12": "Gastronomiegewerbe:",
-    "ri13": "Steuern:",
-    "ri14": "Trinkgeld:",
-    "ri15": "Öffnungszeiten des Restaurants:",
-    "ri16": "Hinzufügen",
-    "ri17": "Beschreibung des Restaurants:",
-    "ri18": "Bilder der Restaurantumgebung:",
-    "ri19": "Servicesprache des Restaurants",
-    "ri20": "Unterstützte Ländersprachen:",
-    "ri21": "Lieferung ja/nein?:",
-    "ri22": "Lieferzeitpunkt",
-    "ri23": "Startzeit",
-    "ri24": "Endzeit",
-    "ri25": "Bestellzeitraum der Lieferung",
-    "ri26": "Menge der zu liefernden Bestellungen:",
-    "ri27": "Lieferbereich:",
-    "ri28": "Ist eine Abholung möglich?",
-    "ri29": "Breitengrad und Längengrad des Restaurants:",
-    "ri30": "Längengrad",
-    "ri31": "Breitengrad ",
-    "ri32": "Ist das ein kooperatives Restaurant?",
-    "ri33": "Änderung bestätigen",
-    "ri34": "bestätigen und Konto erstellen",
-    "ri35": "Bitte fügen Sie die Öffnungszeiten hinzu",
-    "ri36": "Bitte wählen Sie einen Liefertermin aus",
-    "ri37": "Die maximal zulässige Anzahl des Photos beträgt 9 Stücke",
-    "ri38": "Bitte wählen Sie einen Zeittyp",
-    "ri39": "Der Zeittyp wurde ausgewählt",
-    "ri40": "Bitte geben Sie die Zeit ein",
-    "ri41": "Bitte geben Sie ein richtiges Zeitformat ein",
-    "ri42": "Startzeit zur Lieferung",
-    "ri43": "Endzeit zur Lieferung",
-    "ri44": "Menge der Aufträge",
-    "ri45": "Lieferbereich",
-    "ri46": "Bitte eingeben",
-    
+  'restaurantInfo': {
+    'ri1': 'Name des Restaurants',
+    'ri2': 'Restauranttyp:',
+    'ri3': 'Logo des Restaurants:',
+    'ri4': 'Restaurantadresse:',
+    'ri5': 'Land:',
+    'ri6': 'bitte auswählen',
+    'ri7': 'Provinz:',
+    'ri8': 'Stadt:',
+    'ri9': 'Straße:',
+    'rin9': 'Spezifische Adresse：',
+    'ri10': 'Telefonnummer des Restaurants:',
+    'ri11': 'E-Mail-Adresse des Restaurants:',
+    'ri12': 'Gastronomiegewerbe:',
+    'ri13': 'Steuern:',
+    'ri14': 'Trinkgeld:',
+    'ri15': 'Öffnungszeiten des Restaurants:',
+    'ri16': 'Hinzufügen',
+    'ri17': 'Beschreibung des Restaurants:',
+    'ri18': 'Bilder der Restaurantumgebung:',
+    'ri19': 'Servicesprache des Restaurants',
+    'ri20': 'Unterstützte Ländersprachen:',
+    'ri21': 'Lieferung ja/nein?:',
+    'ri22': 'Lieferzeitpunkt',
+    'ri23': 'Startzeit',
+    'ri24': 'Endzeit',
+    'ri25': 'Bestellzeitraum der Lieferung',
+    'ri26': 'Menge der zu liefernden Bestellungen:',
+    'ri27': 'Lieferbereich:',
+    'ri28': 'Ist eine Abholung möglich?',
+    'ri29': 'Breitengrad und Längengrad des Restaurants:',
+    'ri30': 'Längengrad',
+    'ri31': 'Breitengrad ',
+    'ri32': 'Ist das ein kooperatives Restaurant?',
+    'ri33': 'Änderung bestätigen',
+    'ri34': 'bestätigen und Konto erstellen',
+    'ri35': 'Bitte fügen Sie die Öffnungszeiten hinzu',
+    'ri36': 'Bitte wählen Sie einen Liefertermin aus',
+    'ri37': 'Die maximal zulässige Anzahl des Photos beträgt 9 Stücke',
+    'ri38': 'Bitte wählen Sie einen Zeittyp',
+    'ri39': 'Der Zeittyp wurde ausgewählt',
+    'ri40': 'Bitte geben Sie die Zeit ein',
+    'ri41': 'Bitte geben Sie ein richtiges Zeitformat ein',
+    'ri42': 'Startzeit zur Lieferung',
+    'ri43': 'Endzeit zur Lieferung',
+    'ri44': 'Menge der Aufträge',
+    'ri45': 'Lieferbereich',
+    'ri46': 'Bitte eingeben',
+
     'ri47': 'Gibt an, ob der Drucker unterstützt werden soll:',
     'ri48': 'Drucker binden',
     'ri49': 'Druckername',
@@ -175,320 +176,332 @@ const de = {
     'ri52': 'Front-End-Drucker',
     'ri53': 'Zurück Küchendrucker',
     'ri54': 'Drucker existiert bereits',
-    "rules": {
-      "r1": "Bitte geben Sie den Namen des Restaurants ein",
-      "r2": "Bitte geben Sie den Restauranttyp ein",
-      "r3": "Bitte wählen Sie das Land",
-      "r4": "Bitte geben Sie die Stadt ein",
-      "r5": "Bitte geben Sie das Provinz ein",
-      "r6": "Bitte geben Sie eine ausführliche Adresse ein",
-      "r7": "Bitte Bitte geben Sie die Shopbereich ein",
-      "r8": "Bitte geben Sie die Telefonnummer für das Restaurant ein",
-      "r9": "长度在 6 到 11 个字符",
-      "r10": "Bitte wählen Sie die Servicesprache des Restaurants",
-      "r11": "Bitte geben Sie die E-Mail-Adresse ein",
-      "r12": "Bitte geben Sie eine gültige E-Mail-Adresse ein",
-      "r13": "Bitte geben Sie die Öffnungszeiten ein"
+    'rules': {
+      'r1': 'Bitte geben Sie den Namen des Restaurants ein',
+      'r2': 'Bitte geben Sie den Restauranttyp ein',
+      'r3': 'Bitte wählen Sie das Land',
+      'r4': 'Bitte geben Sie die Stadt ein',
+      'r5': 'Bitte geben Sie das Provinz ein',
+      'r6': 'Bitte geben Sie eine ausführliche Adresse ein',
+      'r7': 'Bitte Bitte geben Sie die Shopbereich ein',
+      'r8': 'Bitte geben Sie die Telefonnummer für das Restaurant ein',
+      'r9': '长度在 6 到 11 个字符',
+      'r10': 'Bitte wählen Sie die Servicesprache des Restaurants',
+      'r11': 'Bitte geben Sie die E-Mail-Adresse ein',
+      'r12': 'Bitte geben Sie eine gültige E-Mail-Adresse ein',
+      'r13': 'Bitte geben Sie die Öffnungszeiten ein'
     },
-    "week": {
-      "w1": "Montag",
-      "w2": "Dienstag",
-      "w3": "Mittwoch",
-      "w4": "Donnerstag",
-      "w5": "Freitag",
-      "w6": "Samstag",
-      "w7": "Sonntag"
+    'week': {
+      'w1': 'Montag',
+      'w2': 'Dienstag',
+      'w3': 'Mittwoch',
+      'w4': 'Donnerstag',
+      'w5': 'Freitag',
+      'w6': 'Samstag',
+      'w7': 'Sonntag'
     },
-    "time": {
-      "t1": "Morgens",
-      "t2": "Nachmittags",
-      "t3": "Abends",
-      "t4": "Gänztägig"
+    'time': {
+      't1': 'Morgens',
+      't2': 'Nachmittags',
+      't3': 'Abends',
+      't4': 'Gänztägig'
     }
   },
-  "header": {
-    "h1": "Sind Sie sicher, sich abzumelden?",
-    "h2": "Hinweise",
-    "h3": "Bestätigen",
-    "h4": "Stornieren"
+  'header': {
+    'h1': 'Sind Sie sicher, sich abzumelden?',
+    'h2': 'Hinweise',
+    'h3': 'Bestätigen',
+    'h4': 'Stornieren'
   },
-  "request": {
-    "r1": "Fehler bei der Verarbeitung Ihrer Anfrage",
-    "r2": "Serverfehler"
+  'request': {
+    'r1': 'Fehler bei der Verarbeitung Ihrer Anfrage',
+    'r2': 'Failed to load, please refreash the page and try again',
+    'r3': 'Failed to connect, please check your network'
   },
-  "orderList": {
-    "ol1": "Bitte geben Sie den Namen des Restaurants auf \"Bestellung Ansehen\" ein,",
-    "ol2": "Bis zum",
-    "ol3": "Startdatum",
-    "ol4": "Enddatum",
-    "ol5": "Auftragsart",
-    "ol6": "查 询",
-    "ol7": "Nummer",
-    "ol8": "Zeit",
-    "ol9": "Typ ",
-    "ol10": "Bestellnummer",
-    "ol11": "Name des Restaurants",
-    "ol12": "Zwischensumme ",
-    "ol13": "Gesamtsumme",
-    "ol14": "Telefon",
-    "ol15": "Bestellstatus",
-    "ol16": "Nichtbezahlt",
-    "oln17": "Bezahlt",
-    "ol17": "In der Herstellung",
-    "ol18": "Aufgabe",
-    "ol19": "Bestell Details ansehen",
-    "ol20": "Lieferung",
-    "ol21": "Essen vor Ort",
-    "ol22": "Abholung",
-    "oln22": "Mitnehmen",
-    "ol23": "Bankkarte",
-    "ol24": "Kreditkarte",
-    "ol25": "Bargeld",
-    "ol26": "Andere",
-    "ol27": "Storniert",
-    "o128": "Bestellung stornieren"
+  'orderList': {
+    'ol1': 'Bitte geben Sie den Namen des Restaurants auf "Bestellung Ansehen" ein,',
+    'ol2': 'Bis zum',
+    'ol3': 'Startdatum',
+    'ol4': 'Enddatum',
+    'ol5': 'Auftragsart',
+    'ol6': '查 询',
+    'ol7': 'Nummer',
+    'ol8': 'Zeit',
+    'ol9': 'Typ ',
+    'ol10': 'Bestellnummer',
+    'ol11': 'Name des Restaurants',
+    'ol12': 'Zwischensumme ',
+    'ol13': 'Gesamtsumme',
+    'ol14': 'Telefon',
+    'ol15': 'Bestellstatus',
+    'ol16': 'Nichtbezahlt',
+    'oln17': 'Bezahlt',
+    'ol17': 'In der Herstellung',
+    'ol18': 'Aufgabe',
+    'ol19': 'Bestell Details ansehen',
+    'ol20': 'Lieferung',
+    'ol21': 'Essen vor Ort',
+    'ol22': 'Abholung',
+    'oln22': 'Mitnehmen',
+    'ol23': 'Bankkarte',
+    'ol24': 'Kreditkarte',
+    'ol25': 'Bargeld',
+    'ol26': 'Andere',
+    'ol27': 'Storniert',
+    'ol28': 'Bestellung stornieren',
+    'ol29': 'Meine heutige Bestellung',
+    'ol30': "Alle Bestellungen",
+    'ol31': 'Bestellung erfolgt',
+    'ol32': 'Bestellung löschen',
+    ol33: 'View more'
   },
-  "orderDetails": {
-    "od1": "Ordnungsnummer",
-    "od2": "Bestellzeitpunkt:",
-    "od3": "Typ:",
-    "odn3": "Abholungszeit",
-    "od4": "Bestellnummer",
-    "od5": "Name des Restaurants",
-    "odn5": "Tischnummer",
-    "od6": "Zwischensumme ",
-    "od7": "Gesamtsumme",
-    "od8": "Kontaktnummer:",
-    "odn8": "Kontaktperson:",
-    "od9": "Kontakt E-mail:",
-    "od10": "Zahlungsstatus",
-    "od11": "Zahlungsmethode:",
-    "od12": "Gerichtsnummer",
-    "od13": "Gerichtsname",
-    "od14": "Gerichtsprice",
-    "od15": "Anzahl der Gerichte",
-    "od16": "Lieferungsadresse",
-    "ad17": "Trinkgeld:",
-    "ad18": "Trinkgeld für die Lieferung",
-    "ad19": "Notize",
-    "ad20": "Koks:{num}Tasse Verpackungsbox:{count}EIN"
+  'orderDetails': {
+    'od1': 'Ordnungsnummer',
+    'od2': 'Bestellzeitpunkt:',
+    'od3': 'Typ:',
+    'odn3': 'Abholungszeit',
+    'od4': 'Bestellnummer',
+    'od5': 'Name des Restaurants',
+    'odn5': 'Tischnummer',
+    'od6': 'Zwischensumme ',
+    'od7': 'Gesamtsumme',
+    'od8': 'Kontaktnummer:',
+    'odn8': 'Kontaktperson:',
+    'od9': 'Kontakt E-mail:',
+    'od10': 'Zahlungsstatus',
+    'od11': 'Zahlungsmethode:',
+    'od12': 'Gerichtsnummer',
+    'od13': 'Gerichtsname',
+    'od14': 'Gerichtsprice',
+    'od15': 'Anzahl der Gerichte',
+    'od16': 'Lieferungsadresse',
+    'ad17': 'Trinkgeld:',
+    'ad18': 'Trinkgeld für die Lieferung',
+    'ad19': 'Notize',
+    'ad20': 'Koks:{num}Tasse Verpackungsbox:{count}EIN',
+    'ad21': 'Steuern'
   },
-  "discount": {
-    "dc1": "Bitte geben Sie den Namen des Restaurants auf \"Bestellung Ansehen\" ein,",
-    "dc2": "Vergünstigungsart",
-    "dc3": "Rabatt",
-    "dc4": "Neukunden",
-    "dc5": "Alte Kunden:",
-    "dc6": "Bitte geben Sie den Benutzerrabatt ein",
-    "dc7": "Veranstaltungsdatum:",
-    "dc8": "Bis zum",
-    "dc9": "Startdatum",
-    "dc10": "Enddatum",
-    "dc11": "Ermäßigung",
-    "dc12": "Bitte geben Sie den Preis ein",
-    "dc13": "Bitte geben Sie den Vorzugspreis ein",
-    "dc14": "Über",
-    "dc15": "Veranstaltungsdatum:",
-    "dc16": "Veranstaltungsregeln",
-    "dc17": "Veränderung",
-    "dc18": "bestätigen",
-    "dc19": "Bitte Vergünstigungsart hinzufügen",
-    "dc20": "Bitte wählen Sie das Datum der Rabattveranstaltung",
-    "dc21": "Bitte wählen Sie das Datum für die Ermäßigung",
-    "dc22": "Bitte geben Sie die Veranstaltungsregeln ein",
-    "dc23": "Erfolgreich geändert",
-    "dc24": "Erfolgreich hinzugefügt",
-    "dc25": "Sind Sie sicher, diese Vergünstigung zu löschen?",
-    "dc26": "Hinweise",
-    "dc27": "Bestätigen",
-    "dc28": "Stornieren"
+  'discount': {
+    'dc1': 'Bitte geben Sie den Namen des Restaurants auf "Bestellung Ansehen" ein,',
+    'dc2': 'Vergünstigungsart',
+    'dc3': 'Rabatt',
+    'dc4': 'Neukunden',
+    'dc5': 'Alte Kunden:',
+    'dc6': 'Bitte geben Sie den Benutzerrabatt ein',
+    'dc7': 'Veranstaltungsdatum:',
+    'dc8': 'Bis zum',
+    'dc9': 'Startdatum',
+    'dc10': 'Enddatum',
+    'dc11': 'Ermäßigung',
+    'dc12': 'Bitte geben Sie den Preis ein',
+    'dc13': 'Bitte geben Sie den Vorzugspreis ein',
+    'dc14': 'Über',
+    'dc15': 'Veranstaltungsdatum:',
+    'dc16': 'Veranstaltungsregeln',
+    'dc17': 'Veränderung',
+    'dc18': 'bestätigen',
+    'dc19': 'Bitte Vergünstigungsart hinzufügen',
+    'dc20': 'Bitte wählen Sie das Datum der Rabattveranstaltung',
+    'dc21': 'Bitte wählen Sie das Datum für die Ermäßigung',
+    'dc22': 'Bitte geben Sie die Veranstaltungsregeln ein',
+    'dc23': 'Erfolgreich geändert',
+    'dc24': 'Erfolgreich hinzugefügt',
+    'dc25': 'Sind Sie sicher, diese Vergünstigung zu löschen?',
+    'dc26': 'Hinweise',
+    'dc27': 'Bestätigen',
+    'dc28': 'Stornieren'
   },
-  "menu": {
-    "m1": "Bitte geben Sie den Namen des Restaurants auf \"Bestellung Ansehen\" ein,",
-    "m2": "suchen nach",
-    "m3": "Gruppenkontoliste",
-    "m4": "Liste der allgemeinen Konten",
-    "mn4": "Kontoliste",
-    "m5": "Nummer",
-    "m6": "Laden ID",
-    "m7": "Ladenname",
-    "m8": "Ladengewerbe ",
-    "m9": "Restauranttyp",
-    "m10": "Online Status",
-    "m11": "Passwort für das Restaurantkonto",
-    "m12": "Konto",
-    "m13": "Passwort",
-    "m14": "Ladenadresse",
-    "m15": "Restaurant importieren",
-    "m16": "Menü importieren",
-    "m17": "Restaurantinformationen importieren",
-    "m18": "Rabattinformationen",
-    "m19": "siehe Details",
-    "m20": "Rabatt hinzufügen",
-    "m21": "Überprüfungsstatus",
-    "m22": "Grund anzeigen",
-    "m23": "Aufgabe des Restaurants",
-    "m24": "Menü Ansicht",
-    "m25": "Bearbeiten",
-    "m26": "Löschen",
-    "m27": "Kategorie ",
-    "m28": "Name der verantwortlichen Person vom Restaurant",
-    "m29": "E-Mail",
-    "m30": "Telefon",
-    "m31": "Menge des Restaurants",
-    "m32": "Aufgabe",
-    "m33": "Restaurant hinzufügen",
-    "m34": "Bearbeiten",
-    "m35": "Löschen",
-    "m36": "Gründen für Überprüfungsmisserfolg ",
-    "m37": "Vorübergehend Kein Grund!",
-    "m38": "bestätigen",
-    "m39": "Sind Sie sicher, dieses Restaurant zu löschen?",
-    "m40": "Hinweise",
-    "m41": "Bestätigen",
-    "m42": "Stornieren",
-    "m43": "Sie können nur Dateien in einem XLSX-Format hochgeladen werden",
-    "m44": "Die Dateigröße darf 5 MB nicht überschreiten",
-    "m45": "Bitte warten Sie, es kann jeweils nur eine Datei hochgeladen werden",
-    "m46": "Erfolgreich importiert",
-    "m47": "Sind Sie sicher, den Status des Restaurants zu ändern?",
-    "m48": "Erfolgreich gelöscht",
-    "m49": "Erfolgreich geändert",
-    "m50": "Sind Sie sicher, die für dieses Restaurant verantwortliche Person zu löschen?",
-    "m51": [
-      "Ausruhen",
-      "in Betrieb",
-      "Während der Überprüfung",
-      "Prüfung fehlgeschlagen",
-      "gelöscht"
+  'menu': {
+    'm1': 'Bitte geben Sie den Namen des Restaurants auf "Bestellung Ansehen" ein,',
+    'm2': 'suchen nach',
+    'm3': 'Gruppenkontoliste',
+    'm4': 'Liste der allgemeinen Konten',
+    'mn4': 'Kontoliste',
+    'm5': 'Nummer',
+    'm6': 'Laden ID',
+    'm7': 'Ladenname',
+    'm8': 'Ladengewerbe ',
+    'm9': 'Restauranttyp',
+    'm10': 'Online Status',
+    'm11': 'Passwort für das Restaurantkonto',
+    'm12': 'Konto',
+    'm13': 'Passwort',
+    'm14': 'Ladenadresse',
+    'm15': 'Restaurant importieren',
+    'm16': 'Menü importieren',
+    'm17': 'Restaurantinformationen importieren',
+    'm18': 'Rabattinformationen',
+    'm19': 'siehe Details',
+    'm20': 'Rabatt hinzufügen',
+    'm21': 'Überprüfungsstatus',
+    'm22': 'Grund anzeigen',
+    'm23': 'Aufgabe des Restaurants',
+    'm24': 'Menü Ansicht',
+    'm25': 'Bearbeiten',
+    'm26': 'Löschen',
+    'm27': 'Kategorie ',
+    'm28': 'Name der verantwortlichen Person vom Restaurant',
+    'm29': 'E-Mail',
+    'm30': 'Telefon',
+    'm31': 'Menge des Restaurants',
+    'm32': 'Aufgabe',
+    'm33': 'Restaurant hinzufügen',
+    'm34': 'Bearbeiten',
+    'm35': 'Löschen',
+    'm36': 'Gründen für Überprüfungsmisserfolg ',
+    'm37': 'Vorübergehend Kein Grund!',
+    'm38': 'bestätigen',
+    'm39': 'Sind Sie sicher, dieses Restaurant zu löschen?',
+    'm40': 'Hinweise',
+    'm41': 'Bestätigen',
+    'm42': 'Stornieren',
+    'm43': 'Sie können nur Dateien in einem XLSX-Format hochgeladen werden',
+    'm44': 'Die Dateigröße darf 5 MB nicht überschreiten',
+    'm45': 'Bitte warten Sie, es kann jeweils nur eine Datei hochgeladen werden',
+    'm46': 'Erfolgreich importiert',
+    'm47': 'Sind Sie sicher, den Status des Restaurants zu ändern?',
+    'm48': 'Erfolgreich gelöscht',
+    'm49': 'Erfolgreich geändert',
+    'm50': 'Sind Sie sicher, die für dieses Restaurant verantwortliche Person zu löschen?',
+    'm51': [
+      'Ausruhen',
+      'in Betrieb',
+      'Während der Überprüfung',
+      'Prüfung fehlgeschlagen',
+      'gelöscht'
     ]
   },
-  "dishes": {
-    "d1": "Auftragsart",
-    "d2": "Lieferung",
-    "d3": "Abholung",
-    "d4": "Essen vor Ort",
-    "d5": "Suchen Sie nach Gerichten",
-    "d6": "suchen nach",
-    "d7": "Zurück",
-    "d8": "Gericht hinzufügen",
-    "d9": "Alle Gerichte löschen",
-    "d10": "Nummer",
-    "d11": "Menütyp",
-    "d12": "Gerichtsname",
-    "d13": "Gerichtsprice",
-    "d14": "Klassifizierung von Gerichten",
-    "d15": "Zuordnen von Gerichten",
-    "d16": "Spezifikationen von Gerichten:",
-    "d17": "Menge",
-    "d18": "Bilder von Gerichten",
-    "d19": "Angebotszeit",
-    "d20": "Überprüfungsstatus",
-    "d211": "Grund anzeigen",
-    "d21": "Aufgabe",
-    "d22": "Ist es als empfohlenes Gericht eingestellt?",
-    "d23": "Löschen",
-    "d24": "Nicht Verfügbar",
-    "d25": "in den Regalen",
-    "d26": "Waren",
-    "d27": "Bearbeiten",
-    "d28": "Gründen für Überprüfungsmisserfolg ",
-    "d29": "Vorübergehend Kein Grund!",
-    "d30": "Bestätigen",
-    "d31": "Gesamtheit",
-    "d32": "Frühstück",
-    "d33": "Mittagsessen",
-    "d34": "Tea Time",
-    "d35": "Abendsessen",
-    "d36": "Nachtessen",
-    "d37": "Ist es als empfohlenes Gericht eingestellt?",
-    "d38": "Stornieren Sie die empfohlenen Gerichte?",
-    "d39": "Löschen Sie das Gericht?",
-    "d40": "Stell das Gericht aus der Regal?",
-    "d41": "Stell das Gericht auf der Regal?",
-    "d42": "Löschen Sie das komplette Gericht?",
-    "d43": "Erfolgreich gelöscht",
-    "d44": [
-      "Status überprüfen",
-      "überprüft",
-      "Audit-Fehler"
+  'dishes': {
+    'd1': 'Auftragsart',
+    'd2': 'Lieferung',
+    'd3': 'Abholung',
+    'd4': 'Essen vor Ort',
+    'd5': 'Suchen Sie nach Gerichten',
+    'd6': 'suchen nach',
+    'd7': 'Zurück',
+    'd8': 'Gericht hinzufügen',
+    'd9': 'Alle Gerichte löschen',
+    'd10': 'Nummer',
+    'd11': 'Menütyp',
+    'd12': 'Gerichtsname',
+    'd13': 'Gerichtsprice',
+    'd14': 'Klassifizierung von Gerichten',
+    'd15': 'Zuordnen von Gerichten',
+    'd16': 'Spezifikationen von Gerichten:',
+    'd17': 'Menge',
+    'd18': 'Bilder von Gerichten',
+    'd19': 'Angebotszeit',
+    'd20': 'Überprüfungsstatus',
+    'd211': 'Grund anzeigen',
+    'd21': 'Aufgabe',
+    'd22': 'Ist es als empfohlenes Gericht eingestellt?',
+    'd23': 'Löschen',
+    'd24': 'Nicht Verfügbar',
+    'd25': 'in den Regalen',
+    'd26': 'Waren',
+    'd27': 'Bearbeiten',
+    'd28': 'Gründen für Überprüfungsmisserfolg ',
+    'd29': 'Vorübergehend Kein Grund!',
+    'd30': 'Bestätigen',
+    'd31': 'Gesamtheit',
+    'd32': 'Frühstück',
+    'd33': 'Mittagsessen',
+    'd34': 'Tea Time',
+    'd35': 'Abendsessen',
+    'd36': 'Nachtessen',
+    'd37': 'Ist es als empfohlenes Gericht eingestellt?',
+    'd38': 'Stornieren Sie die empfohlenen Gerichte?',
+    'd39': 'Löschen Sie das Gericht?',
+    'd40': 'Stell das Gericht aus der Regal?',
+    'd41': 'Stell das Gericht auf der Regal?',
+    'd42': 'Löschen Sie das komplette Gericht?',
+    'd43': 'Erfolgreich gelöscht',
+    'd44': [
+      'Status überprüfen',
+      'überprüft',
+      'Audit-Fehler'
     ],
-    "d45": "Erfolgreich geändert"
+    'd45': 'Erfolgreich geändert'
   },
-  "menuInfo": {
-    "mi1": "Gerichtsname",
-    "mi2": "Gerichtsprice",
-    "mi3": "Bestandsmenge",
-    "mi4": "Bilder von Gerichten:",
-    "mi5": "Angebotszeit",
-    "mi6": "Empfehlung ja/nein ?",
-    "mi7": "Als Spezialität eingestellt",
-    "mi8": "Geschichtskategorie:",
-    "mi9": "Gültige Zeit von Gerichten",
-    "mi10": "Klassifizierung von Gerichten",
-    "mi11": "Gerichtsetikette",
-    "mi12": "Steuersatz:",
-    "mi13": "Steuersatz:",
-    "mi14": "Schärfegrad",
-    "mi15": "Zuordnen von Gerichten",
-    "mi16": "Spezifikationen von Gerichten:",
-    "mi17": "Eigenschaften",
-    "mi18": "Einzelpreis",
-    "mi19": "Gerichtshinzufügen",
-    "mi20": "Gerichte Bemerkungen",
-    "mi21": "Kaufmethode:",
-    "mi22": "bitte auswählen",
-    "mi23": "Gerichte ändern",
-    "mi24": "Überprüfung abschicken",
-    "mi25": "Bitte wählen Sie eine Kaufmethode",
-    "mi26": "Bitte wählen Sie das Gültigdatum des Gerichts",
-    "mi27": "Gerichte",
-    "mi28": "Getränke",
-    "mi29": "Abholung",
-    "mi30": "Lieferung",
-    "mi31": "Essen vor Ort",
-    "mi32": "Bitte geben Sie den Namen des Gerichts ein",
-    "mi33": "Bitte geben Sie den Preis des Gerichts ein",
-    "mi34": "Bitte geben Sie die Lagermenge ein",
-    "mi35": "Bitte wählen Sie die Angebotszeit",
-    "mi36": "Bitte wählen Sie die Kategorie der Gerichte",
-    "mi37": "RMB / Japanischer Yen",
-    "mi38": "US-Dollar",
-    "mi39": "Euro",
-    "mi40": "Erfolgreich hinzugefügt",
-    "mi41": "Erfolgreich geändert"
+  'menuInfo': {
+    'mi1': 'Gerichtsname',
+    'mi2': 'Gerichtsprice',
+    'mi3': 'Bestandsmenge',
+    'mi4': 'Bilder von Gerichten:',
+    'mi5': 'Angebotszeit',
+    'mi6': 'Empfehlung ja/nein ?',
+    'mi7': 'Als Spezialität eingestellt',
+    'mi8': 'Geschichtskategorie',
+    'mi9': 'Gültige Zeit von Gerichten',
+    'mi10': 'Klassifizierung von Gerichten',
+    'mi11': 'Gerichtsetikette',
+    'mi12': 'Steuersatz',
+    'mi13': 'Steuersatz',
+    'mi14': 'Schärfegrad',
+    'mi15': 'Zuordnen von Gerichten',
+    'mi16': 'Spezifikationen von Gerichten:',
+    'mi17': 'Eigenschaften',
+    'mi18': 'Einzelpreis',
+    'mi19': 'Gerichtshinzufügen',
+    'mi20': 'Gerichte Bemerkungen',
+    'mi21': 'Kaufmethode',
+    'mi22': 'bitte auswählen',
+    'mi23': 'Gerichte ändern',
+    'mi24': 'Überprüfung abschicken',
+    'mi25': 'Bitte wählen Sie eine Kaufmethode',
+    'mi26': 'Bitte wählen Sie das Gültigdatum des Gerichts',
+    'mi27': 'Gerichte',
+    'mi28': 'Getränke',
+    'mi29': 'Abholung',
+    'mi30': 'Lieferung',
+    'mi31': 'Essen vor Ort',
+    'mi32': 'Bitte geben Sie den Namen des Gerichts ein',
+    'mi33': 'Bitte geben Sie den Preis des Gerichts ein',
+    'mi34': 'Bitte geben Sie die Lagermenge ein',
+    'mi35': 'Bitte wählen Sie die Angebotszeit',
+    'mi36': 'Bitte wählen Sie die Kategorie der Gerichte',
+    'mi37': 'RMB / Japanischer Yen',
+    'mi38': 'US-Dollar',
+    'mi39': 'Euro',
+    'mi40': 'Erfolgreich hinzugefügt',
+    'mi41': 'Erfolgreich geändert',
+    'mi42': 'Bitte die Geschirrkategorie eingeben',
+    'mi43': 'Bitte den Lebensmittelsteuersatz eingeben',
+    'mi44': 'Ist es eine Pizza?',
+    mi45:'Dishes Arrangement',
+    mi46:"The dish has been existed. Do you want to replace it？The restaurant's last number is："
   },
-  "addHoliday": {
-    "ah1": "Restaurant suchen",
-    "ah2": "Urlaubstermine einstellen",
-    "ah3": "Starttermin:",
-    "ah4": "Startzeit",
-    "ah5": "Endzeit:",
-    "ah6": "Endzeit",
-    "ah7": "Bestätigen",
-    "ah8": "Bitte wählen Sie ein Restaurant",
-    "ah9": "Bitte wählen Sie ein Datum",
-    "ah10": "Bitte Startzeit auswählen",
-    "ah11": "Bitte wählen Sie die Endzeit",
-    "ah12": "Erfolgreich geändert",
-    "ah13": "Erfolgreich hinzugefügt"
+  'addHoliday': {
+    'ah1': 'Restaurant suchen',
+    'ah2': 'Urlaubstermine einstellen',
+    'ah3': 'Starttermin:',
+    'ah4': 'Startzeit',
+    'ah5': 'Endzeit:',
+    'ah6': 'Endzeit',
+    'ah7': 'Bestätigen',
+    'ah8': 'Bitte wählen Sie ein Restaurant',
+    'ah9': 'Bitte wählen Sie ein Datum',
+    'ah10': 'Bitte Startzeit auswählen',
+    'ah11': 'Bitte wählen Sie die Endzeit',
+    'ah12': 'Erfolgreich geändert',
+    'ah13': 'Erfolgreich hinzugefügt'
   },
-  "holiday": {
-    "h1": "Urlaubseinstellungen",
-    "h2": "Hinzufügen",
-    "h3": "Nummer",
-    "h4": "Datum",
-    "h5": "Startzeit",
-    "h6": "Endzeit",
-    "h7": "Geschlossenes Restaurant an Feiertagen",
-    "h8": "Aufgabe",
-    "h9": "Bearbeiten",
-    "h10": "Löschen",
-    "h11": "Urlaub bearbeiten",
-    "h12": "Sind Sie sicher, diesen Restauranturlaub zu löschen?",
-    "h13": "Erfolgreich gelöscht"
+  'holiday': {
+    'h1': 'Urlaubseinstellungen',
+    'h2': 'Hinzufügen',
+    'h3': 'Nummer',
+    'h4': 'Datum',
+    'h5': 'Startzeit',
+    'h6': 'Endzeit',
+    'h7': 'Geschlossenes Restaurant an Feiertagen',
+    'h8': 'Aufgabe',
+    'h9': 'Bearbeiten',
+    'h10': 'Löschen',
+    'h11': 'Urlaub bearbeiten',
+    'h12': 'Sind Sie sicher, diesen Restauranturlaub zu löschen?',
+    'h13': 'Erfolgreich gelöscht'
   },
-  "person": {
+  'person': {
     p1: 'Nummerierung',
     p2: 'Name',
     p3: 'Geschlecht',
@@ -507,20 +520,20 @@ const de = {
     p16: 'Weiblich',
     p17: 'Konto'
   },
-  "qrcode": {
-    "qc1": "QR-Code generieren",
-    "qc2": "Massen-Download",
-    "qc3": "Nummer",
-    "qc4": "QR-Code ",
-    "qc5": "Tischnummer",
-    "qc6": "Aufgabe",
-    "qc7": "QR-Code speichern",
-    "qc8": "Löschen",
-    "qc9": "Bitte geben Sie die Tischnummer ein",
-    "qc10": "Erfolgreich hinzugefügt",
-    "qc11": "Erfolgreich gelöscht"
+  'qrcode': {
+    'qc1': 'QR-Code generieren',
+    'qc2': 'Massen-Download',
+    'qc3': 'Nummer',
+    'qc4': 'QR-Code ',
+    'qc5': 'Tischnummer',
+    'qc6': 'Aufgabe',
+    'qc7': 'QR-Code speichern',
+    'qc8': 'Löschen',
+    'qc9': 'Bitte geben Sie die Tischnummer ein',
+    'qc10': 'Erfolgreich hinzugefügt',
+    'qc11': 'Erfolgreich gelöscht'
   },
   ...deLocale
 }
 
-export default de;
+export default de
diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js
index b5c2efff0305c69f286a541c98cfb879900e6143..6f5d2797f905f13413cc2a594cd42249394dd946 100644
--- a/src/i18n/langs/en.js
+++ b/src/i18n/langs/en.js
@@ -1,171 +1,172 @@
 import enLocale from 'element-ui/lib/locale/lang/en'
 const en = {
-  "home": {
-    "userInfo": "User Info",
-    "order": "Orders",
-    "menu": "Menu Management",
-    "holiday": "Holiday",
-    "registered": [
-      "7 Days",
-      "14 Days",
-      "30 Days",
-      "90 Days"
+  'home': {
+    'userInfo': 'User Info',
+    'order': 'Orders',
+    'menu': 'Menu Management',
+    'holiday': 'Holiday',
+    'registered': [
+      '7 Days',
+      '14 Days',
+      '30 Days',
+      '90 Days'
     ],
-    "registeredTitle": "Number of Restaurants",
-    "signout": "Log out"
+    'registeredTitle': 'Number of Restaurants',
+    'signout': 'Log out'
   },
-  "router": {
-    "home": "Home",
-    "distributor": "Reseller",
-    "restaurant": "Restaurant Management",
-    "data": "Data Management",
-    "editUser": "Edit",
-    "addUser": "Add",
-    "editRestaurant": "Edit",
-    "dishes": "List",
-    "r1": "User Management",
-    "r2": "Order Management",
-    "r3": "Order",
-    "r4": "Menu Management",
-    "r5": "Add New",
-    "r6": "Add Items",
-    "r7": "Discount Type",
-    "r8": "Holiday",
-    "r9": "QR Code Management",
+  'router': {
+    'home': 'Home',
+    'distributor': 'Reseller',
+    'restaurant': 'Restaurant Management',
+    'data': 'Data Management',
+    'editUser': 'Edit',
+    'addUser': 'Add',
+    'editRestaurant': 'Edit',
+    'dishes': 'List',
+    'r1': 'User Management',
+    'r2': 'Order Management',
+    'r3': 'Order',
+    'r4': 'Menu Management',
+    'r5': 'Add New',
+    'r6': 'Add Items',
+    'r7': 'Discount Type',
+    'r8': 'Holiday',
+    'r9': 'QR Code Management',
     r10: 'User Management',
-    r11: 'User Details'
+    r11: 'User Details',
+    title: 'Management System'
   },
-  "users": {
-    "u1": "Add",
-    "u2": "Group Account List",
-    "u3": "Regular Account List",
-    "u4": "Number",
-    "u5": "Telephone",
-    "u6": "Last Name",
-    "u7": "First Name",
-    "u8": "Address",
-    "u9": "City",
-    "u10": "State",
-    "u11": "Zip Code",
-    "u12": "Country",
-    "u13": "Email Address",
-    "u14": "Action",
-    "u15": "Edit"
+  'users': {
+    'u1': 'Add',
+    'u2': 'Group Account List',
+    'u3': 'Regular Account List',
+    'u4': 'Number',
+    'u5': 'Telephone',
+    'u6': 'Last Name',
+    'u7': 'First Name',
+    'u8': 'Address',
+    'u9': 'City',
+    'u10': 'State',
+    'u11': 'Zip Code',
+    'u12': 'Country',
+    'u13': 'Email Address',
+    'u14': 'Action',
+    'u15': 'Edit'
   },
-  "editUser": {
-    "eu1": "phone:",
-    "eu2": "Last Name",
-    "eu3": "First Name",
-    "eu4": "Address",
-    "eu5": "City:",
-    "eu6": "State",
-    "eu7": "Zip Code:",
-    "eu8": "Country:",
-    "eu9": "Email Address",
-    "eu10": "Confirm",
-    "rules": {
-      "r1": "Please enter your contact information",
-      "r2": "6 to 11 characters in length",
-      "r3": "Please enter your last name",
-      "r4": "Please enter your first name",
-      "r5": "Please enter address",
-      "r6": "Please enter city",
-      "r7": "Please enter state/province",
-      "r8": "Please enter country",
-      "r9": "Please enter your Email address",
-      "r10": "Please enter a valid email address"
+  'editUser': {
+    'eu1': 'phone:',
+    'eu2': 'Last Name',
+    'eu3': 'First Name',
+    'eu4': 'Address',
+    'eu5': 'City:',
+    'eu6': 'State',
+    'eu7': 'Zip Code:',
+    'eu8': 'Country:',
+    'eu9': 'Email Address',
+    'eu10': 'Confirm',
+    'rules': {
+      'r1': 'Please enter your contact information',
+      'r2': '6 to 11 characters in length',
+      'r3': 'Please enter your last name',
+      'r4': 'Please enter your first name',
+      'r5': 'Please enter address',
+      'r6': 'Please enter city',
+      'r7': 'Please enter state/province',
+      'r8': 'Please enter country',
+      'r9': 'Please enter your Email address',
+      'r10': 'Please enter a valid email address'
     }
   },
-  "addUser": {
-    "au1": "Restaurant Contact",
-    "au2": "Restaurant Information",
-    "au3": "Please complete the contact info!",
-    "au4": "Cautions",
-    "au5": "Confirm",
-    "au6": "Cancel",
-    "au7": "Successfully added",
-    "au8": "Account",
-    "au9": "Password",
-    "au10": "Download",
-    "au11": "Contact doesn't exist"
+  'addUser': {
+    'au1': 'Restaurant Contact',
+    'au2': 'Restaurant Information',
+    'au3': 'Please complete the contact info!',
+    'au4': 'Cautions',
+    'au5': 'Confirm',
+    'au6': 'Cancel',
+    'au7': 'Successfully added',
+    'au8': 'Account',
+    'au9': 'Password',
+    'au10': 'Download',
+    'au11': "Contact doesn't exist"
   },
-  "restaurantUser": {
-    "ru1": "Lastname",
-    "ru2": "Firstname",
-    "ru3": "Phone",
-    "ru4": "Address",
-    "ru5": "City:",
-    "ru6": "State/Province :",
-    "ru7": "Zip Code:",
-    "ru8": "Country:",
-    "ru9": "Please Select",
-    "ru10": "Email Address",
-    "ru11": "Restaurant Type:",
-    "ru12": "Next",
-    "rules": {
-      "r1": "Please enter your contact information",
-      "r2": "Please enter your last name",
-      "r3": "Please enter your first name",
-      "r4": "Please enter address",
-      "r5": "Please enter city",
-      "r6": "Please enter state/province",
-      "r7": "Please enter country",
-      "r8": "Please select the restaurant type",
-      "r9": "Please enter your Email address",
-      "r10": "Please enter a valid email address",
-      "r11": "Group Account",
-      "r12": "Individual Account",
-      "r13": "Japan"
+  'restaurantUser': {
+    'ru1': 'Lastname',
+    'ru2': 'Firstname',
+    'ru3': 'Phone',
+    'ru4': 'Address',
+    'ru5': 'City:',
+    'ru6': 'State/Province :',
+    'ru7': 'Zip Code:',
+    'ru8': 'Country:',
+    'ru9': 'Please Select',
+    'ru10': 'Email Address',
+    'ru11': 'Restaurant Type:',
+    'ru12': 'Next',
+    'rules': {
+      'r1': 'Please enter your contact information',
+      'r2': 'Please enter your last name',
+      'r3': 'Please enter your first name',
+      'r4': 'Please enter address',
+      'r5': 'Please enter city',
+      'r6': 'Please enter state/province',
+      'r7': 'Please enter country',
+      'r8': 'Please select the restaurant type',
+      'r9': 'Please enter your Email address',
+      'r10': 'Please enter a valid email address',
+      'r11': 'Group Account',
+      'r12': 'Individual Account',
+      'r13': 'Japan'
     }
   },
-  "restaurantInfo": {
-    "ri1": "Restaurant Name:",
-    "ri2": "Restaurant Type:",
-    "ri3": "Restaurant Logo:",
-    "ri4": "Restaurant Address:",
-    "ri5": "Country:",
-    "ri6": "Please Select",
-    "ri7": "State:",
-    "ri8": "City:",
-    "ri9": "Street:",
-    "rin9": "Address：",
-    "ri10": "Phone",
-    "ri11": "Email",
-    "ri12": "Restaurant Industry:",
-    "ri13": "Tax",
-    "ri14": "Tip:",
-    "ri15": "Opening Hours:",
-    "ri16": "Add",
-    "ri17": "Descriptions:",
-    "ri18": "Photos:",
-    "ri19": "Default Language:",
-    "ri20": "Languages:",
-    "ri21": "Delivery Available?",
-    "ri22": "Delivery Time:",
-    "ri23": "Start:",
-    "ri24": "End Time",
-    "ri25": "Delivery Time:",
-    "ri26": "Delivery Orders:",
-    "ri27": "Delievry Zone:",
-    "ri28": "Pick up?",
-    "ri29": "Location Longitude/Latitude",
-    "ri30": "Longitude",
-    "ri31": "Latitude",
-    "ri32": "Partner Restaurant:",
-    "ri33": "Updated",
-    "ri34": "Create",
-    "ri35": "Opening hours",
-    "ri36": "Delivery time",
-    "ri37": "Uploaded up to 9",
-    "ri38": "Type",
-    "ri39": "Selected",
-    "ri40": "Time:",
-    "ri41": "Please enter a valid format",
-    "ri42": "Delivery Start Time",
-    "ri43": "Delivery End Time",
-    "ri44": "Order Numbers",
-    "ri45": "Delievry Zone:",
-    "ri46": "Please enter",
+  'restaurantInfo': {
+    'ri1': 'Restaurant Name:',
+    'ri2': 'Restaurant Type:',
+    'ri3': 'Restaurant Logo:',
+    'ri4': 'Restaurant Address:',
+    'ri5': 'Country:',
+    'ri6': 'Please Select',
+    'ri7': 'State:',
+    'ri8': 'City:',
+    'ri9': 'Street:',
+    'rin9': 'Address：',
+    'ri10': 'Phone',
+    'ri11': 'Email',
+    'ri12': 'Restaurant Industry:',
+    'ri13': 'Tax',
+    'ri14': 'Tip:',
+    'ri15': 'Opening Hours:',
+    'ri16': 'Add',
+    'ri17': 'Descriptions:',
+    'ri18': 'Photos:',
+    'ri19': 'Default Language:',
+    'ri20': 'Languages:',
+    'ri21': 'Delivery Available?',
+    'ri22': 'Delivery Time:',
+    'ri23': 'Start:',
+    'ri24': 'End Time',
+    'ri25': 'Delivery Time:',
+    'ri26': 'Delivery Orders:',
+    'ri27': 'Delievry Zone:',
+    'ri28': 'Pick up?',
+    'ri29': 'Location Longitude/Latitude',
+    'ri30': 'Longitude',
+    'ri31': 'Latitude',
+    'ri32': 'Partner Restaurant:',
+    'ri33': 'Updated',
+    'ri34': 'Create',
+    'ri35': 'Opening hours',
+    'ri36': 'Delivery time',
+    'ri37': 'Uploaded up to 9',
+    'ri38': 'Type',
+    'ri39': 'Selected',
+    'ri40': 'Time:',
+    'ri41': 'Please enter a valid format',
+    'ri42': 'Delivery Start Time',
+    'ri43': 'Delivery End Time',
+    'ri44': 'Order Numbers',
+    'ri45': 'Delievry Zone:',
+    'ri46': 'Please enter',
     ri47: 'Support printer or not:',
     ri48: 'Bind the printer',
     ri49: 'Printer Name',
@@ -174,320 +175,353 @@ const en = {
     ri52: 'Front desk printer',
     ri53: 'Kitchen Printer',
     ri54: 'Printer installed',
-    "rules": {
-      "r1": "Search",
-      "r2": "Please enter restaurant type",
-      "r3": "Please select the country",
-      "r4": "Please enter the city",
-      "r5": "Please Select State",
-      "r6": "Please enter address",
-      "r7": "Please enter category",
-      "r8": "Please enter phone number",
-      "r9": "长度在 6 到 11 个字符",
-      "r10": "Please select default language",
-      "r11": "Please enter your Email address",
-      "r12": "Please enter a valid email address",
-      "r13": "Opening hours"
+    ri55: 'Do you want to use lucky red envelope?',
+    ri56: 'Type of promotion',
+    ri57: 'Support Dine-in or Not',
+    ri58: 'Delivery Fee',
+    
+    ri59:'所属时区',
+    ri60:'请选择所属时区',
+    'rules': {
+      'r1': 'Search',
+      'r2': 'Please enter restaurant type',
+      'r3': 'Please select the country',
+      'r4': 'Please enter the city',
+      'r5': 'Please Select State',
+      'r6': 'Please enter address',
+      'r7': 'Please enter category',
+      'r8': 'Please enter phone number',
+      'r9': '长度在 6 到 11 个字符',
+      'r10': 'Please select default language',
+      'r11': 'Please enter your Email address',
+      'r12': 'Please enter a valid email address',
+      'r13': 'Opening hours'
     },
-    "week": {
-      "w1": "Monday",
-      "w2": "Tuesday",
-      "w3": "Wednesday",
-      "w4": "Thursday",
-      "w5": "Friday",
-      "w6": "Saturday",
-      "w7": "Sunday"
+    'week': {
+      'w1': 'Monday',
+      'w2': 'Tuesday',
+      'w3': 'Wednesday',
+      'w4': 'Thursday',
+      'w5': 'Friday',
+      'w6': 'Saturday',
+      'w7': 'Sunday'
     },
-    "time": {
-      "t1": "AM",
-      "t2": "PM",
-      "t3": "Night ",
-      "t4": "All Day"
+    'time': {
+      't1': 'AM',
+      't2': 'PM',
+      't3': 'Night ',
+      't4': 'All Day'
     }
   },
-  "header": {
-    "h1": "Are you sure to sign out?",
-    "h2": "Cautions",
-    "h3": "Confirm",
-    "h4": "Cancel"
+  'header': {
+    'h1': 'Are you sure to sign out?',
+    'h2': 'Cautions',
+    'h3': 'Confirm',
+    'h4': 'Cancel'
   },
-  "request": {
-    "r1": "Error while requesting…",
-    "r2": "Server Error"
+  'request': {
+    'r1': 'Error while requesting…',
+    'r2': 'Failed to load, please refreash the page and try again',
+    'r3': 'Failed to connect, please check your network'
   },
-  "orderList": {
-    "ol1": "Search",
-    "ol2": "To",
-    "ol3": "Start Date",
-    "ol4": "End Date",
-    "ol5": "Order Type",
-    "ol6": "search",
-    "ol7": "Serial Number",
-    "ol8": "Time",
-    "ol9": "Type",
-    "ol10": "Order Number",
-    "ol11": "Restaurant Name",
-    "ol12": "Subtotal",
-    "ol13": "Total",
-    "ol14": "Telephone",
-    "ol15": "Order Status",
-    "ol16": "Unpaid",
-    "oln17": "Paid",
-    "ol17": "Preparing",
-    "ol18": "Action",
-    "ol19": "Detail",
-    "ol20": "Delivery",
-    "ol21": "Dine in",
-    "ol22": "Self Pick-Up",
-    "oln22": "To go ",
-    "ol23": "Debit Card",
-    "ol24": "Credit Card",
-    "ol25": "Cash",
-    "ol26": "Others",
-    "ol27": "Cancelled",
-    "o128": "Cancel"
+  'orderList': {
+    'ol1': 'Search',
+    'ol2': 'To',
+    'ol3': 'Start Date',
+    'ol4': 'End Date',
+    'ol5': 'Order Type',
+    'ol6': 'search',
+    'ol7': 'Serial Number',
+    'ol8': 'Time',
+    'ol9': 'Type',
+    'ol10': 'Order Number',
+    'ol11': 'Restaurant Name',
+    'ol12': 'Subtotal',
+    'ol13': 'Total',
+    'ol14': 'Telephone',
+    'ol15': 'Order Status',
+    'ol16': 'Unpaid',
+    'oln17': 'Paid',
+    'ol17': 'Preparing',
+    'ol18': 'Action',
+    'ol19': 'Detail',
+    'ol20': 'Delivery',
+    'ol21': 'Dine in',
+    'ol22': 'Self Pick-Up',
+    'oln22': 'To go ',
+    'ol23': 'Debit Card',
+    'ol24': 'Credit Card',
+    'ol25': 'Cash',
+    'ol26': 'Others',
+    'ol27': 'Cancelled',
+    'ol28': 'Cancel Order',
+    'ol29': "Today's Orders",
+    'ol30': 'All Orders',
+    'ol31': 'Completed Orders',
+    'ol32': 'Delete Order',
+    ol33: 'View more',
+    ol34: 'Pay by Card'
   },
-  "orderDetails": {
-    "od1": "Serial Number",
-    "od2": "Order Placed:",
-    "od3": "Type:",
-    "odn3": "Time to Pick up:",
-    "od4": "Order Number:",
-    "od5": "Restaurant Name:",
-    "odn5": "Table number",
-    "od6": "Subtotal:",
-    "od7": "Total:",
-    "od8": "Phone :",
-    "odn8": "Contacts:",
-    "od9": "Email:",
-    "od10": "Payment Status:",
-    "od11": "Payment Method:",
-    "od12": "Dish Number",
-    "od13": "Dishes",
-    "od14": "Price",
-    "od15": "Items",
-    "od16": "Delivery Address:",
-    "ad17": "Tip:",
-    "ad18": "Delivery Fee:",
-    "ad19": "Notes",
-    "ad20": "Drink:{num}cup Packing box:{count}Quantity"
+  'orderDetails': {
+    'od1': 'Serial Number',
+    'od2': 'Order Placed:',
+    'od3': 'Type:',
+    'odn3': 'Time to Pick up:',
+    'od4': 'Order Number:',
+    'od5': 'Restaurant Name:',
+    'odn5': 'Table number',
+    'od6': 'Subtotal:',
+    'od7': 'Total:',
+    'od8': 'Phone :',
+    'odn8': 'Contacts:',
+    'od9': 'Email:',
+    'od10': 'Payment Status:',
+    'od11': 'Payment Method:',
+    'od12': 'Dish Number',
+    'od13': 'Dishes',
+    'od14': 'Price',
+    'od15': 'Items',
+    'od16': 'Delivery Address:',
+    'od17': 'Coupons',
+    'ad17': 'Tip:',
+    'ad18': 'Delivery Fee:',
+    'ad19': 'Notes',
+    'ad20': 'Drink:{num}cup Packing box:{count}Quantity',
+    'ad21': 'Tax：'
   },
-  "discount": {
-    "dc1": "Search",
-    "dc2": "Promotion Type:",
-    "dc3": "Discount",
-    "dc4": "New Customer:",
-    "dc5": "Regular Customer:",
-    "dc6": "Please enter promo code",
-    "dc7": "Date:",
-    "dc8": "To",
-    "dc9": "Start Date",
-    "dc10": "End Date",
-    "dc11": "xx Off xx",
-    "dc12": "Please enter price",
-    "dc13": "Please enter on-sale price",
-    "dc14": "Reach",
-    "dc15": "Date:",
-    "dc16": "Policy:",
-    "dc17": "modify",
-    "dc18": "Confirm",
-    "dc19": "Please add promotion type",
-    "dc20": "Please select a valid date for promotion",
-    "dc21": "Please select a valid date for coupon",
-    "dc22": "Promotion Policy",
-    "dc23": "Successfully Updated",
-    "dc24": "Successfully added",
-    "dc25": "Are you sure to delete this promotion?",
-    "dc26": "Cautions",
-    "dc27": "Confirm",
-    "dc28": "Cancel"
+  'discount': {
+    'dc1': 'Search',
+    'dc2': 'Promotion Type:',
+    'dc3': 'Discount',
+    'dc4': 'New Customer:',
+    'dc5': 'Regular Customer:',
+    'dc6': 'Please enter promo code',
+    'dc7': 'Date:',
+    'dc8': 'To',
+    'dc9': 'Start Date',
+    'dc10': 'End Date',
+    'dc11': 'xx Off xx',
+    'dc12': 'Please enter price',
+    'dc13': 'Please enter on-sale price',
+    'dc14': 'Reach',
+    'dc15': 'Date:',
+    'dc16': 'Policy:',
+    'dc17': 'modify',
+    'dc18': 'Confirm',
+    'dc19': 'Please add promotion type',
+    'dc20': 'Please select a valid date for promotion',
+    'dc21': 'Please select a valid date for coupon',
+    'dc22': 'Promotion Policy',
+    'dc23': 'Successfully Updated',
+    'dc24': 'Successfully added',
+    'dc25': 'Are you sure to delete this promotion?',
+    'dc26': 'Cautions',
+    'dc27': 'Confirm',
+    'dc28': 'Cancel'
   },
-  "menu": {
-    "m1": "Search",
-    "m2": "Inquire",
-    "m3": "Group Account List",
-    "m4": "Regular Account List",
-    "mn4": "Account List",
-    "m5": "Serial Number",
-    "m6": "Store ID",
-    "m7": "Store Name",
-    "m8": "Store Category",
-    "m9": "Restaurant Type",
-    "m10": "Status: On/Off",
-    "m11": "Restaurant Credential",
-    "m12": "Account:",
-    "m13": "Password:",
-    "m14": "Address",
-    "m15": "Import",
-    "m16": "Menu Import ",
-    "m17": "Import Restaurant Info",
-    "m18": "Coupons",
-    "m19": "Details",
-    "m20": "Add coupons",
-    "m21": "Case Status",
-    "m22": "Check Reasons",
-    "m23": "Restaurant Operation",
-    "m24": "View Menu",
-    "m25": "Edit",
-    "m26": "Delete",
-    "m27": "Category",
-    "m28": "Restaurant Contact",
-    "m29": "Email Address",
-    "m30": "Telephone",
-    "m31": "Restaurant Quantity",
-    "m32": "Action",
-    "m33": "Add New",
-    "m34": "Edit",
-    "m35": "Delete",
-    "m36": "Disapproved reason",
-    "m37": "No Reason Yet!",
-    "m38": "Confirm",
-    "m39": "Are you sure to delete this restaurant?",
-    "m40": "Cautions",
-    "m41": "Confirm",
-    "m42": "Cancel",
-    "m43": "Only files with .xlsx can be uploaded",
-    "m44": "The file size should not exceed 5M",
-    "m45": "Please wait, only one file can be uploaded at a time",
-    "m46": "Import successfully",
-    "m47": "Are you sure to change the restaurant status?",
-    "m48": "Successfully deleted",
-    "m49": "Successfully Updated",
-    "m50": "Are you sure to delete manager of this restaurant?",
-    "m51": [
-      "Resting",
-      "Opening",
-      "under review",
-      "Audit failure",
-      "deleted"
-    ]
+  'menu': {
+    'm1': 'Search',
+    'm2': 'Search',
+    'm3': 'Group Account List',
+    'm4': 'Regular Account List',
+    'mn4': 'Account List',
+    'm5': 'Serial Number',
+    'm6': 'Store ID',
+    'm7': 'Store Name',
+    'm8': 'Store Category',
+    'm9': 'Restaurant Type',
+    'm10': 'Status: On/Off',
+    'm11': 'Restaurant Credential',
+    'm12': 'Account:',
+    'm13': 'Password:',
+    'm14': 'Address',
+    'm15': 'Import',
+    'm16': 'Menu Import ',
+    'm17': 'Import Restaurant Info',
+    'm18': 'Coupons',
+    'm19': 'Details',
+    'm20': 'Add coupons',
+    'm21': 'Case Status',
+    'm22': 'Check Reasons',
+    'm23': 'Restaurant Operation',
+    'm24': 'View Menu',
+    'm25': 'Edit',
+    'm26': 'Delete',
+    'm27': 'Category',
+    'm28': 'Restaurant Contact',
+    'm29': 'Email Address',
+    'm30': 'Telephone',
+    'm31': 'Restaurant Quantity',
+    'm32': 'Action',
+    'm33': 'Add New',
+    'm34': 'Edit',
+    'm35': 'Delete',
+    'm36': 'Disapproved reason',
+    'm37': 'No Reason Yet!',
+    'm38': 'Confirm',
+    'm39': 'Are you sure to delete this restaurant?',
+    'm40': 'Cautions',
+    'm41': 'Confirm',
+    'm42': 'Cancel',
+    'm43': 'Only files with .xlsx can be uploaded',
+    'm44': 'The file size should not exceed 5M',
+    'm45': 'Please wait, only one file can be uploaded at a time',
+    'm46': 'Import successfully',
+    'm47': 'Are you sure to change the restaurant status?',
+    'm48': 'Successfully deleted',
+    'm49': 'Successfully Updated',
+    'm50': 'Are you sure to delete manager of this restaurant?',
+    'm51': [
+      'Resting',
+      'Opening',
+      'under review',
+      'Audit failure',
+      'deleted'
+    ],
+    m52: 'Are you sure to delete?'
   },
-  "dishes": {
-    "d1": "Order Type",
-    "d2": "Delivery",
-    "d3": "Self Pick-Up",
-    "d4": "Dine in",
-    "d5": "Search for Items",
-    "d6": "Search",
-    "d7": "Return",
-    "d8": "Add Items",
-    "d9": "Delete All Items",
-    "d10": "Number",
-    "d11": "Order",
-    "d12": "Name",
-    "d13": "Price",
-    "d14": "Category",
-    "d15": "Description",
-    "d16": "Size",
-    "d17": "In stock",
-    "d18": "Photos",
-    "d19": "Available Time",
-    "d20": "Status",
-    "d211": "Check Reasons",
-    "d21": "Action",
-    "d22": "Set as recommendations",
-    "d23": "Delete",
-    "d24": "Deactivate",
-    "d25": "Activate",
-    "d26": "Items",
-    "d27": "Edit",
-    "d28": "Disapproved reason",
-    "d29": "No Reason Yet!",
-    "d30": "Confirm",
-    "d31": "All",
-    "d32": "Breakfast",
-    "d33": "Lunch",
-    "d34": "Brunch",
-    "d35": "Dinner",
-    "d36": "Midnight Snack",
-    "d37": "Set this as recommendations?",
-    "d38": "Cancel this recommendations?",
-    "d39": "Delete the dishes?",
-    "d40": "Remove the dishes?",
-    "d41": "Add the dishes?",
-    "d42": "Delete all dishes?",
-    "d43": "Successfully deleted",
-    "d44": [
-      "under review",
-      "active",
-      "Inactive"
+  'dishes': {
+    'd1': 'Order Type',
+    'd2': 'Delivery',
+    'd3': 'Self Pick-Up',
+    'd4': 'Dine in',
+    'd5': 'Search for Items',
+    'd6': 'Search',
+    'd7': 'Return',
+    'd8': 'Add Items',
+    'd9': 'Delete All Items',
+    'd10': 'Number',
+    'd11': 'Order',
+    'd12': 'Name',
+    'd13': 'Price',
+    'd14': 'Category',
+    'd15': 'Description',
+    'd16': 'Size',
+    'd17': 'In stock',
+    'd18': 'Photos',
+    'd19': 'Available Time',
+    'd20': 'Status',
+    'd211': 'Check Reasons',
+    'd21': 'Action',
+    'd22': 'Set as recommendations',
+    'd23': 'Delete',
+    'd24': 'Deactivate',
+    'd25': 'Activate',
+    'd26': 'Items',
+    'd27': 'Edit',
+    'd28': 'Disapproved reason',
+    'd29': 'No Reason Yet!',
+    'd30': 'Confirm',
+    'd31': 'All',
+    'd32': 'Breakfast',
+    'd33': 'Lunch',
+    'd34': 'Brunch',
+    'd35': 'Dinner',
+    'd36': 'Midnight Snack',
+    'd37': 'Set this as recommendations?',
+    'd38': 'Cancel this recommendations?',
+    'd39': 'Delete the dishes?',
+    'd40': 'Remove the dishes?',
+    'd41': 'Add the dishes?',
+    'd42': 'Delete all dishes?',
+    'd43': 'Successfully deleted',
+    'd44': [
+      'under review',
+      'active',
+      'Inactive'
     ],
-    "d45": "Updated!"
+    'd45': 'Updated!'
   },
-  "menuInfo": {
-    "mi1": "Dish:",
-    "mi2": "Price:",
-    "mi3": "In Stock:",
-    "mi4": "Photos:",
-    "mi5": "Available Time:",
-    "mi6": "Recommend:",
-    "mi7": "Set as Specialty:",
-    "mi8": "Category:",
-    "mi9": "Valid period of Dishes:",
-    "mi10": "Category:",
-    "mi11": "Label:",
-    "mi12": "Tax:",
-    "mi13": "Tax:",
-    "mi14": "Spicy:",
-    "mi15": "Sides:",
-    "mi16": "Option：",
-    "mi17": "Property",
-    "mi18": "Unit Price",
-    "mi19": "Modifier:",
-    "mi20": "Options:",
-    "mi21": "Payment:",
-    "mi22": "Please Select",
-    "mi23": "Save",
-    "mi24": "Submit for review",
-    "mi25": "Please select the payment",
-    "mi26": "Please choose a valid time frame for this item",
-    "mi27": "Dishes",
-    "mi28": "Drinks",
-    "mi29": "Self Pick-Up",
-    "mi30": "Delivery",
-    "mi31": "Dine in",
-    "mi32": "Dish Name:",
-    "mi33": "Price:",
-    "mi34": "In Stock:",
-    "mi35": "Available:",
-    "mi36": "Category:",
-    "mi37": "RMB/Yen",
-    "mi38": "Dollar",
-    "mi39": "Euro",
-    "mi40": "Successfully added",
-    "mi41": "Edit Successfully"
+  'menuInfo': {
+    'mi1': 'Dish',
+    'mi2': 'Price',
+    'mi3': 'In Stock',
+    'mi4': 'Photos',
+    'mi5': 'Available Time',
+    'mi6': 'Recommend',
+    'mi7': 'Set as Specialty',
+    'mi8': 'Category',
+    'mi9': 'Valid period of Dishes',
+    'mi10': 'Category',
+    'mi11': 'Label',
+    'mi12': 'Tax',
+    'mi13': 'Tax',
+    'mi14': 'Spicy',
+    'mi15': 'Sides',
+    'mi16': 'Option',
+    'mi17': 'Property',
+    'mi18': 'Unit Price',
+    'mi19': 'Modifier',
+    'mi20': 'Options',
+    'mi21': 'Payment',
+    'mi22': 'Please Select',
+    'mi23': 'Save',
+    'mi24': 'Submit for review',
+    'mi25': 'Please select the payment',
+    'mi26': 'Please choose a valid time frame for this item',
+    'mi27': 'Dishes',
+    'mi28': 'Drinks',
+    'mi29': 'Self Pick-Up',
+    'mi30': 'Delivery',
+    'mi31': 'Dine in',
+    'mi32': 'Dish Name:',
+    'mi33': 'Price:',
+    'mi34': 'In Stock',
+    'mi35': 'Available',
+    'mi36': 'Category',
+    'mi37': 'RMB/Yen',
+    'mi38': 'Dollar',
+    'mi39': 'Euro',
+    'mi40': 'Successfully added',
+    'mi41': 'Edit Successfully',
+    'mi42': 'Category',
+    'mi43': 'Tax Rate',
+    'mi44': 'Pizza or Not',
+    'mi45': 'Dishes Arrangement',
+    'mi46': "The dish has been existed. Do you want to replace it？The restaurant's last number is：",
+
+    'mi47': 'Pizza Type',
+    'mi48': "Size",
+    'mi49': 'Dimensions',
+    'mi50': 'Topping- 1(Free) ',
+    'mi51': 'Topping- 2(at extra cost) ',
+    'mi52': 'Topping-3(at extra cost) ',
+    'mi53': 'Please Select Pizza Types',
+    'mi54': 'Free Toppings Quantities',
+    'mi55': 'Unit Price'
+
   },
-  "addHoliday": {
-    "ah1": "Find",
-    "ah2": "Holiday",
-    "ah3": "Start:",
-    "ah4": "Start:",
-    "ah5": "End:",
-    "ah6": "End Time",
-    "ah7": "Confirm",
-    "ah8": "Please select the restaurant",
-    "ah9": "Please select the date",
-    "ah10": "Please select the start time",
-    "ah11": "Please select the end time",
-    "ah12": "Edit Successfully",
-    "ah13": "Successfully added"
+  'addHoliday': {
+    'ah1': 'Find',
+    'ah2': 'Holiday',
+    'ah3': 'Start:',
+    'ah4': 'Start:',
+    'ah5': 'End:',
+    'ah6': 'End Time',
+    'ah7': 'Confirm',
+    'ah8': 'Please select the restaurant',
+    'ah9': 'Please select the date',
+    'ah10': 'Please select the start time',
+    'ah11': 'Please select the end time',
+    'ah12': 'Edit Successfully',
+    'ah13': 'Successfully added'
   },
-  "holiday": {
-    "h1": "Holiday",
-    "h2": "Add",
-    "h3": "Serial Number",
-    "h4": "Date",
-    "h5": "Start Time",
-    "h6": "End Time",
-    "h7": "End Restaurant Name",
-    "h8": "Action",
-    "h9": "Edit",
-    "h10": "Delete",
-    "h11": "Holiday",
-    "h12": "Are you sure to remove this holiday?",
-    "h13": "Successfully deleted"
+  'holiday': {
+    'h1': 'Holiday',
+    'h2': 'Add',
+    'h3': 'Serial Number',
+    'h4': 'Date',
+    'h5': 'Start Time',
+    'h6': 'End Time',
+    'h7': 'End Restaurant Name',
+    'h8': 'Action',
+    'h9': 'Edit',
+    'h10': 'Delete',
+    'h11': 'Holiday',
+    'h12': 'Are you sure to remove this holiday?',
+    'h13': 'Successfully deleted'
   },
-  "person": {
+  'person': {
     p1: 'Number',
     p2: 'Name',
     p3: 'Gender',
@@ -506,20 +540,20 @@ const en = {
     p16: 'Female',
     p17: 'Account'
   },
-  "qrcode": {
-    "qc1": "Generate QR code",
-    "qc2": "Bulk download",
-    "qc3": "Serial Number",
-    "qc4": "QR Code",
-    "qc5": "Table number",
-    "qc6": "Action",
-    "qc7": "Save the QR Code",
-    "qc8": "Delete",
-    "qc9": "Please enter the table number",
-    "qc10": "Successfully added",
-    "qc11": "Successfully deleted"
+  'qrcode': {
+    'qc1': 'Generate QR code',
+    'qc2': 'Bulk download',
+    'qc3': 'Serial Number',
+    'qc4': 'QR Code',
+    'qc5': 'Table number',
+    'qc6': 'Action',
+    'qc7': 'Save the QR Code',
+    'qc8': 'Delete',
+    'qc9': 'Please enter the table number',
+    'qc10': 'Successfully added',
+    'qc11': 'Successfully deleted'
   },
   ...enLocale
 }
 
-export default en;
+export default en
diff --git a/src/i18n/langs/es.js b/src/i18n/langs/es.js
index 32118e7f7efe3f6658d103cd8c5bf961644360d2..2b9b7abd6270381d36fef480343812894ab3ecfb 100644
--- a/src/i18n/langs/es.js
+++ b/src/i18n/langs/es.js
@@ -1,171 +1,172 @@
 import esLocale from 'element-ui/lib/locale/lang/es'
 const es = {
-  "home": {
-    "userInfo": "Información de usuario",
-    "order": "Número de pedidos",
-    "menu": "Gestión de menú",
-    "holiday": "Ajustes de vacaciones",
-    "registered": [
-      "7 días",
-      "14 días",
-      "30 días",
-      "90 días"
+  'home': {
+    'userInfo': 'Información de usuario',
+    'order': 'Número de pedidos',
+    'menu': 'Gestión de menú',
+    'holiday': 'Ajustes de vacaciones',
+    'registered': [
+      '7 días',
+      '14 días',
+      '30 días',
+      '90 días'
     ],
-    "registeredTitle": "Registro de comerciante",
-    "signout": "Cerrar sesión"
+    'registeredTitle': 'Registro de comerciante',
+    'signout': 'Cerrar sesión'
   },
-  "router": {
-    "home": "Inicio",
-    "distributor": "Distribuidor",
-    "restaurant": "Administración del restaurante",
-    "data": "Gestión de datos",
-    "editUser": "Editar usuarios",
-    "addUser": "Usuarios nuevos",
-    "editRestaurant": "Editar información del restaurante",
-    "dishes": "Lista de platos",
-    "r1": "Gestión de la información del usuario",
-    "r2": "Gestión de pedidos",
-    "r3": "Detalles del pedido",
-    "r4": "Gestión de menú",
-    "r5": "Añadir restaurante",
-    "r6": "Añadir platos",
-    "r7": "Tipos de oferta",
-    "r8": "Ajustes de vacaciones",
-    "r9": "Gestión de códigos QR",
+  'router': {
+    'home': 'Inicio',
+    'distributor': 'Distribuidor',
+    'restaurant': 'Administración del restaurante',
+    'data': 'Gestión de datos',
+    'editUser': 'Editar usuarios',
+    'addUser': 'Usuarios nuevos',
+    'editRestaurant': 'Editar información del restaurante',
+    'dishes': 'Lista de platos',
+    'r1': 'Gestión de la información del usuario',
+    'r2': 'Gestión de pedidos',
+    'r3': 'Detalles del pedido',
+    'r4': 'Gestión de menú',
+    'r5': 'Añadir restaurante',
+    'r6': 'Añadir platos',
+    'r7': 'Tipos de oferta',
+    'r8': 'Ajustes de vacaciones',
+    'r9': 'Gestión de códigos QR',
     r10: 'Gestión de usuarios',
-    r11: 'Detalles de usuario'
+    r11: 'Detalles de usuario',
+    title: 'Management System'
   },
-  "users": {
-    "u1": "Usuarios nuevos",
-    "u2": "Lista de cuentas grupales",
-    "u3": "Lista de cuentas generales",
-    "u4": "Número",
-    "u5": "Teléfono",
-    "u6": "Apellido",
-    "u7": "Nombre",
-    "u8": "Dirección",
-    "u9": "Ciudad",
-    "u10": "Estado",
-    "u11": "Código postal",
-    "u12": "País",
-    "u13": "Correo electrónico",
-    "u14": "Operación",
-    "u15": "Editar"
+  'users': {
+    'u1': 'Usuarios nuevos',
+    'u2': 'Lista de cuentas grupales',
+    'u3': 'Lista de cuentas generales',
+    'u4': 'Número',
+    'u5': 'Teléfono',
+    'u6': 'Apellido',
+    'u7': 'Nombre',
+    'u8': 'Dirección',
+    'u9': 'Ciudad',
+    'u10': 'Estado',
+    'u11': 'Código postal',
+    'u12': 'País',
+    'u13': 'Correo electrónico',
+    'u14': 'Operación',
+    'u15': 'Editar'
   },
-  "editUser": {
-    "eu1": "Teléfono:",
-    "eu2": "Apellido:",
-    "eu3": "Nombre:",
-    "eu4": "Dirección:",
-    "eu5": "Ciudad:",
-    "eu6": "Estado:",
-    "eu7": "Código postal:",
-    "eu8": "País:",
-    "eu9": "Correo electrónico:",
-    "eu10": "Confirmar",
-    "rules": {
-      "r1": "Ingrese la información de contacto",
-      "r2": "6 a 11 caracteres de longitud",
-      "r3": "Ingrese el apellido",
-      "r4": "Ingrese el nombre",
-      "r5": "Ingrese la dirección detallada",
-      "r6": "Ingrese su ciudad",
-      "r7": "Ingrese el estado / provincia",
-      "r8": "Ingrese su país",
-      "r9": "Ingrese el correo electrónico",
-      "r10": "Ingrese el correo electrónico valido"
+  'editUser': {
+    'eu1': 'Teléfono:',
+    'eu2': 'Apellido:',
+    'eu3': 'Nombre:',
+    'eu4': 'Dirección:',
+    'eu5': 'Ciudad:',
+    'eu6': 'Estado:',
+    'eu7': 'Código postal:',
+    'eu8': 'País:',
+    'eu9': 'Correo electrónico:',
+    'eu10': 'Confirmar',
+    'rules': {
+      'r1': 'Ingrese la información de contacto',
+      'r2': '6 a 11 caracteres de longitud',
+      'r3': 'Ingrese el apellido',
+      'r4': 'Ingrese el nombre',
+      'r5': 'Ingrese la dirección detallada',
+      'r6': 'Ingrese su ciudad',
+      'r7': 'Ingrese el estado / provincia',
+      'r8': 'Ingrese su país',
+      'r9': 'Ingrese el correo electrónico',
+      'r10': 'Ingrese el correo electrónico valido'
     }
   },
-  "addUser": {
-    "au1": "Información del responsable del restaurante",
-    "au2": "Información del restaurante",
-    "au3": "Por favor complete la información de la persona a cargo!",
-    "au4": "Notificaciones",
-    "au5": "Confirmar",
-    "au6": "Cancelar",
-    "au7": "Añadido con éxito",
-    "au8": "Cuenta del restaurante",
-    "au9": "Contraseña del restaurante",
-    "au10": "Descargar",
-    "au11": "La identificación del responsable no existe"
+  'addUser': {
+    'au1': 'Información del responsable del restaurante',
+    'au2': 'Información del restaurante',
+    'au3': 'Por favor complete la información de la persona a cargo!',
+    'au4': 'Notificaciones',
+    'au5': 'Confirmar',
+    'au6': 'Cancelar',
+    'au7': 'Añadido con éxito',
+    'au8': 'Cuenta del restaurante',
+    'au9': 'Contraseña del restaurante',
+    'au10': 'Descargar',
+    'au11': 'La identificación del responsable no existe'
   },
-  "restaurantUser": {
-    "ru1": "Apellido del responsable:",
-    "ru2": "Nombre del responsable:",
-    "ru3": "Teléfono del responsable:",
-    "ru4": "Dirección del responsable:",
-    "ru5": "Ciudad:",
-    "ru6": "Provincia / Estado:",
-    "ru7": "Código postal:",
-    "ru8": "País:",
-    "ru9": "Por favor, elija",
-    "ru10": "Correo electrónico:",
-    "ru11": "Tipo del restaurante:",
-    "ru12": "Paso siguiente",
-    "rules": {
-      "r1": "Ingrese la información de contacto",
-      "r2": "Ingrese el apellido",
-      "r3": "Ingrese el nombre",
-      "r4": "Ingrese la dirección detallada",
-      "r5": "Ingrese su ciudad",
-      "r6": "Ingrese el estado / provincia",
-      "r7": "Ingrese su país",
-      "r8": "Seleccione el tipo de restaurante",
-      "r9": "Ingrese el correo electrónico",
-      "r10": "Ingrese el correo electrónico valido",
-      "r11": "Cuenta grupal",
-      "r12": "Cuenta de restaurante personal",
-      "r13": "Japón"
+  'restaurantUser': {
+    'ru1': 'Apellido del responsable:',
+    'ru2': 'Nombre del responsable:',
+    'ru3': 'Teléfono del responsable:',
+    'ru4': 'Dirección del responsable:',
+    'ru5': 'Ciudad:',
+    'ru6': 'Provincia / Estado:',
+    'ru7': 'Código postal:',
+    'ru8': 'País:',
+    'ru9': 'Por favor, elija',
+    'ru10': 'Correo electrónico:',
+    'ru11': 'Tipo del restaurante:',
+    'ru12': 'Paso siguiente',
+    'rules': {
+      'r1': 'Ingrese la información de contacto',
+      'r2': 'Ingrese el apellido',
+      'r3': 'Ingrese el nombre',
+      'r4': 'Ingrese la dirección detallada',
+      'r5': 'Ingrese su ciudad',
+      'r6': 'Ingrese el estado / provincia',
+      'r7': 'Ingrese su país',
+      'r8': 'Seleccione el tipo de restaurante',
+      'r9': 'Ingrese el correo electrónico',
+      'r10': 'Ingrese el correo electrónico valido',
+      'r11': 'Cuenta grupal',
+      'r12': 'Cuenta de restaurante personal',
+      'r13': 'Japón'
     }
   },
-  "restaurantInfo": {
-    "ri1": "Nombre del restaurante:",
-    "ri2": "Tipo del restaurante:",
-    "ri3": "Logotipo del restaurante:",
-    "ri4": "Detalles del restaurante:",
-    "ri5": "País:",
-    "ri6": "Por favor, elija",
-    "ri7": "Provincia:",
-    "ri8": "Ciudad:",
-    "ri9": "Calle:",
-    "rin9": "Dirección específica：",
-    "ri10": "Teléfono del restaurante:",
-    "ri11": "Correo electrónico del restaurante:",
-    "ri12": "Industria del restaurante:",
-    "ri13": "Tasa:",
-    "ri14": "Propina:",
-    "ri15": "Horario del restaurante:",
-    "ri16": "Añadir",
-    "ri17": "Descripción de la introducción del restaurante:",
-    "ri18": "Imagen del entorno del restaurante:",
-    "ri19": "Idioma básico del restaurante:",
-    "ri20": "Apoyo a los idiomas nacionalizados:",
-    "ri21": "Si apoya la entrega a domicilio:",
-    "ri22": "Hora de apoyo de la entrega a domicilio:",
-    "ri23": "Hora de inicio.",
-    "ri24": "Hora de finalización",
-    "ri25": "Rango de pedidos de entrega a domicilio:",
-    "ri26": "Número de rango de pedidos de entrega a domicilio:",
-    "ri27": "Rango de entrega de restaurantes:",
-    "ri28": "Si apoya la auto-cogida:",
-    "ri29": "Latitud del restaurante:",
-    "ri30": "Longitud",
-    "ri31": "Latitud",
-    "ri32": "Si es un restaurante cooperativo:",
-    "ri33": "Confirmar la modificación",
-    "ri34": "Confirmar y generar una cuenta",
-    "ri35": "Añada el horario de abertura",
-    "ri36": "Seleccione la hora de la entrega a domicilio",
-    "ri37": "Añadir hasta 9 imágenes",
-    "ri38": "Seleccione el tipo de hora",
-    "ri39": "Se ha seleccionado este tipo de hora",
-    "ri40": "Ingrese la hora",
-    "ri41": "Ingrese el formato de hora correcto",
-    "ri42": "Hora de inicio de la entrega a domicilio",
-    "ri43": "Hora de finalización de la entrega a domicilio",
-    "ri44": "Número de pedidos recibidos",
-    "ri45": "Rango de entrega de restaurantes",
-    "ri46": "Por favor, ingrese",
+  'restaurantInfo': {
+    'ri1': 'Nombre del restaurante:',
+    'ri2': 'Tipo del restaurante:',
+    'ri3': 'Logotipo del restaurante:',
+    'ri4': 'Detalles del restaurante:',
+    'ri5': 'País:',
+    'ri6': 'Por favor, elija',
+    'ri7': 'Provincia:',
+    'ri8': 'Ciudad:',
+    'ri9': 'Calle:',
+    'rin9': 'Dirección específica：',
+    'ri10': 'Teléfono del restaurante:',
+    'ri11': 'Correo electrónico del restaurante:',
+    'ri12': 'Industria del restaurante:',
+    'ri13': 'Tasa:',
+    'ri14': 'Propina:',
+    'ri15': 'Horario del restaurante:',
+    'ri16': 'Añadir',
+    'ri17': 'Descripción de la introducción del restaurante:',
+    'ri18': 'Imagen del entorno del restaurante:',
+    'ri19': 'Idioma básico del restaurante:',
+    'ri20': 'Apoyo a los idiomas nacionalizados:',
+    'ri21': 'Si apoya la entrega a domicilio:',
+    'ri22': 'Hora de apoyo de la entrega a domicilio:',
+    'ri23': 'Hora de inicio.',
+    'ri24': 'Hora de finalización',
+    'ri25': 'Rango de pedidos de entrega a domicilio:',
+    'ri26': 'Número de rango de pedidos de entrega a domicilio:',
+    'ri27': 'Rango de entrega de restaurantes:',
+    'ri28': 'Si apoya la auto-cogida:',
+    'ri29': 'Latitud del restaurante:',
+    'ri30': 'Longitud',
+    'ri31': 'Latitud',
+    'ri32': 'Si es un restaurante cooperativo:',
+    'ri33': 'Confirmar la modificación',
+    'ri34': 'Confirmar y generar una cuenta',
+    'ri35': 'Añada el horario de abertura',
+    'ri36': 'Seleccione la hora de la entrega a domicilio',
+    'ri37': 'Añadir hasta 9 imágenes',
+    'ri38': 'Seleccione el tipo de hora',
+    'ri39': 'Se ha seleccionado este tipo de hora',
+    'ri40': 'Ingrese la hora',
+    'ri41': 'Ingrese el formato de hora correcto',
+    'ri42': 'Hora de inicio de la entrega a domicilio',
+    'ri43': 'Hora de finalización de la entrega a domicilio',
+    'ri44': 'Número de pedidos recibidos',
+    'ri45': 'Rango de entrega de restaurantes',
+    'ri46': 'Por favor, ingrese',
     ri47: 'Ya sea para apoyar la impresora:',
     ri48: 'Enlazar impresora',
     ri49: 'Nombre de la impresora',
@@ -174,320 +175,352 @@ const es = {
     ri52: 'Impresora frontal',
     ri53: 'Impresora de cocina trasera',
     ri54: 'La impresora ya existe',
-    "rules": {
-      "r1": "Ingrese el nombre del restaurante",
-      "r2": "Ingrese el tipo de restaurante",
-      "r3": "Seleccione el país",
-      "r4": "Ingrese la ciudad.",
-      "r5": "Ingrese la provincia",
-      "r6": "Ingrese la dirección detallada",
-      "r7": "Ingrese la industria del restaurante",
-      "r8": "Ingrese el número de teléfono del restaurante",
-      "r9": "6 a 11 caracteres de longitud",
-      "r10": "Seleccione el idioma bádico",
-      "r11": "Ingrese el correo electrónico",
-      "r12": "Ingrese el correo electrónico valido",
-      "r13": "Ingrese el horario de abertura"
+
+    ri55: 'Do you want to use lucky red envelope?',
+    ri56: 'Type of promotion',
+    ri57: 'Support Dine-in or Not',
+
+    ri58:'Delivery Fee',
+
+    ri59:'所属时区',
+    ri60:'请选择所属时区',
+    'rules': {
+      'r1': 'Ingrese el nombre del restaurante',
+      'r2': 'Ingrese el tipo de restaurante',
+      'r3': 'Seleccione el país',
+      'r4': 'Ingrese la ciudad.',
+      'r5': 'Ingrese la provincia',
+      'r6': 'Ingrese la dirección detallada',
+      'r7': 'Ingrese la industria del restaurante',
+      'r8': 'Ingrese el número de teléfono del restaurante',
+      'r9': '6 a 11 caracteres de longitud',
+      'r10': 'Seleccione el idioma bádico',
+      'r11': 'Ingrese el correo electrónico',
+      'r12': 'Ingrese el correo electrónico valido',
+      'r13': 'Ingrese el horario de abertura'
     },
-    "week": {
-      "w1": "Lunes",
-      "w2": "Martes",
-      "w3": "Miércoles",
-      "w4": "Jueves",
-      "w5": "Viernes",
-      "w6": "Sábado",
-      "w7": "Domingo"
+    'week': {
+      'w1': 'Lunes',
+      'w2': 'Martes',
+      'w3': 'Miércoles',
+      'w4': 'Jueves',
+      'w5': 'Viernes',
+      'w6': 'Sábado',
+      'w7': 'Domingo'
     },
-    "time": {
-      "t1": "Por la mañana",
-      "t2": "Por la tarde",
-      "t3": "Por la noche",
-      "t4": "Todo el día."
+    'time': {
+      't1': 'Por la mañana',
+      't2': 'Por la tarde',
+      't3': 'Por la noche',
+      't4': 'Todo el día.'
     }
   },
-  "header": {
-    "h1": "¿Está seguro de cerrar sesión?",
-    "h2": "Notificaciones",
-    "h3": "Confirmar",
-    "h4": "Cancelar"
+  'header': {
+    'h1': '¿Está seguro de cerrar sesión?',
+    'h2': 'Notificaciones',
+    'h3': 'Confirmar',
+    'h4': 'Cancelar'
   },
-  "request": {
-    "r1": "Se ha producido un error al solicitarlo",
-    "r2": "Error del servidor"
+  'request': {
+    'r1': 'Se ha producido un error al solicitarlo',
+    'r2': 'Failed to load, please refreash the page and try again',
+    'r3': 'Failed to connect, please check your network'
   },
-  "orderList": {
-    "ol1": "Ingrese el nombre del restaurante en que se verifica el pedido",
-    "ol2": "Hasta",
-    "ol3": "Fecha de inicio",
-    "ol4": "Fecha de finalización",
-    "ol5": "El tipo de pedido",
-    "ol6": "Encontrar",
-    "ol7": "Número de serie",
-    "ol8": "Hora",
-    "ol9": "Tipo",
-    "ol10": "El número de pedido",
-    "ol11": "El nombre del restaurante",
-    "ol12": "Subtotal",
-    "ol13": "Importe total",
-    "ol14": "Teléfono",
-    "ol15": "Estado del pedido",
-    "ol16": "No pagado",
-    "oln17": "Pagado",
-    "ol17": "Realizando",
-    "ol18": "Operación",
-    "ol19": "Ver detalles del pedido",
-    "ol20": "Entrega a domicilio",
-    "ol21": "Comer en el restaurante",
-    "ol22": "Auto-cogida",
-    "oln22": "Para llevar",
-    "ol23": "Tarjeta de débito",
-    "ol24": "Tarjeta de crédito",
-    "ol25": "Efectivo",
-    "ol26": "Otros",
-    "ol27": "Cancelado",
-    "o128": "cancelar orden"
+  'orderList': {
+    'ol1': 'Ingrese el nombre del restaurante en que se verifica el pedido',
+    'ol2': 'Hasta',
+    'ol3': 'Fecha de inicio',
+    'ol4': 'Fecha de finalización',
+    'ol5': 'El tipo de pedido',
+    'ol6': 'Encontrar',
+    'ol7': 'Número de serie',
+    'ol8': 'Hora',
+    'ol9': 'Tipo',
+    'ol10': 'El número de pedido',
+    'ol11': 'El nombre del restaurante',
+    'ol12': 'Subtotal',
+    'ol13': 'Importe total',
+    'ol14': 'Teléfono',
+    'ol15': 'Estado del pedido',
+    'ol16': 'No pagado',
+    'oln17': 'Pagado',
+    'ol17': 'Realizando',
+    'ol18': 'Operación',
+    'ol19': 'Ver detalles del pedido',
+    'ol20': 'Entrega a domicilio',
+    'ol21': 'Comer en el restaurante',
+    'ol22': 'Auto-cogida',
+    'oln22': 'Para llevar',
+    'ol23': 'Tarjeta de débito',
+    'ol24': 'Tarjeta de crédito',
+    'ol25': 'Efectivo',
+    'ol26': 'Otros',
+    'ol27': 'Cancelado',
+    ol28: 'Cancelar pedido',
+    ol29: 'Pedido de hoy',
+    ol30: 'Todos los pedidos',
+    ol31: 'Completar el pedido',
+    ol32: 'Eliminar el pedido',
+    ol33: 'View more'
   },
-  "orderDetails": {
-    "od1": "Número de serie:",
-    "od2": "Hora de realizar un pedido:",
-    "od3": "Tipo:",
-    "odn3": "Hora de recogida:",
-    "od4": "Número de pedido:",
-    "od5": "Nombre del restaurante:",
-    "odn5": "Número de tabla",
-    "od6": "Subtotal:",
-    "od7": "Importe total:",
-    "od8": "Número de contacto:",
-    "odn8": "Contacto:",
-    "od9": "Correo electrónico de contacto:",
-    "od10": "Estado de pago:",
-    "od11": "Tipo de pago:",
-    "od12": "El número del plato",
-    "od13": "El nombre del plato",
-    "od14": "El precio del nombre del plato",
-    "od15": "El número de platos",
-    "od16": "Dirección de entrega:",
-    "ad17": "Propina:",
-    "ad18": "Propina de repartidor:",
-    "ad19": "Observaciones",
-    "ad20": "Coca:{num}taza Caja de embalaje:{count}UNA"
+  'orderDetails': {
+    'od1': 'Número de serie:',
+    'od2': 'Hora de realizar un pedido:',
+    'od3': 'Tipo:',
+    'odn3': 'Hora de recogida:',
+    'od4': 'Número de pedido:',
+    'od5': 'Nombre del restaurante:',
+    'odn5': 'Número de tabla',
+    'od6': 'Subtotal:',
+    'od7': 'Importe total:',
+    'od8': 'Número de contacto:',
+    'odn8': 'Contacto:',
+    'od9': 'Correo electrónico de contacto:',
+    'od10': 'Estado de pago:',
+    'od11': 'Tipo de pago:',
+    'od12': 'El número del plato',
+    'od13': 'El nombre del plato',
+    'od14': 'El precio del nombre del plato',
+    'od15': 'El número de platos',
+    'od16': 'Dirección de entrega:',
+    'od17': 'Coupons',
+    'ad17': 'Propina:',
+    'ad18': 'Propina de repartidor:',
+    'ad19': 'Observaciones',
+    'ad20': 'Coca:{num}taza Caja de embalaje:{count}UNA',
+    'ad21': 'IVA'
   },
-  "discount": {
-    "dc1": "Ingrese el nombre del restaurante que se verifica el pedido",
-    "dc2": "Tipo de oferta:",
-    "dc3": "Tipo de descuento",
-    "dc4": "Nuevos clientes:",
-    "dc5": "Clientes antiguos:",
-    "dc6": "Ingrese el descuento de usuario",
-    "dc7": "Fecha de la actividad:",
-    "dc8": "Hasta",
-    "dc9": "Fecha de inicio",
-    "dc10": "Fecha de finalización",
-    "dc11": ".... de descuento en pedido superior de ....",
-    "dc12": "Ingrese el precio",
-    "dc13": "Ingrese el precio de la oferta",
-    "dc14": "Pedido superior de ...",
-    "dc15": "Fecha de la actividad:",
-    "dc16": "Regla de la actividad",
-    "dc17": "modificar",
-    "dc18": "Confirmar",
-    "dc19": "Añada el tipo de oferta",
-    "dc20": "Seleccione la fecha de la actividad del descuento",
-    "dc21": "Seleccione la fecha de la actividad del descuento en pedido superior de cierto precio",
-    "dc22": "Ingrese las reglas de actividad",
-    "dc23": "Modificado con éxito",
-    "dc24": "Añadido con éxito",
-    "dc25": "¿Está seguro de eliminar esta oferta?",
-    "dc26": "Notificaciones",
-    "dc27": "Confirmar",
-    "dc28": "Cancelar"
+  'discount': {
+    'dc1': 'Ingrese el nombre del restaurante que se verifica el pedido',
+    'dc2': 'Tipo de oferta:',
+    'dc3': 'Tipo de descuento',
+    'dc4': 'Nuevos clientes:',
+    'dc5': 'Clientes antiguos:',
+    'dc6': 'Ingrese el descuento de usuario',
+    'dc7': 'Fecha de la actividad:',
+    'dc8': 'Hasta',
+    'dc9': 'Fecha de inicio',
+    'dc10': 'Fecha de finalización',
+    'dc11': '.... de descuento en pedido superior de ....',
+    'dc12': 'Ingrese el precio',
+    'dc13': 'Ingrese el precio de la oferta',
+    'dc14': 'Pedido superior de ...',
+    'dc15': 'Fecha de la actividad:',
+    'dc16': 'Regla de la actividad',
+    'dc17': 'modificar',
+    'dc18': 'Confirmar',
+    'dc19': 'Añada el tipo de oferta',
+    'dc20': 'Seleccione la fecha de la actividad del descuento',
+    'dc21': 'Seleccione la fecha de la actividad del descuento en pedido superior de cierto precio',
+    'dc22': 'Ingrese las reglas de actividad',
+    'dc23': 'Modificado con éxito',
+    'dc24': 'Añadido con éxito',
+    'dc25': '¿Está seguro de eliminar esta oferta?',
+    'dc26': 'Notificaciones',
+    'dc27': 'Confirmar',
+    'dc28': 'Cancelar'
   },
-  "menu": {
-    "m1": "Ingrese el nombre del restaurante que se verifica el pedido",
-    "m2": "Encontrar",
-    "m3": "Lista de cuentas grupales",
-    "m4": "Lista de cuentas generales",
-    "mn4": "Lista de cuentas",
-    "m5": "Número de serie",
-    "m6": "ID del restaurante",
-    "m7": "El nombre del restaurante",
-    "m8": "Industria del restaurante",
-    "m9": "Tipo de restaurante",
-    "m10": "Estado en línea",
-    "m11": "Contraseña de la cuenta de restaurante",
-    "m12": "Cuenta:",
-    "m13": "Contraseña:",
-    "m14": "Dirección del restaurante",
-    "m15": "Introdución de restaurante",
-    "m16": "Introdución del menú",
-    "m17": "Introducir la información del restaurante",
-    "m18": "Información de la oferta",
-    "m19": "Ver los detalles",
-    "m20": "Añadir ofertas",
-    "m21": "Estado de verificación",
-    "m22": "Ver motivo",
-    "m23": "Operación del restaurante",
-    "m24": "Ver el menú",
-    "m25": "Editar",
-    "m26": "Eliminar",
-    "m27": "Categoría",
-    "m28": "El nombre del responsable del restaurante",
-    "m29": "Correo electrónico",
-    "m30": "Teléfono",
-    "m31": "Número de restaurantes",
-    "m32": "Operación",
-    "m33": "Añadir restaurante",
-    "m34": "Editar",
-    "m35": "Eliminar",
-    "m36": "La razón del error de verificación",
-    "m37": "¡Por el momento, no hay razón!",
-    "m38": "Confirmar",
-    "m39": "¿Está seguro de eliminar el restaurante?",
-    "m40": "Notificaciones",
-    "m41": "Confirmar",
-    "m42": "Cancelar",
-    "m43": "Solo se pueden cargar los archivos con el sufijo .xlsx.",
-    "m44": "El tamaño del archivo no debe superar los 5M.",
-    "m45": "Espere, solo puede cargar un archivo a la vez.",
-    "m46": "La importación se realiza correctamente.",
-    "m47": "¿Está seguro de modificar el estado del restaurante?",
-    "m48": "Eliminado con éxito",
-    "m49": "Modificado con éxito",
-    "m50": "¿Está seguro de eliminar a la persona a cargo del restaurante?",
-    "m51": [
-      "Descansando",
-      "apertura",
-      "bajo revisión",
-      "Error de auditoría",
-      "eliminado"
-    ]
+  'menu': {
+    'm1': 'Ingrese el nombre del restaurante que se verifica el pedido',
+    'm2': 'Encontrar',
+    'm3': 'Lista de cuentas grupales',
+    'm4': 'Lista de cuentas generales',
+    'mn4': 'Lista de cuentas',
+    'm5': 'Número de serie',
+    'm6': 'ID del restaurante',
+    'm7': 'El nombre del restaurante',
+    'm8': 'Industria del restaurante',
+    'm9': 'Tipo de restaurante',
+    'm10': 'Estado en línea',
+    'm11': 'Contraseña de la cuenta de restaurante',
+    'm12': 'Cuenta:',
+    'm13': 'Contraseña:',
+    'm14': 'Dirección del restaurante',
+    'm15': 'Introdución de restaurante',
+    'm16': 'Introdución del menú',
+    'm17': 'Introducir la información del restaurante',
+    'm18': 'Información de la oferta',
+    'm19': 'Ver los detalles',
+    'm20': 'Añadir ofertas',
+    'm21': 'Estado de verificación',
+    'm22': 'Ver motivo',
+    'm23': 'Operación del restaurante',
+    'm24': 'Ver el menú',
+    'm25': 'Editar',
+    'm26': 'Eliminar',
+    'm27': 'Categoría',
+    'm28': 'El nombre del responsable del restaurante',
+    'm29': 'Correo electrónico',
+    'm30': 'Teléfono',
+    'm31': 'Número de restaurantes',
+    'm32': 'Operación',
+    'm33': 'Añadir restaurante',
+    'm34': 'Editar',
+    'm35': 'Eliminar',
+    'm36': 'La razón del error de verificación',
+    'm37': '¡Por el momento, no hay razón!',
+    'm38': 'Confirmar',
+    'm39': '¿Está seguro de eliminar el restaurante?',
+    'm40': 'Notificaciones',
+    'm41': 'Confirmar',
+    'm42': 'Cancelar',
+    'm43': 'Solo se pueden cargar los archivos con el sufijo .xlsx.',
+    'm44': 'El tamaño del archivo no debe superar los 5M.',
+    'm45': 'Espere, solo puede cargar un archivo a la vez.',
+    'm46': 'La importación se realiza correctamente.',
+    'm47': '¿Está seguro de modificar el estado del restaurante?',
+    'm48': 'Eliminado con éxito',
+    'm49': 'Modificado con éxito',
+    'm50': '¿Está seguro de eliminar a la persona a cargo del restaurante?',
+    'm51': [
+      'Descansando',
+      'apertura',
+      'bajo revisión',
+      'Error de auditoría',
+      'eliminado'
+    ],
+    m52: '¿Está seguro de eliminarlo?'
   },
-  "dishes": {
-    "d1": "El tipo de pedido",
-    "d2": "Entrega a domicilio",
-    "d3": "Auto-cogida",
-    "d4": "Comer en el restaurante",
-    "d5": "Buscar platos",
-    "d6": "Encontrar",
-    "d7": "Volver",
-    "d8": "Añadir platos",
-    "d9": "Eliminar todos los platos",
-    "d10": "Número",
-    "d11": "Tipo de menú",
-    "d12": "Nombre del plato",
-    "d13": "Precio del plato",
-    "d14": "Clasificación de los platos",
-    "d15": "Acompañamiento de platos",
-    "d16": "Especificaciones de platos",
-    "d17": "Cantidad",
-    "d18": "Imágenes del plato",
-    "d19": "Hora de servir platos",
-    "d20": "Estado de verificación",
-    "d211": "Ver motivo",
-    "d21": "Operación",
-    "d22": "¿Si lo configura como el plato recomendado?",
-    "d23": "Eliminar",
-    "d24": "Quitado",
-    "d25": "Lanzado",
-    "d26": "Artículos",
-    "d27": "Editar",
-    "d28": "La razón del error de verificación",
-    "d29": "¡Por el momento, no hay razón!",
-    "d30": "Confirmar",
-    "d31": "Todo",
-    "d32": "Desayuno",
-    "d33": "Almuerzo",
-    "d34": "Merienda",
-    "d35": "Cena",
-    "d36": "Aperitivo de medianoche",
-    "d37": "¿Si lo configura como el plato recomendado?",
-    "d38": "¿Si cancela el plato recomendado?",
-    "d39": "¿Si elimina los platos?",
-    "d40": "¿Si quita los platos?",
-    "d41": "¿Si lanza los platos?",
-    "d42": "¿Si elimina todos los platos?",
-    "d43": "Eliminado con éxito",
-    "d44": [
-      "bajo revisión",
-      "Auditado",
-      "No pasó"
+  'dishes': {
+    'd1': 'El tipo de pedido',
+    'd2': 'Entrega a domicilio',
+    'd3': 'Auto-cogida',
+    'd4': 'Comer en el restaurante',
+    'd5': 'Buscar platos',
+    'd6': 'Encontrar',
+    'd7': 'Volver',
+    'd8': 'Añadir platos',
+    'd9': 'Eliminar todos los platos',
+    'd10': 'Número',
+    'd11': 'Tipo de menú',
+    'd12': 'Nombre del plato',
+    'd13': 'Precio del plato',
+    'd14': 'Clasificación de los platos',
+    'd15': 'Acompañamiento de platos',
+    'd16': 'Especificaciones de platos',
+    'd17': 'Cantidad',
+    'd18': 'Imágenes del plato',
+    'd19': 'Hora de servir platos',
+    'd20': 'Estado de verificación',
+    'd211': 'Ver motivo',
+    'd21': 'Operación',
+    'd22': '¿Si lo configura como el plato recomendado?',
+    'd23': 'Eliminar',
+    'd24': 'Quitado',
+    'd25': 'Lanzado',
+    'd26': 'Artículos',
+    'd27': 'Editar',
+    'd28': 'La razón del error de verificación',
+    'd29': '¡Por el momento, no hay razón!',
+    'd30': 'Confirmar',
+    'd31': 'Todo',
+    'd32': 'Desayuno',
+    'd33': 'Almuerzo',
+    'd34': 'Merienda',
+    'd35': 'Cena',
+    'd36': 'Aperitivo de medianoche',
+    'd37': '¿Si lo configura como el plato recomendado?',
+    'd38': '¿Si cancela el plato recomendado?',
+    'd39': '¿Si elimina los platos?',
+    'd40': '¿Si quita los platos?',
+    'd41': '¿Si lanza los platos?',
+    'd42': '¿Si elimina todos los platos?',
+    'd43': 'Eliminado con éxito',
+    'd44': [
+      'bajo revisión',
+      'Auditado',
+      'No pasó'
     ],
-    "d45": "¡Modificado con éxito!"
+    'd45': '¡Modificado con éxito!'
   },
-  "menuInfo": {
-    "mi1": "Nombre del plato:",
-    "mi2": "Precio del plato:",
-    "mi3": "Cantidad de inventario:",
-    "mi4": "Imágenes de platos:",
-    "mi5": "Hora de servir platos:",
-    "mi6": "Si lo recomienda:",
-    "mi7": "Establecer como un plato de autor:",
-    "mi8": "Categorías de platos:",
-    "mi9": "Fecha de caducidad del plato:",
-    "mi10": "Clasificación de platos:",
-    "mi11": "Etiqueta de platos:",
-    "mi12": "Tasa de impuestos de platos:",
-    "mi13": "Tasa de impuestos de platos:",
-    "mi14": "Grado de picante:",
-    "mi15": "Acompañamiento de platos:",
-    "mi16": "Especificaciones de platos:",
-    "mi17": "Atributo",
-    "mi18": "Precio unitario",
-    "mi19": "Añadir platos:",
-    "mi20": "Notificaciones de platos:",
-    "mi21": "Método de comprar:",
-    "mi22": "Por favor, elija",
-    "mi23": "Modificar platos",
-    "mi24": "Enviar la verificación",
-    "mi25": "Por favor, elija método de comprar",
-    "mi26": "Seleccione la fecha de caducidad del plato",
-    "mi27": "Platos",
-    "mi28": "Bebidas",
-    "mi29": "Auto-cogida",
-    "mi30": "Entrega a domicilio",
-    "mi31": "Comer en el restaurante",
-    "mi32": "Ingrese el nombre del plato",
-    "mi33": "Ingrese el precio del plato",
-    "mi34": "Ingrese la cantidad de inventario",
-    "mi35": "Seleccione la hora de servir platos",
-    "mi36": "Seleccione la categoría de platos",
-    "mi37": "RMB/JPY",
-    "mi38": "Dólar",
-    "mi39": "Euro",
-    "mi40": "Añadido con éxito",
-    "mi41": "Editado con éxito"
+  'menuInfo': {
+    'mi1': 'Nombre del plato',
+    'mi2': 'Precio del plato',
+    'mi3': 'Cantidad de inventario',
+    'mi4': 'Imágenes de platos',
+    'mi5': 'Hora de servir platos',
+    'mi6': 'Si lo recomienda',
+    'mi7': 'Establecer como un plato de autor',
+    'mi8': 'Categorías de platos',
+    'mi9': 'Fecha de caducidad del plato',
+    'mi10': 'Clasificación de platos',
+    'mi11': 'Etiqueta de platos',
+    'mi12': 'Tasa de impuestos de platos',
+    'mi13': 'Tasa de impuestos de platos',
+    'mi14': 'Grado de picante',
+    'mi15': 'Acompañamiento de platos:',
+    'mi16': 'Especificaciones de platos:',
+    'mi17': 'Atributo',
+    'mi18': 'Precio unitario',
+    'mi19': 'Añadir platos',
+    'mi20': 'Notificaciones de platos',
+    'mi21': 'Método de comprar',
+    'mi22': 'Por favor, elija',
+    'mi23': 'Modificar platos',
+    'mi24': 'Enviar la verificación',
+    'mi25': 'Por favor, elija método de comprar',
+    'mi26': 'Seleccione la fecha de caducidad del plato',
+    'mi27': 'Platos',
+    'mi28': 'Bebidas',
+    'mi29': 'Auto-cogida',
+    'mi30': 'Entrega a domicilio',
+    'mi31': 'Comer en el restaurante',
+    'mi32': 'Ingrese el nombre del plato',
+    'mi33': 'Ingrese el precio del plato',
+    'mi34': 'Ingrese la cantidad de inventario',
+    'mi35': 'Seleccione la hora de servir platos',
+    'mi36': 'Seleccione la categoría de platos',
+    'mi37': 'RMB/JPY',
+    'mi38': 'Dólar',
+    'mi39': 'Euro',
+    'mi40': 'Añadido con éxito',
+    'mi41': 'Editado con éxito',
+    mi42: 'Ingrese la categoría de platos',
+    mi43: 'Ingrese la tasa impositiva de los platos',
+    mi44: 'Si se trata de una pizza',
+    mi45: 'Clasificación de platos',
+    mi46: "Ya hay platos en el pedido actual. ¿Necesita reemplazar el pedido de platos? El mayor número actual de restaurantes en la clasificación es: ",
+    mi47: "Tipo de pizza",
+    mi48: 'Tamaño',
+    mi49: "Especificaciones",
+    mi50: 'Ingredientes-1 (gratis)',
+    mi51: 'Ingredientes-2 (cargados)',
+    mi52: "Ingredientes-3 (cobrados a un precio unitario fijo)",
+    mi53: 'Seleccione el tipo de pizza',
+    mi54: 'Número libre de ingredientes',
+    mi55: "Precio unitario"
   },
-  "addHoliday": {
-    "ah1": "Buscar restaurantes",
-    "ah2": "Establecer fechas de vacaciones:",
-    "ah3": "Hora de inicio:",
-    "ah4": "Hora de inicio.",
-    "ah5": "Hora de finalización:",
-    "ah6": "Hora de finalización",
-    "ah7": "Confirmar",
-    "ah8": "Elija un restaurante",
-    "ah9": "Seleccione una fecha",
-    "ah10": "Seleccione la hora de inicio",
-    "ah11": "Seleccione la hora de finalización",
-    "ah12": "Editado con éxito",
-    "ah13": "Añadido con éxito"
+  'addHoliday': {
+    'ah1': 'Buscar restaurantes',
+    'ah2': 'Establecer fechas de vacaciones:',
+    'ah3': 'Hora de inicio:',
+    'ah4': 'Hora de inicio.',
+    'ah5': 'Hora de finalización:',
+    'ah6': 'Hora de finalización',
+    'ah7': 'Confirmar',
+    'ah8': 'Elija un restaurante',
+    'ah9': 'Seleccione una fecha',
+    'ah10': 'Seleccione la hora de inicio',
+    'ah11': 'Seleccione la hora de finalización',
+    'ah12': 'Editado con éxito',
+    'ah13': 'Añadido con éxito'
   },
-  "holiday": {
-    "h1": "Ajustes de vacaciones",
-    "h2": "Añadir",
-    "h3": "Número de serie",
-    "h4": "Fecha",
-    "h5": "Hora de inicio",
-    "h6": "Hora de finalización",
-    "h7": "Terminar el nombre del restaurante",
-    "h8": "Operación",
-    "h9": "Editar",
-    "h10": "Eliminar",
-    "h11": "Editar vacaciones",
-    "h12": "¿Está seguro de eliminar las vacaciones del restaurante?",
-    "h13": "Eliminado con éxito"
+  'holiday': {
+    'h1': 'Ajustes de vacaciones',
+    'h2': 'Añadir',
+    'h3': 'Número de serie',
+    'h4': 'Fecha',
+    'h5': 'Hora de inicio',
+    'h6': 'Hora de finalización',
+    'h7': 'Terminar el nombre del restaurante',
+    'h8': 'Operación',
+    'h9': 'Editar',
+    'h10': 'Eliminar',
+    'h11': 'Editar vacaciones',
+    'h12': '¿Está seguro de eliminar las vacaciones del restaurante?',
+    'h13': 'Eliminado con éxito'
   },
-  "person": {
+  'person': {
     p1: 'Numeración',
     p2: 'Nombre',
     p3: 'Género',
@@ -506,20 +539,20 @@ const es = {
     p16: 'Hembra',
     p17: 'Cuenta'
   },
-  "qrcode": {
-    "qc1": "Generar un código QR",
-    "qc2": "Descargas masivas",
-    "qc3": "Número de serie",
-    "qc4": "Código QR",
-    "qc5": "Número de tabla",
-    "qc6": "Operación",
-    "qc7": "Guardar el código QR",
-    "qc8": "Eliminar",
-    "qc9": "Rellene el número de la tabla",
-    "qc10": "Añadido con éxito",
-    "qc11": "Eliminado con éxito"
+  'qrcode': {
+    'qc1': 'Generar un código QR',
+    'qc2': 'Descargas masivas',
+    'qc3': 'Número de serie',
+    'qc4': 'Código QR',
+    'qc5': 'Número de tabla',
+    'qc6': 'Operación',
+    'qc7': 'Guardar el código QR',
+    'qc8': 'Eliminar',
+    'qc9': 'Rellene el número de la tabla',
+    'qc10': 'Añadido con éxito',
+    'qc11': 'Eliminado con éxito'
   },
   ...esLocale
 }
 
-export default es;
\ No newline at end of file
+export default es
diff --git a/src/i18n/langs/fr.js b/src/i18n/langs/fr.js
index 98328152460c1ea49faba92c6e05a1e8d6ce6b47..42d65626c008cd3d3177c914885289dbb816fc47 100644
--- a/src/i18n/langs/fr.js
+++ b/src/i18n/langs/fr.js
@@ -1,493 +1,507 @@
 import frLocale from 'element-ui/lib/locale/lang/fr'
 const fr = {
-  "home": {
-    "userInfo": "Info utilisateur",
-    "order": "Commandes",
-    "menu": "Gestion de menu",
-    "holiday": "Jour férié",
-    "registered": [
-      "7 jours",
-      "14 jours",
-      "30 jours",
-      "90 jours"
+  'home': {
+    'userInfo': 'Info utilisateur',
+    'order': 'Commandes',
+    'menu': 'Gestion de menu',
+    'holiday': 'Jour férié',
+    'registered': [
+      '7 jours',
+      '14 jours',
+      '30 jours',
+      '90 jours'
     ],
-    "registeredTitle": "Nombre de restaurants",
-    "signout": "Déconnexion"
+    'registeredTitle': 'Nombre de restaurants',
+    'signout': 'Déconnexion'
   },
-  "router": {
-    "home": "Accueil",
-    "distributor": "Revendeur",
-    "restaurant": "Gestion de restaurant",
-    "data": "Gestion des Données",
-    "editUser": "Éditer",
-    "addUser": "Ajouter",
-    "editRestaurant": "Éditer",
-    "dishes": "Liste",
-    "r1": "Gestion de l'utilisateur",
-    "r2": "Gestion des commandes",
-    "r3": "Commande ",
-    "r4": "Gestion de menu",
-    "r5": "Ajouter nouveau",
-    "r6": "Ajouter des articles",
-    "r7": "Type de Réduction",
-    "r8": "Jour férié",
-    "r9": "Gestion des codes QR",
+  'router': {
+    'home': 'Accueil',
+    'distributor': 'Revendeur',
+    'restaurant': 'Gestion de restaurant',
+    'data': 'Gestion des Données',
+    'editUser': 'Éditer',
+    'addUser': 'Ajouter',
+    'editRestaurant': 'Éditer',
+    'dishes': 'Liste',
+    'r1': "Gestion de l'utilisateur",
+    'r2': 'Gestion des commandes',
+    'r3': 'Commande ',
+    'r4': 'Gestion de menu',
+    'r5': 'Ajouter nouveau',
+    'r6': 'Ajouter des articles',
+    'r7': 'Type de Réduction',
+    'r8': 'Jour férié',
+    'r9': 'Gestion des codes QR',
     r10: 'Gestion des utilisateurs',
-    r11: "Détails de l'utilisateur"
+    r11: "Détails de l'utilisateur",
+    title:'Management System'
   },
-  "users": {
-    "u1": "Ajouter",
-    "u2": "Liste des comptes de groupe",
-    "u3": "Liste des comptes réguliers",
-    "u4": "Numéro",
-    "u5": "Téléphone",
-    "u6": "Nom",
-    "u7": "Prénom",
-    "u8": "Adresse",
-    "u9": "Ville",
-    "u10": "État/Province",
-    "u11": "Code postal",
-    "u12": "Pays",
-    "u13": "Adresse courriel",
-    "u14": "Action :",
-    "u15": "Éditer"
+  'users': {
+    'u1': 'Ajouter',
+    'u2': 'Liste des comptes de groupe',
+    'u3': 'Liste des comptes réguliers',
+    'u4': 'Numéro',
+    'u5': 'Téléphone',
+    'u6': 'Nom',
+    'u7': 'Prénom',
+    'u8': 'Adresse',
+    'u9': 'Ville',
+    'u10': 'État/Province',
+    'u11': 'Code postal',
+    'u12': 'Pays',
+    'u13': 'Adresse courriel',
+    'u14': 'Action :',
+    'u15': 'Éditer'
   },
-  "editUser": {
-    "eu1": "téléphone :",
-    "eu2": "Nom",
-    "eu3": "Prénom",
-    "eu4": "Adresse",
-    "eu5": "Ville :",
-    "eu6": "État/Province",
-    "eu7": "Code postal :",
-    "eu8": "Pays :",
-    "eu9": "Adresse courriel",
-    "eu10": "Confirmer",
-    "rules": {
-      "r1": "Veuillez entrer vos coordonnées",
-      "r2": "6 à 11 caractères de longueur",
-      "r3": "Veuillez entrer votre nom",
-      "r4": "Veuillez entrer votre prénom",
-      "r5": "Veuillez entrer l'adresse",
-      "r6": "Veuillez entrer votre ville",
-      "r7": "Veuillez entrer votre état/province",
-      "r8": "Veuillez entrer votre pays",
-      "r9": "Veuillez entrer votre adresse courriel",
-      "r10": "Veuillez entrer une adresse courriel valide"
+  'editUser': {
+    'eu1': 'téléphone :',
+    'eu2': 'Nom',
+    'eu3': 'Prénom',
+    'eu4': 'Adresse',
+    'eu5': 'Ville :',
+    'eu6': 'État/Province',
+    'eu7': 'Code postal :',
+    'eu8': 'Pays :',
+    'eu9': 'Adresse courriel',
+    'eu10': 'Confirmer',
+    'rules': {
+      'r1': 'Veuillez entrer vos coordonnées',
+      'r2': '6 à 11 caractères de longueur',
+      'r3': 'Veuillez entrer votre nom',
+      'r4': 'Veuillez entrer votre prénom',
+      'r5': "Veuillez entrer l'adresse",
+      'r6': 'Veuillez entrer votre ville',
+      'r7': 'Veuillez entrer votre état/province',
+      'r8': 'Veuillez entrer votre pays',
+      'r9': 'Veuillez entrer votre adresse courriel',
+      'r10': 'Veuillez entrer une adresse courriel valide'
     }
   },
-  "addUser": {
-    "au1": "Coordonnées du Restaurant",
-    "au2": "Informations du Restaurant",
-    "au3": "Veuillez indiquer les coordonnées !",
-    "au4": "Précautions",
-    "au5": "Confirmer",
-    "au6": "Annuler",
-    "au7": "Ajouté avec succès",
-    "au8": "Compte",
-    "au9": "Mot de passe",
-    "au10": "Télécharger",
-    "au11": "Le contact n'existe pas"
+  'addUser': {
+    'au1': 'Coordonnées du Restaurant',
+    'au2': 'Informations du Restaurant',
+    'au3': 'Veuillez indiquer les coordonnées !',
+    'au4': 'Précautions',
+    'au5': 'Confirmer',
+    'au6': 'Annuler',
+    'au7': 'Ajouté avec succès',
+    'au8': 'Compte',
+    'au9': 'Mot de passe',
+    'au10': 'Télécharger',
+    'au11': "Le contact n'existe pas"
   },
-  "restaurantUser": {
-    "ru1": "Nom",
-    "ru2": "Prénom",
-    "ru3": "Téléphone",
-    "ru4": "Adresse",
-    "ru5": "Ville :",
-    "ru6": "État/Province :",
-    "ru7": "Code postal :",
-    "ru8": "Pays :",
-    "ru9": "Veuillez sélectionner",
-    "ru10": "Adresse courriel",
-    "ru11": "Type de restaurant",
-    "ru12": "Suivant",
-    "rules": {
-      "r1": "Veuillez entrer vos coordonnées",
-      "r2": "Veuillez entrer votre nom",
-      "r3": "Veuillez entrer votre prénom",
-      "r4": "Veuillez entrer l'adresse",
-      "r5": "Veuillez entrer votre ville",
-      "r6": "Veuillez entrer votre état/province",
-      "r7": "Veuillez entrer votre pays",
-      "r8": "Veuillez sélectionner le type de restaurant",
-      "r9": "Veuillez entrer votre adresse courriel",
-      "r10": "Veuillez entrer une adresse courriel valide",
-      "r11": "Compte de groupe",
-      "r12": "Compte individuel",
-      "r13": "Japon"
+  'restaurantUser': {
+    'ru1': 'Nom',
+    'ru2': 'Prénom',
+    'ru3': 'Téléphone',
+    'ru4': 'Adresse',
+    'ru5': 'Ville :',
+    'ru6': 'État/Province :',
+    'ru7': 'Code postal :',
+    'ru8': 'Pays :',
+    'ru9': 'Veuillez sélectionner',
+    'ru10': 'Adresse courriel',
+    'ru11': 'Type de restaurant',
+    'ru12': 'Suivant',
+    'rules': {
+      'r1': 'Veuillez entrer vos coordonnées',
+      'r2': 'Veuillez entrer votre nom',
+      'r3': 'Veuillez entrer votre prénom',
+      'r4': "Veuillez entrer l'adresse",
+      'r5': 'Veuillez entrer votre ville',
+      'r6': 'Veuillez entrer votre état/province',
+      'r7': 'Veuillez entrer votre pays',
+      'r8': 'Veuillez sélectionner le type de restaurant',
+      'r9': 'Veuillez entrer votre adresse courriel',
+      'r10': 'Veuillez entrer une adresse courriel valide',
+      'r11': 'Compte de groupe',
+      'r12': 'Compte individuel',
+      'r13': 'Japon'
     }
   },
-  "restaurantInfo": {
-    "ri1": "Nom du restaurant :",
-    "ri2": "Type de restaurant",
-    "ri3": "Logo du restaurant :",
-    "ri4": "Adresse du restaurant :",
-    "ri5": "Pays :",
-    "ri6": "Veuillez sélectionner",
-    "ri7": "État :",
-    "ri8": "Ville :",
-    "ri9": "Rue :",
-    "rin9": "Adresse：",
-    "ri10": "Téléphone",
-    "ri11": "Courriel",
-    "ri12": "Industrie de la restauration :",
-    "ri13": "Taxes",
-    "ri14": "Pourboire :",
-    "ri15": "Heures d'ouverture :",
-    "ri16": "Ajouter",
-    "ri17": "Descriptions :",
-    "ri18": "Photos :",
-    "ri19": "Langue par défaut :",
-    "ri20": "Langues :",
-    "ri21": "Livraison disponible ?",
-    "ri22": "Délai de livraison :",
-    "ri23": "Début :",
-    "ri24": "Heure de fin",
-    "ri25": "Délai de livraison :",
-    "ri26": "Bons de livraison :",
-    "ri27": "Zone de livraison :",
-    "ri28": "Ramassage ?",
-    "ri29": "Emplacement Longitude/Latitude",
-    "ri30": "Longitude",
-    "ri31": "Latitude",
-    "ri32": "Restaurant partenaire :",
-    "ri33": "Mis à jour",
-    "ri34": "Créer",
-    "ri35": "Heures d'ouverture",
-    "ri36": "Délai de livraison",
-    "ri37": "Téléchargé jusqu'à 9",
-    "ri38": "Type",
-    "ri39": "Sélectionné",
-    "ri40": "Heure :",
-    "ri41": "Veuillez entrer un format valide",
-    "ri42": "Heure de début de livraison",
-    "ri43": "Heure de fin de livraison",
-    "ri44": "Numéros de commande",
-    "ri45": "Zone de livraison :",
-    "ri46": "Veuillez entrer",
+  'restaurantInfo': {
+    'ri1': 'Nom du restaurant :',
+    'ri2': 'Type de restaurant',
+    'ri3': 'Logo du restaurant :',
+    'ri4': 'Adresse du restaurant :',
+    'ri5': 'Pays :',
+    'ri6': 'Veuillez sélectionner',
+    'ri7': 'État :',
+    'ri8': 'Ville :',
+    'ri9': 'Rue :',
+    'rin9': 'Adresse：',
+    'ri10': 'Téléphone',
+    'ri11': 'Courriel',
+    'ri12': 'Industrie de la restauration :',
+    'ri13': 'Taxes',
+    'ri14': 'Pourboire :',
+    'ri15': "Heures d'ouverture :",
+    'ri16': 'Ajouter',
+    'ri17': 'Descriptions :',
+    'ri18': 'Photos :',
+    'ri19': 'Langue par défaut :',
+    'ri20': 'Langues :',
+    'ri21': 'Livraison disponible ?',
+    'ri22': 'Délai de livraison :',
+    'ri23': 'Début :',
+    'ri24': 'Heure de fin',
+    'ri25': 'Délai de livraison :',
+    'ri26': 'Bons de livraison :',
+    'ri27': 'Zone de livraison :',
+    'ri28': 'Ramassage ?',
+    'ri29': 'Emplacement Longitude/Latitude',
+    'ri30': 'Longitude',
+    'ri31': 'Latitude',
+    'ri32': 'Restaurant partenaire :',
+    'ri33': 'Mis à jour',
+    'ri34': 'Créer',
+    'ri35': "Heures d'ouverture",
+    'ri36': 'Délai de livraison',
+    'ri37': "Téléchargé jusqu'à 9",
+    'ri38': 'Type',
+    'ri39': 'Sélectionné',
+    'ri40': 'Heure :',
+    'ri41': 'Veuillez entrer un format valide',
+    'ri42': 'Heure de début de livraison',
+    'ri43': 'Heure de fin de livraison',
+    'ri44': 'Numéros de commande',
+    'ri45': 'Zone de livraison :',
+    'ri46': 'Veuillez entrer',
     ri47: "Que ce soit pour prendre en charge l'imprimante:",
     ri48: "Lier l'imprimante",
     ri49: "Nom d'imprimante",
     ri50: "Numéro d'imprimante",
     ri51: "Type d'imprimante",
-    ri52: "Imprimante frontale",
+    ri52: 'Imprimante frontale',
     ri53: 'Imprimante de cuisine arrière',
     ri54: "L'imprimante existe déjà",
-    "rules": {
-      "r1": "Veuillez entrer le nom du restaurant",
-      "r2": "Veuillez entrer le type de restaurant",
-      "r3": "Veuillez entrer le pays",
-      "r4": "Veuillez entrer la ville",
-      "r5": "Veuillez entrer l'État/Province",
-      "r6": "Veuillez entrer l'adresse",
-      "r7": "Veuillez entrer la catégorie",
-      "r8": "Veuillez entrer le numéro de téléphone",
-      "r9": "6 à 11 caractères de longueur",
-      "r10": "Veuillez sélectionner la langue par défaut",
-      "r11": "Veuillez entrer votre adresse courriel",
-      "r12": "Veuillez entrer une adresse courriel valide",
-      "r13": "Heures d'ouverture"
+    
+    ri55: 'Do you want to use lucky red envelope?',
+    ri56: 'Type of promotion',
+    ri57: 'Support Dine-in or Not',
+    'rules': {
+      'r1': 'Veuillez entrer le nom du restaurant',
+      'r2': 'Veuillez entrer le type de restaurant',
+      'r3': 'Veuillez entrer le pays',
+      'r4': 'Veuillez entrer la ville',
+      'r5': "Veuillez entrer l'État/Province",
+      'r6': "Veuillez entrer l'adresse",
+      'r7': 'Veuillez entrer la catégorie',
+      'r8': 'Veuillez entrer le numéro de téléphone',
+      'r9': '6 à 11 caractères de longueur',
+      'r10': 'Veuillez sélectionner la langue par défaut',
+      'r11': 'Veuillez entrer votre adresse courriel',
+      'r12': 'Veuillez entrer une adresse courriel valide',
+      'r13': "Heures d'ouverture"
     },
-    "week": {
-      "w1": "Lundi",
-      "w2": "Mardi",
-      "w3": "Mercredi",
-      "w4": "Jeudi",
-      "w5": "Vendredi",
-      "w6": "Samedi",
-      "w7": "Dimanche"
+    'week': {
+      'w1': 'Lundi',
+      'w2': 'Mardi',
+      'w3': 'Mercredi',
+      'w4': 'Jeudi',
+      'w5': 'Vendredi',
+      'w6': 'Samedi',
+      'w7': 'Dimanche'
     },
-    "time": {
-      "t1": "Du matin",
-      "t2": "De l’après-midi",
-      "t3": "Nuit",
-      "t4": "Toute la journée"
+    'time': {
+      't1': 'Du matin',
+      't2': 'De l’après-midi',
+      't3': 'Nuit',
+      't4': 'Toute la journée'
     }
   },
-  "header": {
-    "h1": "Êtes-vous sûr de vouloir vous déconnecter ?",
-    "h2": "Précautions",
-    "h3": "Confirmer",
-    "h4": "Annuler"
+  'header': {
+    'h1': 'Êtes-vous sûr de vouloir vous déconnecter ?',
+    'h2': 'Précautions',
+    'h3': 'Confirmer',
+    'h4': 'Annuler'
   },
-  "request": {
-    "r1": "Erreur lors de la demande…",
-    "r2": "Erreur du serveur"
+  'request': {
+    'r1': 'Erreur lors de la demande…',
+    'r2': 'Failed to load, please refreash the page and try again',
+    'r3': 'Failed to connect, please check your network'
   },
-  "orderList": {
-    "ol1": "Veuillez entrer le nom du restaurant",
-    "ol2": "De",
-    "ol3": "Date de début",
-    "ol4": "Date de fin",
-    "ol5": "Type de Commande",
-    "ol6": "Renseigner",
-    "ol7": "Numéro de série",
-    "ol8": "Heure",
-    "ol9": "Type",
-    "ol10": "Numéro de commande",
-    "ol11": "Nom du restaurant",
-    "ol12": "Sous-total",
-    "ol13": "Montant total",
-    "ol14": "Téléphone",
-    "ol15": "État de la commande",
-    "ol16": "Non rémunéré",
-    "oln17": "Payé",
-    "ol17": "En production",
-    "ol18": "Action :",
-    "ol19": "Voir les détails de la commande",
-    "ol20": "Livraison",
-    "ol21": "Sur place",
-    "ol22": "Ramassage",
-    "oln22": "Pour aller",
-    "ol23": "Carte de débit",
-    "ol24": "Carte de crédit",
-    "ol25": "Espèces",
-    "ol26": "Autres",
-    "ol27": "Annulé",
-    "o128": "annuler la commande"
+  'orderList': {
+    'ol1': 'Veuillez entrer le nom du restaurant',
+    'ol2': 'De',
+    'ol3': 'Date de début',
+    'ol4': 'Date de fin',
+    'ol5': 'Type de Commande',
+    'ol6': 'Renseigner',
+    'ol7': 'Numéro de série',
+    'ol8': 'Heure',
+    'ol9': 'Type',
+    'ol10': 'Numéro de commande',
+    'ol11': 'Nom du restaurant',
+    'ol12': 'Sous-total',
+    'ol13': 'Montant total',
+    'ol14': 'Téléphone',
+    'ol15': 'État de la commande',
+    'ol16': 'Non rémunéré',
+    'oln17': 'Payé',
+    'ol17': 'En production',
+    'ol18': 'Action :',
+    'ol19': 'Voir les détails de la commande',
+    'ol20': 'Livraison',
+    'ol21': 'Sur place',
+    'ol22': 'Ramassage',
+    'oln22': 'Pour aller',
+    'ol23': 'Carte de débit',
+    'ol24': 'Carte de crédit',
+    'ol25': 'Espèces',
+    'ol26': 'Autres',
+    'ol27': 'Annulé',
+    'ol28': '取消訂單',
+    ol29: '今日订单',
+    ol30: '全部订单',
+    ol31: '完成订单',
+    ol32: '删除订单',
+    ol33: 'View more'
   },
-  "orderDetails": {
-    "od1": "Numéro de série",
-    "od2": "Commande passée :",
-    "od3": "Type :",
-    "odn3": "Heure de ramassage :",
-    "od4": "Numéro de commande :",
-    "od5": "Nom du restaurant :",
-    "odn5": "Numéro de table",
-    "od6": "Sous-total :",
-    "od7": "Total :",
-    "od8": "Téléphone :",
-    "odn8": "Contacts :",
-    "od9": "Courriel :",
-    "od10": "État du Paiement : :",
-    "od11": "Mode de paiement :",
-    "od12": "Numéro de plat",
-    "od13": "Plats",
-    "od14": "Prix",
-    "od15": "Articles",
-    "od16": "Adresse de livraison :",
-    "ad17": "Pourboire :",
-    "ad18": "Frais de livraison :",
-    "ad19": "Remarques",
-    "ad20": "du Coca:{num}tasse Boite d'emballage:{count}UNE"
+  'orderDetails': {
+    'od1': 'Numéro de série',
+    'od2': 'Commande passée :',
+    'od3': 'Type :',
+    'odn3': 'Heure de ramassage :',
+    'od4': 'Numéro de commande :',
+    'od5': 'Nom du restaurant :',
+    'odn5': 'Numéro de table',
+    'od6': 'Sous-total :',
+    'od7': 'Total :',
+    'od8': 'Téléphone :',
+    'odn8': 'Contacts :',
+    'od9': 'Courriel :',
+    'od10': 'État du Paiement : :',
+    'od11': 'Mode de paiement :',
+    'od12': 'Numéro de plat',
+    'od13': 'Plats',
+    'od14': 'Prix',
+    'od15': 'Articles',
+    'od16': 'Adresse de livraison :',
+    'ad17': 'Pourboire :',
+    'ad18': 'Frais de livraison :',
+    'ad19': 'Remarques',
+    'ad20': "du Coca:{num}tasse Boite d'emballage:{count}UNE"
   },
-  "discount": {
-    "dc1": "Veuillez entrer le nom du restaurant",
-    "dc2": "Type de promotion :",
-    "dc3": "Réduction",
-    "dc4": "Nouveau client :",
-    "dc5": "Client régulier :",
-    "dc6": "Veuillez entrer le code promo",
-    "dc7": "Date :",
-    "dc8": "De",
-    "dc9": "Date de début",
-    "dc10": "Date de fin",
-    "dc11": "xx Désactivé xx",
-    "dc12": "Veuillez entrer le prix",
-    "dc13": "Veuillez entrer le prix soldé",
-    "dc14": "Atteindre",
-    "dc15": "Date :",
-    "dc16": "Politique :",
-    "dc17": "Éditer",
-    "dc18": "Confirmer",
-    "dc19": "Veuillez ajouter un type de promotion",
-    "dc20": "Veuillez sélectionner une date valide pour la promotion",
-    "dc21": "Veuillez sélectionner une date valide pour le coupon",
-    "dc22": "Politique de promotion",
-    "dc23": "Mis à jour avec succès",
-    "dc24": "Ajouté avec succès",
-    "dc25": "Êtes-vous sûr de vouloir supprimer cette promotion ?",
-    "dc26": "Précautions",
-    "dc27": "Confirmer",
-    "dc28": "Annuler"
+  'discount': {
+    'dc1': 'Veuillez entrer le nom du restaurant',
+    'dc2': 'Type de promotion :',
+    'dc3': 'Réduction',
+    'dc4': 'Nouveau client :',
+    'dc5': 'Client régulier :',
+    'dc6': 'Veuillez entrer le code promo',
+    'dc7': 'Date :',
+    'dc8': 'De',
+    'dc9': 'Date de début',
+    'dc10': 'Date de fin',
+    'dc11': 'xx Désactivé xx',
+    'dc12': 'Veuillez entrer le prix',
+    'dc13': 'Veuillez entrer le prix soldé',
+    'dc14': 'Atteindre',
+    'dc15': 'Date :',
+    'dc16': 'Politique :',
+    'dc17': 'Éditer',
+    'dc18': 'Confirmer',
+    'dc19': 'Veuillez ajouter un type de promotion',
+    'dc20': 'Veuillez sélectionner une date valide pour la promotion',
+    'dc21': 'Veuillez sélectionner une date valide pour le coupon',
+    'dc22': 'Politique de promotion',
+    'dc23': 'Mis à jour avec succès',
+    'dc24': 'Ajouté avec succès',
+    'dc25': 'Êtes-vous sûr de vouloir supprimer cette promotion ?',
+    'dc26': 'Précautions',
+    'dc27': 'Confirmer',
+    'dc28': 'Annuler'
   },
-  "menu": {
-    "m1": "Veuillez entrer le nom du restaurant",
-    "m2": "Renseigner",
-    "m3": "Liste des comptes de groupe",
-    "m4": "Liste des comptes réguliers",
-    "mn4": "Liste des comptes",
-    "m5": "Numéro de série",
-    "m6": "ID du magasin",
-    "m7": "Nom du magasin",
-    "m8": "Catégorie du magasin",
-    "m9": "Type de restaurant",
-    "m10": "État : activé/désactivé",
-    "m11": "Accréditation du restaurant",
-    "m12": "Compte :",
-    "m13": "Mot de passe :",
-    "m14": "Adresse",
-    "m15": "Importer",
-    "m16": "Importation de menus",
-    "m17": "Importer des informations sur le restaurant",
-    "m18": "Coupons",
-    "m19": "Détails",
-    "m20": "Ajouter des coupons",
-    "m21": "État du cas",
-    "m22": "Vérifier les motifs",
-    "m23": "Exploitation du restaurant",
-    "m24": "Voir le menu",
-    "m25": "Éditer",
-    "m26": "Supprimer",
-    "m27": "Catégorie",
-    "m28": "Coordonnées du Restaurant",
-    "m29": "Adresse courriel",
-    "m30": "Téléphone",
-    "m31": "Quantité de restaurants",
-    "m32": "Action :",
-    "m33": "Ajouter nouveau",
-    "m34": "Éditer",
-    "m35": "Supprimer",
-    "m36": "Motif rejeté",
-    "m37": "Aucun motif pour le moment !",
-    "m38": "Confirmer",
-    "m39": "Êtes-vous sûr de vouloir supprimer ce restaurant ?",
-    "m40": "Précautions",
-    "m41": "Confirmer",
-    "m42": "Annuler",
-    "m43": "Seuls les fichiers au format .xlsx peuvent être téléchargés",
-    "m44": "La taille du fichier ne doit pas dépasser 5 M",
-    "m45": "Veuillez patienter, un seul fichier peut être téléchargé à la fois",
-    "m46": "Importé avec succès",
-    "m47": "Êtes-vous sûr de vouloir changer l'état du restaurant ?",
-    "m48": "Supprimé avec succès",
-    "m49": "Mis à jour avec succès",
-    "m50": "Êtes-vous sûr de vouloir supprimer le gestionnaire de ce restaurant ?",
-    "m51": [
-      "du repos",
-      "ouverture",
-      "vérification",
-      "échec de la vérification",
-      "supprimé"
+  'menu': {
+    'm1': 'Veuillez entrer le nom du restaurant',
+    'm2': 'Renseigner',
+    'm3': 'Liste des comptes de groupe',
+    'm4': 'Liste des comptes réguliers',
+    'mn4': 'Liste des comptes',
+    'm5': 'Numéro de série',
+    'm6': 'ID du magasin',
+    'm7': 'Nom du magasin',
+    'm8': 'Catégorie du magasin',
+    'm9': 'Type de restaurant',
+    'm10': 'État : activé/désactivé',
+    'm11': 'Accréditation du restaurant',
+    'm12': 'Compte :',
+    'm13': 'Mot de passe :',
+    'm14': 'Adresse',
+    'm15': 'Importer',
+    'm16': 'Importation de menus',
+    'm17': 'Importer des informations sur le restaurant',
+    'm18': 'Coupons',
+    'm19': 'Détails',
+    'm20': 'Ajouter des coupons',
+    'm21': 'État du cas',
+    'm22': 'Vérifier les motifs',
+    'm23': 'Exploitation du restaurant',
+    'm24': 'Voir le menu',
+    'm25': 'Éditer',
+    'm26': 'Supprimer',
+    'm27': 'Catégorie',
+    'm28': 'Coordonnées du Restaurant',
+    'm29': 'Adresse courriel',
+    'm30': 'Téléphone',
+    'm31': 'Quantité de restaurants',
+    'm32': 'Action :',
+    'm33': 'Ajouter nouveau',
+    'm34': 'Éditer',
+    'm35': 'Supprimer',
+    'm36': 'Motif rejeté',
+    'm37': 'Aucun motif pour le moment !',
+    'm38': 'Confirmer',
+    'm39': 'Êtes-vous sûr de vouloir supprimer ce restaurant ?',
+    'm40': 'Précautions',
+    'm41': 'Confirmer',
+    'm42': 'Annuler',
+    'm43': 'Seuls les fichiers au format .xlsx peuvent être téléchargés',
+    'm44': 'La taille du fichier ne doit pas dépasser 5 M',
+    'm45': 'Veuillez patienter, un seul fichier peut être téléchargé à la fois',
+    'm46': 'Importé avec succès',
+    'm47': "Êtes-vous sûr de vouloir changer l'état du restaurant ?",
+    'm48': 'Supprimé avec succès',
+    'm49': 'Mis à jour avec succès',
+    'm50': 'Êtes-vous sûr de vouloir supprimer le gestionnaire de ce restaurant ?',
+    'm51': [
+      'du repos',
+      'ouverture',
+      'vérification',
+      'échec de la vérification',
+      'supprimé'
     ]
   },
-  "dishes": {
-    "d1": "Type de Commande",
-    "d2": "Livraison",
-    "d3": "Ramassage",
-    "d4": "Sur place",
-    "d5": "Recherche d'articles",
-    "d6": "Renseigner",
-    "d7": "Retourner",
-    "d8": "Ajouter des articles",
-    "d9": "Supprimer tous les articles",
-    "d10": "Numéro",
-    "d11": "Type de menu",
-    "d12": "Nom de l'article",
-    "d13": "Prix de l'article",
-    "d14": "Types de plats",
-    "d15": "Collocations des plats",
-    "d16": "Spécifications des plats",
-    "d17": "Quantité",
-    "d18": "Photos des plats",
-    "d19": "Heure de disponibilité des plats",
-    "d20": "État du cas",
-    "d211": "Vérifier les motifs",
-    "d21": "Action :",
-    "d22": "Définir comme recommandations",
-    "d23": "Supprimer",
-    "d24": "Supprimé",
-    "d25": "Publié",
-    "d26": "Articles",
-    "d27": "Éditer",
-    "d28": "Motif rejeté",
-    "d29": "Aucun motif pour le moment !",
-    "d30": "Confirmer",
-    "d31": "Tous",
-    "d32": "Petit déjeuner",
-    "d33": "Déjeuner",
-    "d34": "Brunch",
-    "d35": "Dîner",
-    "d36": "Collation de minuit",
-    "d37": "Définir comme recommandations ?",
-    "d38": "Annuler ces recommandations ?",
-    "d39": "Supprimer les plats ?",
-    "d40": "Enlever les plats ?",
-    "d41": "Ajouter les plats ?",
-    "d42": "Supprimer tous les plats ?",
-    "d43": "Supprimé avec succès",
-    "d44": [
-      "vérification",
-      "Vérifié",
-      "échec de la vérification"
+  'dishes': {
+    'd1': 'Type de Commande',
+    'd2': 'Livraison',
+    'd3': 'Ramassage',
+    'd4': 'Sur place',
+    'd5': "Recherche d'articles",
+    'd6': 'Renseigner',
+    'd7': 'Retourner',
+    'd8': 'Ajouter des articles',
+    'd9': 'Supprimer tous les articles',
+    'd10': 'Numéro',
+    'd11': 'Type de menu',
+    'd12': "Nom de l'article",
+    'd13': "Prix de l'article",
+    'd14': 'Types de plats',
+    'd15': 'Collocations des plats',
+    'd16': 'Spécifications des plats',
+    'd17': 'Quantité',
+    'd18': 'Photos des plats',
+    'd19': 'Heure de disponibilité des plats',
+    'd20': 'État du cas',
+    'd211': 'Vérifier les motifs',
+    'd21': 'Action :',
+    'd22': 'Définir comme recommandations',
+    'd23': 'Supprimer',
+    'd24': 'Supprimé',
+    'd25': 'Publié',
+    'd26': 'Articles',
+    'd27': 'Éditer',
+    'd28': 'Motif rejeté',
+    'd29': 'Aucun motif pour le moment !',
+    'd30': 'Confirmer',
+    'd31': 'Tous',
+    'd32': 'Petit déjeuner',
+    'd33': 'Déjeuner',
+    'd34': 'Brunch',
+    'd35': 'Dîner',
+    'd36': 'Collation de minuit',
+    'd37': 'Définir comme recommandations ?',
+    'd38': 'Annuler ces recommandations ?',
+    'd39': 'Supprimer les plats ?',
+    'd40': 'Enlever les plats ?',
+    'd41': 'Ajouter les plats ?',
+    'd42': 'Supprimer tous les plats ?',
+    'd43': 'Supprimé avec succès',
+    'd44': [
+      'vérification',
+      'Vérifié',
+      'échec de la vérification'
     ],
-    "d45": "Mis à jour !"
+    'd45': 'Mis à jour !'
   },
-  "menuInfo": {
-    "mi1": "Plat :",
-    "mi2": "Prix :",
-    "mi3": "En stock :",
-    "mi4": "Photos des plats :",
-    "mi5": "Heure de disponibilité des plats :",
-    "mi6": "Recommander :",
-    "mi7": "Définir comme spécialité :",
-    "mi8": "Catégorie de plats :",
-    "mi9": "Période de validité des plats :",
-    "mi10": "Catégorie :",
-    "mi11": "Étiquette :",
-    "mi12": "Taxes :",
-    "mi13": "Taxes :",
-    "mi14": "Épicé :",
-    "mi15": "Côtés : ",
-    "mi16": "Caractéristiques :",
-    "mi17": "Propriété",
-    "mi18": "Prix unitaire",
-    "mi19": "Ajouter des articles :",
-    "mi20": "Remarques :",
-    "mi21": "Paiement :",
-    "mi22": "Veuillez sélectionner",
-    "mi23": "Éditer",
-    "mi24": "Soumettre pour révision",
-    "mi25": "Veuillez sélectionner le paiement",
-    "mi26": "Veuillez choisir une période de validité pour cet article",
-    "mi27": "Plats",
-    "mi28": "Boissons",
-    "mi29": "Ramassage",
-    "mi30": "Livraison",
-    "mi31": "Sur place",
-    "mi32": "Nom du plat :",
-    "mi33": "Prix :",
-    "mi34": "En stock :",
-    "mi35": "Disponible :",
-    "mi36": "Catégorie :",
-    "mi37": "RMB/Yen",
-    "mi38": "Dollar",
-    "mi39": "Euro",
-    "mi40": "Ajouté avec succès",
-    "mi41": "Modifié avec succès"
+  'menuInfo': {
+    'mi1': 'Plat',
+    'mi2': 'Prix',
+    'mi3': 'En stock',
+    'mi4': 'Photos des plats',
+    'mi5': 'Heure de disponibilité des plats',
+    'mi6': 'Recommander',
+    'mi7': 'Définir comme spécialité',
+    'mi8': 'Catégorie de plats',
+    'mi9': 'Période de validité des plats',
+    'mi10': 'Catégorie',
+    'mi11': 'Étiquette',
+    'mi12': 'Taxes',
+    'mi13': 'Taxes',
+    'mi14': 'Épicé',
+    'mi15': 'Côtés',
+    'mi16': 'Caractéristiques',
+    'mi17': 'Propriété',
+    'mi18': 'Prix unitaire',
+    'mi19': 'Ajouter des articles',
+    'mi20': 'Remarques',
+    'mi21': 'Paiement',
+    'mi22': 'Veuillez sélectionner',
+    'mi23': 'Éditer',
+    'mi24': 'Soumettre pour révision',
+    'mi25': 'Veuillez sélectionner le paiement',
+    'mi26': 'Veuillez choisir une période de validité pour cet article',
+    'mi27': 'Plats',
+    'mi28': 'Boissons',
+    'mi29': 'Ramassage',
+    'mi30': 'Livraison',
+    'mi31': 'Sur place',
+    'mi32': 'Nom du plat',
+    'mi33': 'Prix',
+    'mi34': 'En stock',
+    'mi35': 'Disponible',
+    'mi36': 'Catégorie',
+    'mi37': 'RMB/Yen',
+    'mi38': 'Dollar',
+    'mi39': 'Euro',
+    'mi40': 'Ajouté avec succès',
+    'mi41': 'Modifié avec succès',
+    mi42: '请输入菜品分类',
+    mi43: '请输入菜品税率',
+    mi44: '是否为披萨'
   },
-  "addHoliday": {
-    "ah1": "Trouver",
-    "ah2": "Jour férié",
-    "ah3": "Début :",
-    "ah4": "Début :",
-    "ah5": "Fin :",
-    "ah6": "Heure de fin",
-    "ah7": "Confirmer",
-    "ah8": "Veuillez sélectionner le restaurant",
-    "ah9": "Veuillez sélectionner la date",
-    "ah10": "Veuillez sélectionner l'heure de début",
-    "ah11": "Veuillez sélectionner l'heure de fin",
-    "ah12": "Modifié avec succès",
-    "ah13": "Ajouté avec succès"
+  'addHoliday': {
+    'ah1': 'Trouver',
+    'ah2': 'Jour férié',
+    'ah3': 'Début :',
+    'ah4': 'Début :',
+    'ah5': 'Fin :',
+    'ah6': 'Heure de fin',
+    'ah7': 'Confirmer',
+    'ah8': 'Veuillez sélectionner le restaurant',
+    'ah9': 'Veuillez sélectionner la date',
+    'ah10': "Veuillez sélectionner l'heure de début",
+    'ah11': "Veuillez sélectionner l'heure de fin",
+    'ah12': 'Modifié avec succès',
+    'ah13': 'Ajouté avec succès'
   },
-  "holiday": {
-    "h1": "Jour férié",
-    "h2": "Ajouter",
-    "h3": "Numéro de série",
-    "h4": "Date",
-    "h5": "Heure de début",
-    "h6": "Heure de fin",
-    "h7": "Nom du restaurant",
-    "h8": "Action :",
-    "h9": "Éditer",
-    "h10": "Supprimer",
-    "h11": "Jour férié",
-    "h12": "Êtes-vous sûr de vouloir supprimer ce jour férié ?",
-    "h13": "Supprimé avec succès"
+  'holiday': {
+    'h1': 'Jour férié',
+    'h2': 'Ajouter',
+    'h3': 'Numéro de série',
+    'h4': 'Date',
+    'h5': 'Heure de début',
+    'h6': 'Heure de fin',
+    'h7': 'Nom du restaurant',
+    'h8': 'Action :',
+    'h9': 'Éditer',
+    'h10': 'Supprimer',
+    'h11': 'Jour férié',
+    'h12': 'Êtes-vous sûr de vouloir supprimer ce jour férié ?',
+    'h13': 'Supprimé avec succès'
   },
-  "person": {
+  'person': {
     p1: 'Numéro',
     p2: 'Nom',
     p3: 'Le sexe',
@@ -506,20 +520,20 @@ const fr = {
     p16: 'Femme',
     p17: 'Compte'
   },
-  "qrcode": {
-    "qc1": "Générer un code QR",
-    "qc2": "Téléchargement en gros",
-    "qc3": "Numéro de série",
-    "qc4": "Code QR",
-    "qc5": "Numéro de table",
-    "qc6": "Action :",
-    "qc7": "Enregistrer le code QR",
-    "qc8": "Supprimer",
-    "qc9": "Veuillez entrer le numéro de table",
-    "qc10": "Ajouté avec succès",
-    "qc11": "Supprimé avec succès"
+  'qrcode': {
+    'qc1': 'Générer un code QR',
+    'qc2': 'Téléchargement en gros',
+    'qc3': 'Numéro de série',
+    'qc4': 'Code QR',
+    'qc5': 'Numéro de table',
+    'qc6': 'Action :',
+    'qc7': 'Enregistrer le code QR',
+    'qc8': 'Supprimer',
+    'qc9': 'Veuillez entrer le numéro de table',
+    'qc10': 'Ajouté avec succès',
+    'qc11': 'Supprimé avec succès'
   },
   ...frLocale
 }
 
-export default fr;
\ No newline at end of file
+export default fr
diff --git a/src/i18n/langs/ja.js b/src/i18n/langs/ja.js
index 3a424f507b11213f28c3cad857321a0e8db2dcfa..52f4a5bff563aeface85b2692cb162697c574509 100644
--- a/src/i18n/langs/ja.js
+++ b/src/i18n/langs/ja.js
@@ -1,173 +1,174 @@
 import jaLocale from 'element-ui/lib/locale/lang/ja'
 
 const ja = {
-  "home": {
-    "userInfo": "ユーザ情報",
-    "order": "注文数",
-    "menu": "メニュー管理",
-    "holiday": "休日設定",
-    "registered": [
-      "７日間",
-      "14日間",
-      "30日間",
-      "90日間"
+  'home': {
+    'userInfo': 'ユーザ情報',
+    'order': '注文数',
+    'menu': 'メニュー管理',
+    'holiday': '休日設定',
+    'registered': [
+      '７日間',
+      '14日間',
+      '30日間',
+      '90日間'
     ],
-    "registeredTitle": "商店登録数",
-    "signout": "サインアウト"
+    'registeredTitle': '商店登録数',
+    'signout': 'サインアウト'
   },
-  "router": {
-    "home": "ホーム",
-    "distributor": "代理店",
-    "restaurant": "レストラン管理",
-    "data": "データ管理",
-    "editUser": "ユーザ編輯",
-    "addUser": "新規ユーザー",
-    "editRestaurant": "レストラン情報編集",
-    "dishes": "メニューリスト",
-    "r1": "ユーザ情報管理",
-    "r2": "注文管理",
-    "r3": "注文詳細",
-    "r4": "メニュー管理",
-    "r5": "レストラン追加",
-    "r6": "料理追加",
-    "r7": "割引項目",
-    "r8": "休日設定",
-    "r9": "QRコード管理",
-     r10: 'ユーザー管理',
-     r11: 'ユーザーの詳細'
+  'router': {
+    'home': 'ホーム',
+    'distributor': '代理店',
+    'restaurant': 'レストラン管理',
+    'data': 'データ管理',
+    'editUser': 'ユーザ編輯',
+    'addUser': '新規ユーザー',
+    'editRestaurant': 'レストラン情報編集',
+    'dishes': 'メニューリスト',
+    'r1': 'ユーザ情報管理',
+    'r2': '注文管理',
+    'r3': '注文詳細',
+    'r4': 'メニュー管理',
+    'r5': 'レストラン追加',
+    'r6': '料理追加',
+    'r7': '割引項目',
+    'r8': '休日設定',
+    'r9': 'QRコード管理',
+    r10: 'ユーザー管理',
+    r11: 'ユーザーの詳細',
+    title: 'レストラン管理画面'
   },
-  "users": {
-    "u1": "新規ユーザー",
-    "u2": "法人口座一覧",
-    "u3": "個人口座一覧",
-    "u4": "編集番号",
-    "u5": "電話",
-    "u6": "名前",
-    "u7": "名称",
-    "u8": "住所",
-    "u9": "都道府県",
-    "u10": "市町村",
-    "u11": "郵便番号",
-    "u12": "国",
-    "u13": "メールアドレス",
-    "u14": "操作",
-    "u15": "編集"
+  'users': {
+    'u1': '新規ユーザー',
+    'u2': '法人口座一覧',
+    'u3': '個人口座一覧',
+    'u4': '編集番号',
+    'u5': '電話',
+    'u6': '名前',
+    'u7': '名称',
+    'u8': '住所',
+    'u9': '都道府県',
+    'u10': '市町村',
+    'u11': '郵便番号',
+    'u12': '国',
+    'u13': 'メールアドレス',
+    'u14': '操作',
+    'u15': '編集'
   },
-  "editUser": {
-    "eu1": "電話番号",
-    "eu2": "姓",
-    "eu3": "名",
-    "eu4": "住所",
-    "eu5": "市町村",
-    "eu6": "市町村",
-    "eu7": "郵便番号",
-    "eu8": "国",
-    "eu9": "メール",
-    "eu10": "確定",
-    "rules": {
-      "r1": "連絡先を入力してください",
-      "r2": "長さは6文字から11文字です。",
-      "r3": "姓を入力してください",
-      "r4": "名を入力してください",
-      "r5": "住所を入力してください",
-      "r6": "市を入力してください",
-      "r7": "都道府県を入力してください",
-      "r8": "国を入力してください",
-      "r9": "メールアドレスを入力してください",
-      "r10": "正しいメールアドレスを入力してください"
+  'editUser': {
+    'eu1': '電話番号',
+    'eu2': '姓',
+    'eu3': '名',
+    'eu4': '住所',
+    'eu5': '市町村',
+    'eu6': '市町村',
+    'eu7': '郵便番号',
+    'eu8': '国',
+    'eu9': 'メール',
+    'eu10': '確定',
+    'rules': {
+      'r1': '連絡先を入力してください',
+      'r2': '長さは6文字から11文字です。',
+      'r3': '姓を入力してください',
+      'r4': '名を入力してください',
+      'r5': '住所を入力してください',
+      'r6': '市を入力してください',
+      'r7': '都道府県を入力してください',
+      'r8': '国を入力してください',
+      'r9': 'メールアドレスを入力してください',
+      'r10': '正しいメールアドレスを入力してください'
     }
   },
-  "addUser": {
-    "au1": "レストラン責任者情報",
-    "au2": "レストラン情報",
-    "au3": "責任者の情報をご記入ください！",
-    "au4": "提示",
-    "au5": "確定",
-    "au6": "取消",
-    "au7": "追加成功",
-    "au8": "レストランアカウント",
-    "au9": "レストランパスワード",
-    "au10": "ダウンロード",
-    "au11": "責任者IDが存在しません"
+  'addUser': {
+    'au1': 'レストラン責任者情報',
+    'au2': 'レストラン情報',
+    'au3': '責任者の情報をご記入ください！',
+    'au4': '提示',
+    'au5': '確定',
+    'au6': '取消',
+    'au7': '追加成功',
+    'au8': 'レストランアカウント',
+    'au9': 'レストランパスワード',
+    'au10': 'ダウンロード',
+    'au11': '責任者IDが存在しません'
   },
-  "restaurantUser": {
-    "ru1": "責任者の姓",
-    "ru2": "責任者の名",
-    "ru3": "責任者電話",
-    "ru4": "責任者住所",
-    "ru5": "市町村",
-    "ru6": "市町村",
-    "ru7": "郵便番号",
-    "ru8": "国",
-    "ru9": "選択してください",
-    "ru10": "メール",
-    "ru11": "レストランタイプ",
-    "ru12": "次のステップ",
-    "rules": {
-      "r1": "連絡先を入力してください",
-      "r2": "姓を入力してください",
-      "r3": "名を入力してください",
-      "r4": "住所を入力してください",
-      "r5": "市を入力してください",
-      "r6": "都道府県を入力してください",
-      "r7": "国を入力してください",
-      "r8": "レストランのタイプを入力してください",
-      "r9": "メールアドレスを入力してください",
-      "r10": "正しいメールアドレスを入力してください",
-      "r11": "法人アカウント",
-      "r12": "個人レストランアカウント",
-      "r13": "日本"
+  'restaurantUser': {
+    'ru1': '責任者の姓',
+    'ru2': '責任者の名',
+    'ru3': '責任者電話',
+    'ru4': '責任者住所',
+    'ru5': '市町村',
+    'ru6': '市町村',
+    'ru7': '郵便番号',
+    'ru8': '国',
+    'ru9': '選択してください',
+    'ru10': 'メール',
+    'ru11': 'レストランタイプ',
+    'ru12': '次のステップ',
+    'rules': {
+      'r1': '連絡先を入力してください',
+      'r2': '姓を入力してください',
+      'r3': '名を入力してください',
+      'r4': '住所を入力してください',
+      'r5': '市を入力してください',
+      'r6': '都道府県を入力してください',
+      'r7': '国を入力してください',
+      'r8': 'レストランのタイプを入力してください',
+      'r9': 'メールアドレスを入力してください',
+      'r10': '正しいメールアドレスを入力してください',
+      'r11': '法人アカウント',
+      'r12': '個人レストランアカウント',
+      'r13': '日本'
     }
   },
-  "restaurantInfo": {
-    "ri1": "レストラン名前",
-    "ri2": "レストランタイプ",
-    "ri3": "レストランロゴ",
-    "ri4": "レストラン住所",
-    "ri5": "国",
-    "ri6": "選択してください",
-    "ri7": "都道府県",
-    "ri8": "市町村",
-    "ri9": "番地",
-    "rin9": "詳細住所：",
-    "ri10": "レストラン電話",
-    "ri11": "レストランメールアドレス",
-    "ri12": "飲食業界",
-    "ri13": "税率",
-    "ri14": "チープ",
-    "ri15": "レストラン営業時間",
-    "ri16": "増加",
-    "ri17": "レストラン紹介説明",
-    "ri18": "レストラン環境写真",
-    "ri19": "レストラン基本言語",
-    "ri20": "国別言語をサポート",
-    "ri21": "デリバリーサービスできるかどうか",
-    "ri22": "デリバリーサービス時間帯",
-    "ri23": "開始時間",
-    "ri24": "終了時間",
-    "ri25": "レストランデリバリーの範囲",
-    "ri26": "デリバリー範囲の数量",
-    "ri27": "レストランのデリバリー範囲",
-    "ri28": "テイクアウトできるかどうか",
-    "ri29": "レストラン経緯",
-    "ri30": "経度",
-    "ri31": "緯度",
-    "ri32": "協同組合レストランですか",
-    "ri33": "修正確定",
-    "ri34": "アカウントを確認して生成する",
-    "ri35": "営業時間を追加してください",
-    "ri36": "デリバリー時間を選んでください",
-    "ri37": "九枚まで画像を添付できます",
-    "ri38": "時間のタイプを選んでください",
-    "ri39": "その時間のタイプが選択された",
-    "ri40": "時間を入力してください",
-    "ri41": "正確な時間フォーマットを入力してください",
-    "ri42": "デリバリー開始時間",
-    "ri43": "デリバリー終了時間",
-    "ri44": "注文数",
-    "ri45": "レストランのデリバリー範囲",
-    "ri46": "記入してください",
-    ri47: 'プリンターをサポートするかどうか:',
+  'restaurantInfo': {
+    'ri1': 'レストラン名前',
+    'ri2': 'レストランタイプ',
+    'ri3': 'レストランロゴ',
+    'ri4': 'レストラン住所',
+    'ri5': '国',
+    'ri6': '選択してください',
+    'ri7': '都道府県',
+    'ri8': '市町村',
+    'ri9': '番地',
+    'rin9': '詳細住所',
+    'ri10': 'レストラン電話',
+    'ri11': 'レストランメールアドレス',
+    'ri12': '飲食業界',
+    'ri13': '税率',
+    'ri14': 'チープ',
+    'ri15': 'レストラン営業時間',
+    'ri16': '増加',
+    'ri17': 'レストラン紹介説明',
+    'ri18': 'レストラン環境写真',
+    'ri19': 'レストラン基本言語',
+    'ri20': '国別言語をサポート',
+    'ri21': 'デリバリーサービスできるかどうか',
+    'ri22': 'デリバリーサービス時間帯',
+    'ri23': '開始時間',
+    'ri24': '終了時間',
+    'ri25': 'レストランデリバリーの範囲',
+    'ri26': 'デリバリー範囲の数量',
+    'ri27': 'レストランのデリバリー範囲',
+    'ri28': 'テイクアウトできるかどうか',
+    'ri29': 'レストラン経緯',
+    'ri30': '経度',
+    'ri31': '緯度',
+    'ri32': '協同組合レストランですか',
+    'ri33': '修正確定',
+    'ri34': 'アカウントを確認して生成する',
+    'ri35': '営業時間を追加してください',
+    'ri36': 'デリバリー時間を選んでください',
+    'ri37': '九枚まで画像を添付できます',
+    'ri38': '時間のタイプを選んでください',
+    'ri39': 'その時間のタイプが選択された',
+    'ri40': '時間を入力してください',
+    'ri41': '正確な時間フォーマットを入力してください',
+    'ri42': 'デリバリー開始時間',
+    'ri43': 'デリバリー終了時間',
+    'ri44': '注文数',
+    'ri45': 'レストランのデリバリー範囲',
+    'ri46': '記入してください',
+    ri47: 'プリンターをサポートするかどうか',
     ri48: 'バインドプリンター',
     ri49: 'プリンター名',
     ri50: 'プリンター番号',
@@ -175,352 +176,385 @@ const ja = {
     ri52: 'フロントエンドプリンター',
     ri53: 'バックキッチンプリンター',
     ri54: 'プリンタはすでに存在します',
-    "rules": {
-      "r1": "レストラン名前を入力してください",
-      "r2": "レストランタイプを入力してください",
-      "r3": "国を選んでください",
-      "r4": "市町村を入力してください",
-      "r5": "都道府県を入力してください",
-      "r6": "住所を入力してください",
-      "r7": "店舗業種を記入してください",
-      "r8": "レストラン電話番号を入力してください",
-      "r9": "長さは6文字から11文字です。",
-      "r10": "基本言語を選択してください",
-      "r11": "メールアドレスを入力してください",
-      "r12": "正しいメールアドレスを入力してください",
-      "r13": "営業時間を入力してください"
+    ri55: '割引イベントに参加するかどうか',
+    ri56: 'アクティビティタイプ',
+    ri57: 'Support Dine-in or Not',
+
+    ri58:'Delivery Fee',
+    ri59:'所属时区',
+    ri60:'请选择所属时区',
+
+    'rules': {
+      'r1': 'レストラン名前を入力してください',
+      'r2': 'レストランタイプを入力してください',
+      'r3': '国を選んでください',
+      'r4': '市町村を入力してください',
+      'r5': '都道府県を入力してください',
+      'r6': '住所を入力してください',
+      'r7': '店舗業種を記入してください',
+      'r8': 'レストラン電話番号を入力してください',
+      'r9': '長さは6文字から11文字です。',
+      'r10': '基本言語を選択してください',
+      'r11': 'メールアドレスを入力してください',
+      'r12': '正しいメールアドレスを入力してください',
+      'r13': '営業時間を入力してください'
     },
-    "week": {
-      "w1": "月曜日",
-      "w2": "火曜日",
-      "w3": "水曜日",
-      "w4": "木曜日",
-      "w5": "金曜日",
-      "w6": "土曜日",
-      "w7": "日曜日"
+    'week': {
+      'w1': '月曜日',
+      'w2': '火曜日',
+      'w3': '水曜日',
+      'w4': '木曜日',
+      'w5': '金曜日',
+      'w6': '土曜日',
+      'w7': '日曜日'
     },
-    "time": {
-      "t1": "午前",
-      "t2": "午後",
-      "t3": "夜",
-      "t4": "終日"
+    'time': {
+      't1': '午前',
+      't2': '午後',
+      't3': '夜',
+      't4': '終日'
     }
   },
-  "header": {
-    "h1": "サインアウトしますか",
-    "h2": "提示",
-    "h3": "確定",
-    "h4": "取消"
+  'header': {
+    'h1': 'サインアウトしますか',
+    'h2': '提示',
+    'h3': '確定',
+    'h4': '取消'
   },
-  "request": {
-    "r1": "エラーが発生しました",
-    "r2": "サーバーエラー"
+  'request': {
+    'r1': 'エラーが発生しました',
+    'r2': 'ネットワークタイムアウト。更新して再試行してください',
+    'r3': 'ネットワークが異常です。ネットワークを確認してください'
   },
-  "orderList": {
-    "ol1": "注文したレストラン名前を入力してください",
-    "ol2": "まで",
-    "ol3": "開始日",
-    "ol4": "終了日",
-    "ol5": "注文タイプ",
-    "ol6": "查 询",
-    "ol7": "シリアル番号",
-    "ol8": "時間",
-    "ol9": "タイプ",
-    "ol10": "注文番号",
-    "ol11": "レストラン名",
-    "ol12": "小計",
-    "ol13": "合計金額",
-    "ol14": "電話",
-    "ol15": "注文状況",
-    "ol16": "未払い",
-    "oln17": "支払い済",
-    "ol17": "制作中",
-    "ol18": "操作",
-    "ol19": "注文詳細を表示",
-    "ol20": "デリバリー",
-    "ol21": "店内",
-    "ol22": "テイクアウト",
-    "oln22": "お持ち帰り",
-    "ol23": "キャッシュカード",
-    "ol24": "クレジットカード",
-    "ol25": "現金",
-    "ol26": "その他",
-    "ol27": "取り消し済",
-    "o128": "注文をキャンセルする"
+  'orderList': {
+    'ol1': '注文したレストラン名前を入力してください',
+    'ol2': 'まで',
+    'ol3': '開始日',
+    'ol4': '終了日',
+    'ol5': '注文タイプ',
+    'ol6': '検索',
+    'ol7': 'シリアル番号',
+    'ol8': '時間',
+    'ol9': 'タイプ',
+    'ol10': '注文番号',
+    'ol11': 'レストラン名',
+    'ol12': '小計',
+    'ol13': '合計金額',
+    'ol14': '電話',
+    'ol15': '注文状況',
+    'ol16': '未払い',
+    'oln17': '支払い済',
+    'ol17': '制作中',
+    'ol18': '操作',
+    'ol19': '注文詳細を表示',
+    'ol20': 'デリバリー',
+    'ol21': '店内',
+    'ol22': 'テイクアウト',
+    'oln22': 'お持ち帰り',
+    'ol23': 'キャッシュカード',
+    'ol24': 'クレジットカード',
+    'ol25': '現金',
+    'ol26': 'その他',
+    'ol27': '取り消し済',
+    "ol28": "注文をキャンセル",
+    "ol29": "本日の注文",
+    "ol30": "すべての注文",
+    "ol31": "注文完了",
+    "ol32": "注文を削除",
+    ol33: 'View more',
+    ol34: 'クレジットカードで支払う'
   },
-  "orderDetails": {
-    "od1": "番号",
-    "od2": "注文時間",
-    "od3": "タイプ",
-    "odn3": "食事を受け取る時間",
-    "od4": "注文番号",
-    "od5": "レストラン名前",
-    "odn5": "テーブル番号",
-    "od6": "小計",
-    "od7": "合計",
-    "od8": "連絡電話",
-    "odn8": "連絡先",
-    "od9": "メールアドレス",
-    "od10": "支払い状態",
-    "od11": "支払方法",
-    "od12": "料理名称番号",
-    "od13": "料理名称",
-    "od14": "料理価格",
-    "od15": "料理数量",
-    "od16": "デリバリー住所",
-    "ad17": "チープ",
-    "ad18": "配達員チープ",
-    "ad19": "備考",
-    "ad20": "飲み物：{num}カップ包装ケース：{count}個"
+  'orderDetails': {
+    'od1': '番号',
+    'od2': '注文時間',
+    'od3': 'タイプ',
+    'odn3': '食事を受け取る時間',
+    'od4': '注文番号',
+    'od5': 'レストラン名前',
+    'odn5': 'テーブル番号',
+    'od6': '小計',
+    'od7': '合計',
+    'od8': '連絡電話',
+    'odn8': '連絡先',
+    'od9': 'メールアドレス',
+    'od10': '支払い状態',
+    'od11': '支払方法',
+    'od12': '料理名称番号',
+    'od13': '料理名称',
+    'od14': '料理価格',
+    'od15': '料理数量',
+    'od16': 'デリバリー住所',
+    'od17': 'クーポン',
+    'ad17': 'チープ',
+    'ad18': '配達員チープ',
+    'ad19': '備考',
+    'ad20': '飲み物：{num}カップ包装ケース：{count}個',
+    'ad21': '消費税'
   },
-  "discount": {
-    "dc1": "注文したレストラン名前を入力してください",
-    "dc2": "割引タイプ",
-    "dc3": "割引類",
-    "dc4": "新規ユーザー",
-    "dc5": "お得意様",
-    "dc6": "ユーザ割引を入力してください",
-    "dc7": "活動期間",
-    "dc8": "まで",
-    "dc9": "開始日",
-    "dc10": "終了日",
-    "dc11": "割引き",
-    "dc12": "価格を入力してください",
-    "dc13": "割引価格を入力してください",
-    "dc14": "いっぱい",
-    "dc15": "活動期間",
-    "dc16": "活動規則",
-    "dc17": "変更",
-    "dc18": "を選択します",
-    "dc19": "割引種類を選んでください",
-    "dc20": "割引活動期間を選んでください",
-    "dc21": "割引活動期間を選んでください",
-    "dc22": "活動規則を入力してください",
-    "dc23": "修正成功",
-    "dc24": "追加成功",
-    "dc25": "この割引を削除しますか",
-    "dc26": "提示",
-    "dc27": "確定",
-    "dc28": "取消"
+  'discount': {
+    'dc1': '注文したレストラン名前を入力してください',
+    'dc2': '割引タイプ',
+    'dc3': '割引類',
+    'dc4': '新規ユーザー',
+    'dc5': 'お得意様',
+    'dc6': 'ユーザ割引を入力してください',
+    'dc7': '活動期間',
+    'dc8': 'まで',
+    'dc9': '開始日',
+    'dc10': '終了日',
+    'dc11': '割引き',
+    'dc12': '価格を入力してください',
+    'dc13': '割引価格を入力してください',
+    'dc14': 'いっぱい',
+    'dc15': '活動期間',
+    'dc16': '活動規則',
+    'dc17': '変更',
+    'dc18': 'を選択します',
+    'dc19': '割引種類を選んでください',
+    'dc20': '割引活動期間を選んでください',
+    'dc21': '割引活動期間を選んでください',
+    'dc22': '活動規則を入力してください',
+    'dc23': '修正成功',
+    'dc24': '追加成功',
+    'dc25': 'この割引を削除しますか',
+    'dc26': '提示',
+    'dc27': '確定',
+    'dc28': '取消'
   },
-  "menu": {
-    "m1": "注文したレストラン名前を入力してください",
-    "m2": "クエリー",
-    "m3": "法人口座一覧",
-    "m4": "個人口座一覧",
-    "mn4": "アカウントリスト",
-    "m5": "シリアル番号",
-    "m6": "店舗ID",
-    "m7": "店舗名",
-    "m8": "店舗業界",
-    "m9": "レストランタイプ",
-    "m10": "オンライン状況",
-    "m11": "レストランアカウントパスワード",
-    "m12": "アカウント名",
-    "m13": "パスワード",
-    "m14": "店舗住所",
-    "m15": "レストランインポート",
-    "m16": "メニューインポート",
-    "m17": "レストラン情報インポート",
-    "m18": "割引情報",
-    "m19": "詳細表示",
-    "m20": "特典追加",
-    "m21": "審査状況",
-    "m22": "原因表示",
-    "m23": "レストラン運営",
-    "m24": "メニュー表示",
-    "m25": "編集",
-    "m26": "削除",
-    "m27": "種類",
-    "m28": "レストラン責任者名前",
-    "m29": "メールアドレス",
-    "m30": "電話",
-    "m31": "レストラン数",
-    "m32": "操作",
-    "m33": "レストラン追加",
-    "m34": "編集",
-    "m35": "削除",
-    "m36": "審査失敗原因",
-    "m37": "原因なし",
-    "m38": "を選択します",
-    "m39": "このレストランの削除を確認しますか",
-    "m40": "提示",
-    "m41": "確定",
-    "m42": "取消",
-    "m43": ".xlsxでインフォのファイルだけアップロードできる",
-    "m44": "ファイルサイズは５mを超えてはいけません",
-    "m45": "しばらくお待ちください。一度にアップロードできるファイルは一つだけです。",
-    "m46": "インポート成功",
-    "m47": "レストラン状況を変更しますか？",
-    "m48": "削除成功",
-    "m49": "修正成功",
-    "m50": "レストラン責任者を削除しますか",
-    "m51": [
-      "休憩中です",
-      "営業中",
-      "審査中",
-      "審査が通っていません",
-      "削除しました"
-    ]
+  'menu': {
+    'm1': '注文したレストラン名前を入力してください',
+    'm2': 'クエリー',
+    'm3': '法人口座一覧',
+    'm4': '個人口座一覧',
+    'mn4': 'アカウントリスト',
+    'm5': 'シリアル番号',
+    'm6': '店舗ID',
+    'm7': '店舗名',
+    'm8': '店舗業界',
+    'm9': 'レストランタイプ',
+    'm10': 'オンライン状況',
+    'm11': 'レストランアカウントパスワード',
+    'm12': 'アカウント名',
+    'm13': 'パスワード',
+    'm14': '店舗住所',
+    'm15': 'レストランインポート',
+    'm16': 'メニューインポート',
+    'm17': 'レストラン情報インポート',
+    'm18': '割引情報',
+    'm19': '詳細表示',
+    'm20': '特典追加',
+    'm21': '審査状況',
+    'm22': '原因表示',
+    'm23': 'レストラン運営',
+    'm24': 'メニュー表示',
+    'm25': '編集',
+    'm26': '削除',
+    'm27': '種類',
+    'm28': 'レストラン責任者名前',
+    'm29': 'メールアドレス',
+    'm30': '電話',
+    'm31': 'レストラン数',
+    'm32': '操作',
+    'm33': 'レストラン追加',
+    'm34': '編集',
+    'm35': '削除',
+    'm36': '審査失敗原因',
+    'm37': '原因なし',
+    'm38': 'を選択します',
+    'm39': 'このレストランの削除を確認しますか',
+    'm40': '提示',
+    'm41': '確定',
+    'm42': '取消',
+    'm43': '.xlsxでインフォのファイルだけアップロードできる',
+    'm44': 'ファイルサイズは５mを超えてはいけません',
+    'm45': 'しばらくお待ちください。一度にアップロードできるファイルは一つだけです。',
+    'm46': 'インポート成功',
+    'm47': 'レストラン状況を変更しますか？',
+    'm48': '削除成功',
+    'm49': '修正成功',
+    'm50': 'レストラン責任者を削除しますか',
+    'm51': [
+      '休憩中です',
+      '営業中',
+      '審査中',
+      '審査が通っていません',
+      '削除しました'
+    ],
+    m52: '削除しますか?'
   },
-  "dishes": {
-    "d1": "注文タイプ",
-    "d2": "デリバリー",
-    "d3": "テイクアウト",
-    "d4": "店内",
-    "d5": "料理検索",
-    "d6": "クエリー",
-    "d7": "戻る",
-    "d8": "料理追加",
-    "d9": "全部料理を削除",
-    "d10": "編集番号",
-    "d11": "メニュータイプ",
-    "d12": "料理名",
-    "d13": "料理金額",
-    "d14": "料理分類",
-    "d15": "料理組み合わせ",
-    "d16": "料理規格",
-    "d17": "数量",
-    "d18": "料理写真",
-    "d19": "料理提供時間",
-    "d20": "審査状況",
-    "d211": "原因表示",
-    "d21": "操作",
-    "d22": "おすすめ料理を設定するかどうか",
-    "d23": "削除",
-    "d24": "取り下げ",
-    "d25": "アップロード",
-    "d26": "商品",
-    "d27": "編集",
-    "d28": "審査失敗原因",
-    "d29": "原因なし",
-    "d30": "を選択します",
-    "d31": "全体",
-    "d32": "朝食",
-    "d33": "ランチ",
-    "d34": "アフタヌーンティー",
-    "d35": "ディナー",
-    "d36": "夜食",
-    "d37": "おすすめ料理を設定するかどうか",
-    "d38": "おすすめ料理を取り消すかどうか",
-    "d39": "料理を削除するかどうか",
-    "d40": "料理を取り外しますか",
-    "d41": "料理を入荷しますか",
-    "d42": "全部料理を削除するかどうか",
-    "d43": "削除成功",
-    "d44": [
-      "審査中",
-      "審査済み",
-      "不合格"
+  'dishes': {
+    'd1': '注文タイプ',
+    'd2': 'デリバリー',
+    'd3': 'テイクアウト',
+    'd4': '店内',
+    'd5': '料理検索',
+    'd6': 'クエリー',
+    'd7': '戻る',
+    'd8': '料理追加',
+    'd9': '全部料理を削除',
+    'd10': '編集番号',
+    'd11': 'メニュータイプ',
+    'd12': '料理名',
+    'd13': '料理金額',
+    'd14': '料理分類',
+    'd15': '料理組み合わせ',
+    'd16': '料理規格',
+    'd17': '数量',
+    'd18': '料理写真',
+    'd19': '料理提供時間',
+    'd20': '審査状況',
+    'd211': '原因表示',
+    'd21': '操作',
+    'd22': 'おすすめ料理を設定するかどうか',
+    'd23': '削除',
+    'd24': '取り下げ',
+    'd25': 'アップロード',
+    'd26': '商品',
+    'd27': '編集',
+    'd28': '審査失敗原因',
+    'd29': '原因なし',
+    'd30': 'を選択します',
+    'd31': '全体',
+    'd32': '朝食',
+    'd33': 'ランチ',
+    'd34': 'アフタヌーンティー',
+    'd35': 'ディナー',
+    'd36': '夜食',
+    'd37': 'おすすめ料理を設定するかどうか',
+    'd38': 'おすすめ料理を取り消すかどうか',
+    'd39': '料理を削除するかどうか',
+    'd40': '料理を取り外しますか',
+    'd41': '料理を入荷しますか',
+    'd42': '全部料理を削除するかどうか',
+    'd43': '削除成功',
+    'd44': [
+      '審査中',
+      '審査済み',
+      '不合格'
     ],
-    "d45": "修正成功"
+    'd45': '修正成功'
   },
-  "menuInfo": {
-    "mi1": "料理名称",
-    "mi2": "料理価格",
-    "mi3": "在庫数",
-    "mi4": "料理写真",
-    "mi5": "料理供給時間",
-    "mi6": "お勧めしますか",
-    "mi7": "スペシャル料理を設定",
-    "mi8": "料理タイプ",
-    "mi9": "料理有効期間",
-    "mi10": "料理分類",
-    "mi11": "料理ラベル",
-    "mi12": "料理税率",
-    "mi13": "料理税率",
-    "mi14": "辛さ",
-    "mi15": "料理組み合わせ",
-    "mi16": "料理規格",
-    "mi17": "属性",
-    "mi18": "単価",
-    "mi19": "料理追加",
-    "mi20": "料理備考",
-    "mi21": "支払方法",
-    "mi22": "選択してください",
-    "mi23": "料理修正",
-    "mi24": "審査提出",
-    "mi25": "支払方法を選んでください",
-    "mi26": "料理有効期限を選んでください",
-    "mi27": "料理",
-    "mi28": "飲み物",
-    "mi29": "テイクアウト",
-    "mi30": "デリバリー",
-    "mi31": "店内",
-    "mi32": "料理名称を入力してください",
-    "mi33": "料理価格を入力してください",
-    "mi34": "在庫数を入力してください",
-    "mi35": "料理供給時間を選んでください",
-    "mi36": "料理タイプを選んでください",
-    "mi37": "人民元／円",
-    "mi38": "ドル",
-    "mi39": "ユーロ",
-    "mi40": "追加成功",
-    "mi41": "設定完了"
+  'menuInfo': {
+    'mi1': '料理名称',
+    'mi2': '料理価格',
+    'mi3': '在庫数',
+    'mi4': '料理写真',
+    'mi5': '料理供給時間',
+    'mi6': 'お勧めしますか',
+    'mi7': 'スペシャル料理を設定',
+    'mi8': '料理タイプ',
+    'mi9': '料理有効期間',
+    'mi10': '料理分類',
+    'mi11': '料理ラベル',
+    'mi12': '料理税率',
+    'mi13': '料理税率',
+    'mi14': '辛さ',
+    'mi15': '料理組み合わせ',
+    'mi16': '料理規格',
+    'mi17': '属性',
+    'mi18': '単価',
+    'mi19': '料理追加',
+    'mi20': '料理備考',
+    'mi21': '支払方法',
+    'mi22': '選択してください',
+    'mi23': '料理修正',
+    'mi24': '審査提出',
+    'mi25': '支払方法を選んでください',
+    'mi26': '料理有効期限を選んでください',
+    'mi27': '料理',
+    'mi28': '飲み物',
+    'mi29': 'テイクアウト',
+    'mi30': 'デリバリー',
+    'mi31': '店内',
+    'mi32': '料理名称を入力してください',
+    'mi33': '料理価格を入力してください',
+    'mi34': '在庫数を入力してください',
+    'mi35': '料理供給時間を選んでください',
+    'mi36': '料理タイプを選んでください',
+    'mi37': '人民元／円',
+    'mi38': 'ドル',
+    'mi39': 'ユーロ',
+    'mi40': '追加成功',
+    'mi41': '設定完了',
+    "mi42": "メニューの種類を入力してください",
+    "mi43": "请输入菜品税率",
+    "mi44": "ピザかどうか",
+    mi45: 'メニュー並べ替え',
+    mi46: " 該当メニュー番号が既にありました。この順番を変更しますか？レストランの最大番号は××まで。",
+    mi47: "ピザタイプ",
+    mi48: "サイズ",
+    mi49: "規格",
+    mi50: 'トッピング-1(無料)',
+    mi51: 'トッピング-2(有料)',
+    mi52: "トッピング-3(固定単価で課金)",
+    mi53: 'ピザタイプを選んでください',
+    mi54: 'トッピング無料個数',
+    mi55: "単価"
+
   },
-  "addHoliday": {
-    "ah1": "レストランを検索",
-    "ah2": "休日日付を設定",
-    "ah3": "開始時間",
-    "ah4": "開始時間",
-    "ah5": "終了時間",
-    "ah6": "終了時間",
-    "ah7": "を選択します",
-    "ah8": "レストランを選んでください",
-    "ah9": "期日を選んでください",
-    "ah10": "開始時間を選んでください",
-    "ah11": "終了時間を選んでください",
-    "ah12": "設定完了",
-    "ah13": "追加成功"
+  'addHoliday': {
+    'ah1': 'レストランを検索',
+    'ah2': '休日日付を設定',
+    'ah3': '開始時間',
+    'ah4': '開始時間',
+    'ah5': '終了時間',
+    'ah6': '終了時間',
+    'ah7': 'を選択します',
+    'ah8': 'レストランを選んでください',
+    'ah9': '期日を選んでください',
+    'ah10': '開始時間を選んでください',
+    'ah11': '終了時間を選んでください',
+    'ah12': '設定完了',
+    'ah13': '追加成功'
   },
-  "holiday": {
-    "h1": "休日設定",
-    "h2": "追加",
-    "h3": "シリアル番号",
-    "h4": "日付",
-    "h5": "開始時間",
-    "h6": "終了時間",
-    "h7": "営業終了レストランの名前",
-    "h8": "操作",
-    "h9": "編集",
-    "h10": "削除",
-    "h11": "休日設定",
-    "h12": "レストラン休日の削除を確認しますか？",
-    "h13": "削除成功"
+  'holiday': {
+    'h1': '休日設定',
+    'h2': '追加',
+    'h3': 'シリアル番号',
+    'h4': '日付',
+    'h5': '開始時間',
+    'h6': '終了時間',
+    'h7': '営業終了レストランの名前',
+    'h8': '操作',
+    'h9': '編集',
+    'h10': '削除',
+    'h11': '休日設定',
+    'h12': 'レストラン休日の削除を確認しますか？',
+    'h13': '削除成功'
   },
-  "person": {
-     p1: '番号',
-      p2: 'お名前',
-      p3: '性別',
-      p4: '電話',
-      p5: 'メールアドレス',
-      p6: '登録時間',
-      p7: '郵便番号',
-      p8: '住所',
-      p9: '国',
-      p10: '操作',
-      p11: '見る',
-      p12: '削除する',
-      p13: 'リストをエクスポート',
-      p14: '正常にエクスポート',
-      p15: '男性',
-      p16: '女性',
-      p17: 'アカウント名'
+  'person': {
+    p1: '番号',
+    p2: 'お名前',
+    p3: '性別',
+    p4: '電話',
+    p5: 'メールアドレス',
+    p6: '登録時間',
+    p7: '郵便番号',
+    p8: '住所',
+    p9: '国',
+    p10: '操作',
+    p11: '見る',
+    p12: '削除する',
+    p13: 'リストをエクスポート',
+    p14: '正常にエクスポート',
+    p15: '男性',
+    p16: '女性',
+    p17: 'アカウント名'
   },
-  "qrcode": {
-    "qc1": "QRコード生成",
-    "qc2": "バッチで選択してダウンロード",
-    "qc3": "シリアル番号",
-    "qc4": "QRコード",
-    "qc5": "テーブル番号",
-    "qc6": "操作",
-    "qc7": "QRコード保存",
-    "qc8": "削除",
-    "qc9": "テーブル番号を記入してください",
-    "qc10": "追加成功",
-    "qc11": "削除成功"
+  'qrcode': {
+    'qc1': 'QRコード生成',
+    'qc2': 'バッチで選択してダウンロード',
+    'qc3': 'シリアル番号',
+    'qc4': 'QRコード',
+    'qc5': 'テーブル番号',
+    'qc6': '操作',
+    'qc7': 'QRコード保存',
+    'qc8': '削除',
+    'qc9': 'テーブル番号を記入してください',
+    'qc10': '追加成功',
+    'qc11': '削除成功'
   },
   ...jaLocale
 }
 
-export default ja;
+export default ja
diff --git a/src/i18n/langs/ko.js b/src/i18n/langs/ko.js
index 3ae9b25573294319f1875fdcf043b87d50a3fe56..a0ae0be1f4bd1fc0ba514c9fcb039d59256c4676 100644
--- a/src/i18n/langs/ko.js
+++ b/src/i18n/langs/ko.js
@@ -1,172 +1,173 @@
 import koLocale from 'element-ui/lib/locale/lang/ko'
 const ko = {
-  "home": {
-    "userInfo": "계정 정보 ",
-    "order": "주문 수량 ",
-    "menu": "메뉴 관리 ",
-    "holiday": "휴일 설정",
-    "registered": [
-      "7일",
-      "14일",
-      "30일",
-      "90일"
+  'home': {
+    'userInfo': '계정 정보 ',
+    'order': '주문 수량 ',
+    'menu': '메뉴 관리 ',
+    'holiday': '휴일 설정',
+    'registered': [
+      '7일',
+      '14일',
+      '30일',
+      '90일'
     ],
-    "registeredTitle": "상가  등록수",
-    "signout": "로그아웃 "
+    'registeredTitle': '상가  등록수',
+    'signout': '로그아웃 '
   },
-  "router": {
-    "home": "홈",
-    "distributor": "배급 업자",
-    "restaurant": "레스토랑  관리",
-    "data": "데이트 관리 ",
-    "editUser": "가입자 편집 ",
-    "addUser": "새 가입자",
-    "editRestaurant": "레스토랑  정보 편집 ",
-    "dishes": "메뉴  리스트 ",
-    "r1": "가입자 정보관리 ",
-    "r2": "주문 관리 ",
-    "r3": "주문 내역 ",
-    "r4": "메뉴 관리 ",
-    "r5": "새 레스토랑  추가 ",
-    "r6": "메뉴 추가 ",
-    "r7": "혜택 종류",
-    "r8": "휴일 설정",
-    "r9": "QR코드  관리 ",
-     r10: '사용자 관리',
-     r11: '사용자 정보'
+  'router': {
+    'home': '홈',
+    'distributor': '배급 업자',
+    'restaurant': '레스토랑  관리',
+    'data': '데이트 관리 ',
+    'editUser': '가입자 편집 ',
+    'addUser': '새 가입자',
+    'editRestaurant': '레스토랑  정보 편집 ',
+    'dishes': '메뉴  리스트 ',
+    'r1': '가입자 정보관리 ',
+    'r2': '주문 관리 ',
+    'r3': '주문 내역 ',
+    'r4': '메뉴 관리 ',
+    'r5': '새 레스토랑  추가 ',
+    'r6': '메뉴 추가 ',
+    'r7': '혜택 종류',
+    'r8': '휴일 설정',
+    'r9': 'QR코드  관리 ',
+    r10: '사용자 관리',
+    r11: '사용자 정보',
+    title: 'Management System'
   },
-  "users": {
-    "u1": "새 가입자",
-    "u2": "그롭계정  리스트 ",
-    "u3": "보통계정  리스트 ",
-    "u4": "번호  ",
-    "u5": "연락처",
-    "u6": "성함",
-    "u7": "레스토랑 이름 ",
-    "u8": "주소 ",
-    "u9": "시 ",
-    "u10": "주 ",
-    "u11": "우편 ",
-    "u12": "국가 ",
-    "u13": "이메일 ",
-    "u14": "조작",
-    "u15": "편집 "
+  'users': {
+    'u1': '새 가입자',
+    'u2': '그롭계정  리스트 ',
+    'u3': '보통계정  리스트 ',
+    'u4': '번호  ',
+    'u5': '연락처',
+    'u6': '성함',
+    'u7': '레스토랑 이름 ',
+    'u8': '주소 ',
+    'u9': '시 ',
+    'u10': '주 ',
+    'u11': '우편 ',
+    'u12': '국가 ',
+    'u13': '이메일 ',
+    'u14': '조작',
+    'u15': '편집 '
   },
-  "editUser": {
-    "eu1": "연락처 ",
-    "eu2": "성함",
-    "eu3": "레스토랑  이름",
-    "eu4": "주소 ",
-    "eu5": "도시:",
-    "eu6": "주",
-    "eu7": "우편 ",
-    "eu8": "국가 : ",
-    "eu9": "이메일 ",
-    "eu10": "확인",
-    "rules": {
-      "r1": "연락처를 입력하세요",
-      "r2": "6 ~ 11 글자만 입력하세요",
-      "r3": "성함을  입력하세요 ",
-      "r4": "이름을  입력하세요",
-      "r5": "자세한 주소를 입력하세요",
-      "r6": "도시 입력하세요 ",
-      "r7": "주 입력하세요 ",
-      "r8": "국가를 입력하세요 ",
-      "r9": "이메일을  선택하세요 ",
-      "r10": "정확한 이메일을  입력하세요 "
+  'editUser': {
+    'eu1': '연락처 ',
+    'eu2': '성함',
+    'eu3': '레스토랑  이름',
+    'eu4': '주소 ',
+    'eu5': '도시:',
+    'eu6': '주',
+    'eu7': '우편 ',
+    'eu8': '국가 : ',
+    'eu9': '이메일 ',
+    'eu10': '확인',
+    'rules': {
+      'r1': '연락처를 입력하세요',
+      'r2': '6 ~ 11 글자만 입력하세요',
+      'r3': '성함을  입력하세요 ',
+      'r4': '이름을  입력하세요',
+      'r5': '자세한 주소를 입력하세요',
+      'r6': '도시 입력하세요 ',
+      'r7': '주 입력하세요 ',
+      'r8': '국가를 입력하세요 ',
+      'r9': '이메일을  선택하세요 ',
+      'r10': '정확한 이메일을  입력하세요 '
     }
   },
-  "addUser": {
-    "au1": "담당자  정보 ",
-    "au2": "레스토랑  정보 ",
-    "au3": "담당자  자세한 정보를  입력하세요 ",
-    "au4": "팁",
-    "au5": "확인",
-    "au6": "취소",
-    "au7": "추가되었습니다 ",
-    "au8": "법인아이디 ",
-    "au9": "비밀번호 ",
-    "au10": "다운로드 ",
-    "au11": "담당자 아이디를 찾을 수는 없습니다 "
+  'addUser': {
+    'au1': '담당자  정보 ',
+    'au2': '레스토랑  정보 ',
+    'au3': '담당자  자세한 정보를  입력하세요 ',
+    'au4': '팁',
+    'au5': '확인',
+    'au6': '취소',
+    'au7': '추가되었습니다 ',
+    'au8': '법인아이디 ',
+    'au9': '비밀번호 ',
+    'au10': '다운로드 ',
+    'au11': '담당자 아이디를 찾을 수는 없습니다 '
   },
-  "restaurantUser": {
-    "ru1": "성",
-    "ru2": "이름",
-    "ru3": "연락처 ",
-    "ru4": "주소 ",
-    "ru5": "도시:",
-    "ru6": "주 ",
-    "ru7": "우편 ",
-    "ru8": "국가 : ",
-    "ru9": "선택하세요",
-    "ru10": "이메일 ",
-    "ru11": "레스토랑  타입:",
-    "ru12": "다음",
-    "rules": {
-      "r1": "연락처를 입력하세요",
-      "r2": "성함을  입력하세요 ",
-      "r3": "이름을  입력하세요",
-      "r4": "자세한 주소를 입력하세요",
-      "r5": "도시 입력하세요 ",
-      "r6": "주 입력하세요 ",
-      "r7": "국가를 입력하세요 ",
-      "r8": "레스토랑 타입을  입력하세요 ",
-      "r9": "이메일을  선택하세요 ",
-      "r10": "정확한 이메일을  입력하세요 ",
-      "r11": "그롭계정 ",
-      "r12": "개인계정",
-      "r13": "일본"
+  'restaurantUser': {
+    'ru1': '성',
+    'ru2': '이름',
+    'ru3': '연락처 ',
+    'ru4': '주소 ',
+    'ru5': '도시:',
+    'ru6': '주 ',
+    'ru7': '우편 ',
+    'ru8': '국가 : ',
+    'ru9': '선택하세요',
+    'ru10': '이메일 ',
+    'ru11': '레스토랑  타입:',
+    'ru12': '다음',
+    'rules': {
+      'r1': '연락처를 입력하세요',
+      'r2': '성함을  입력하세요 ',
+      'r3': '이름을  입력하세요',
+      'r4': '자세한 주소를 입력하세요',
+      'r5': '도시 입력하세요 ',
+      'r6': '주 입력하세요 ',
+      'r7': '국가를 입력하세요 ',
+      'r8': '레스토랑 타입을  입력하세요 ',
+      'r9': '이메일을  선택하세요 ',
+      'r10': '정확한 이메일을  입력하세요 ',
+      'r11': '그롭계정 ',
+      'r12': '개인계정',
+      'r13': '일본'
     }
   },
-  "restaurantInfo": {
-    "ri1": "레스토랑  이름: ",
-    "ri2": "레스토랑  타입:",
-    "ri3": "레스토랑 로고 :",
-    "ri4": "레스토랑  주소 :",
-    "ri5": "국가 : ",
-    "ri6": "선택하세요",
-    "ri7": "주 :",
-    "ri8": "도시:",
-    "ri9": "도로 :",
-    "rin9": "자세한 주소：",
-    "ri10": "레스토랑 전화: ",
-    "ri11": "레스토랑  이메일: ",
-    "ri12": "레스토랑 타입 :",
-    "ri13": "세율: ",
-    "ri14": "팁: ",
-    "ri15": "영업시간: ",
-    "ri16": "추가 ",
-    "ri17": "레스토랑 소개: ",
-    "ri18": "환경 이미지: ",
-    "ri19": "기본언어: ",
-    "ri20": "가능한 언어:",
-    "ri21": "배달가능: ",
-    "ri22": "배달시간: ",
-    "ri23": "시간 시간",
-    "ri24": "끝난시간",
-    "ri25": "배달을 받는 구간: ",
-    "ri26": "배달을 받는 구간 수량:",
-    "ri27": "배달 거리: ",
-    "ri28": "포장 가능: ",
-    "ri29": "레스토랑  경위도: ",
-    "ri30": "경도: ",
-    "ri31": "위도: ",
-    "ri32": "제휴관계: ",
-    "ri33": "수정확인",
-    "ri34": "확인하고  계정를  만듭니다",
-    "ri35": "영업시간 입력하세요",
-    "ri36": "배달시간  선택하세요",
-    "ri37": "이미지가  최대 9장 추가가능합니다",
-    "ri38": "시간타입를 선택하세요",
-    "ri39": "본 시간타입을 이미 선택되었습니다",
-    "ri40": "시간을 입력하세요",
-    "ri41": "정확한 시간을 입력하세요 ",
-    "ri42": "배달  시작한 시간",
-    "ri43": "배달  끝난 시간",
-    "ri44": "배달  주문수",
-    "ri45": "배달 거리범위 ",
-    "ri46": "입력하세요 ",
-    ri47: '인쇄기를 연결하기:', 
+  'restaurantInfo': {
+    'ri1': '레스토랑  이름: ',
+    'ri2': '레스토랑  타입:',
+    'ri3': '레스토랑 로고 :',
+    'ri4': '레스토랑  주소 :',
+    'ri5': '국가 : ',
+    'ri6': '선택하세요',
+    'ri7': '주 :',
+    'ri8': '도시:',
+    'ri9': '도로 :',
+    'rin9': '자세한 주소：',
+    'ri10': '레스토랑 전화: ',
+    'ri11': '레스토랑  이메일: ',
+    'ri12': '레스토랑 타입 :',
+    'ri13': '세율: ',
+    'ri14': '팁: ',
+    'ri15': '영업시간: ',
+    'ri16': '추가 ',
+    'ri17': '레스토랑 소개: ',
+    'ri18': '환경 이미지: ',
+    'ri19': '기본언어: ',
+    'ri20': '가능한 언어:',
+    'ri21': '배달가능: ',
+    'ri22': '배달시간: ',
+    'ri23': '시간 시간',
+    'ri24': '끝난시간',
+    'ri25': '배달을 받는 구간: ',
+    'ri26': '배달을 받는 구간 수량:',
+    'ri27': '배달 거리: ',
+    'ri28': '포장 가능: ',
+    'ri29': '레스토랑  경위도: ',
+    'ri30': '경도: ',
+    'ri31': '위도: ',
+    'ri32': '제휴관계: ',
+    'ri33': '수정확인',
+    'ri34': '확인하고  계정를  만듭니다',
+    'ri35': '영업시간 입력하세요',
+    'ri36': '배달시간  선택하세요',
+    'ri37': '이미지가  최대 9장 추가가능합니다',
+    'ri38': '시간타입를 선택하세요',
+    'ri39': '본 시간타입을 이미 선택되었습니다',
+    'ri40': '시간을 입력하세요',
+    'ri41': '정확한 시간을 입력하세요 ',
+    'ri42': '배달  시작한 시간',
+    'ri43': '배달  끝난 시간',
+    'ri44': '배달  주문수',
+    'ri45': '배달 거리범위 ',
+    'ri46': '입력하세요 ',
+    ri47: '인쇄기를 연결하기:',
     ri48: '인쇄기 설정',
     ri49: '인쇄기 이름',
     ri50: '인쇄기 코드번호',
@@ -174,321 +175,356 @@ const ko = {
     ri52: '계산대 인쇄기',
     ri53: '키친 인쇄기',
     ri54: '인쇄기 이미 설지되었습니다',
-    "rules": {
-      "r1": "레스토랑을  입력하세요",
-      "r2": "레스토랑 타입을  입력하세요 ",
-      "r3": "국가  선택하세요 ",
-      "r4": "도시 선택하세요",
-      "r5": "주  선택하세요",
-      "r6": "자세한 주소를 입력하세요",
-      "r7": "레스토랑 유형을 선택하세요 ",
-      "r8": "레스토랑 연락처를  입력하세요",
-      "r9": "6 ~ 11 글자만 입력하세요",
-      "r10": "기본언어를  선택하세요 ",
-      "r11": "이메일을  선택하세요 ",
-      "r12": "정확한 이메일을  입력하세요 ",
-      "r13": "영업시간을  입력하세요"
+
+    ri55: 'Do you want to use lucky red envelope?',
+    ri56: 'Type of promotion',
+    ri57: 'Support Dine-in or Not',
+    ri58:'Delivery Fee',
+    ri59:'所属时区',
+    ri60:'请选择所属时区',
+
+    'rules': {
+      'r1': '레스토랑을  입력하세요',
+      'r2': '레스토랑 타입을  입력하세요 ',
+      'r3': '국가  선택하세요 ',
+      'r4': '도시 선택하세요',
+      'r5': '주  선택하세요',
+      'r6': '자세한 주소를 입력하세요',
+      'r7': '레스토랑 유형을 선택하세요 ',
+      'r8': '레스토랑 연락처를  입력하세요',
+      'r9': '6 ~ 11 글자만 입력하세요',
+      'r10': '기본언어를  선택하세요 ',
+      'r11': '이메일을  선택하세요 ',
+      'r12': '정확한 이메일을  입력하세요 ',
+      'r13': '영업시간을  입력하세요'
     },
-    "week": {
-      "w1": "월요일",
-      "w2": "화요일",
-      "w3": "수요일",
-      "w4": "목요일",
-      "w5": "금요일",
-      "w6": "토요일",
-      "w7": "일요일"
+    'week': {
+      'w1': '월요일',
+      'w2': '화요일',
+      'w3': '수요일',
+      'w4': '목요일',
+      'w5': '금요일',
+      'w6': '토요일',
+      'w7': '일요일'
     },
-    "time": {
-      "t1": "오전",
-      "t2": "오후",
-      "t3": "밤",
-      "t4": "올 데이"
+    'time': {
+      't1': '오전',
+      't2': '오후',
+      't3': '밤',
+      't4': '올 데이'
     }
   },
-  "header": {
-    "h1": "로그아웃을  합니까? ",
-    "h2": "팁",
-    "h3": "확인",
-    "h4": "취소"
+  'header': {
+    'h1': '로그아웃을  합니까? ',
+    'h2': '팁',
+    'h3': '확인',
+    'h4': '취소'
   },
-  "request": {
-    "r1": "오류를  발생합니다",
-    "r2": "페이지를 찾을수 없습니다"
+  'request': {
+    'r1': '오류를  발생합니다',
+    'r2': '인터넷 연견시간을 초과됩니다',
+    'r3': '인터넷 연견이 안 됩니다, 인터넷 연견을 다시 하세요'
   },
-  "orderList": {
-    "ol1": "주문된 레스토랑이름을  입력하세요",
-    "ol2": "까지",
-    "ol3": "시작일시",
-    "ol4": "끝난일시 ",
-    "ol5": "주문유형",
-    "ol6": "보기",
-    "ol7": "순서 ",
-    "ol8": "시간",
-    "ol9": "유형",
-    "ol10": "주문번호 ",
-    "ol11": "레스토랑 이름 ",
-    "ol12": "소계",
-    "ol13": "총 금액",
-    "ol14": "연락처",
-    "ol15": "주문  상태 ",
-    "ol16": "미 지불",
-    "oln17": "지불됨",
-    "ol17": "제작 중 ",
-    "ol18": "조작",
-    "ol19": "주문내역 조회 ",
-    "ol20": "배달",
-    "ol21": "다인-인 ",
-    "ol22": "포장",
-    "oln22": "테이크아웃 ",
-    "ol23": "체크카드 ",
-    "ol24": "신용카드 ",
-    "ol25": "현금",
-    "ol26": "기타 ",
-    "ol27": "취소되었습니다 ",
-    "o128": "주문 취소"
+  'orderList': {
+    'ol1': '주문된 레스토랑이름을  입력하세요',
+    'ol2': '까지',
+    'ol3': '시작일시',
+    'ol4': '끝난일시 ',
+    'ol5': '주문유형',
+    'ol6': '보기',
+    'ol7': '순서 ',
+    'ol8': '시간',
+    'ol9': '유형',
+    'ol10': '주문번호 ',
+    'ol11': '레스토랑 이름 ',
+    'ol12': '소계',
+    'ol13': '총 금액',
+    'ol14': '연락처',
+    'ol15': '주문  상태 ',
+    'ol16': '미 지불',
+    'oln17': '지불됨',
+    'ol17': '제작 중 ',
+    'ol18': '조작',
+    'ol19': '주문내역 조회 ',
+    'ol20': '배달',
+    'ol21': '다인-인 ',
+    'ol22': '포장',
+    'oln22': '테이크아웃 ',
+    'ol23': '체크카드 ',
+    'ol24': '신용카드 ',
+    'ol25': '현금',
+    'ol26': '기타 ',
+    'ol27': '취소되었습니다 ',
+    'ol28': '取消訂單',
+    ol28: '주문 취소',
+    ol29: '오늘의 주문내역',
+    ol30: '전제 주문',
+    ol31: '완료됨',
+    ol32: '취소됨',
+    ol33: 'View more'
   },
-  "orderDetails": {
-    "od1": "순서 :",
-    "od2": "주문시간 :",
-    "od3": "유형:",
-    "odn3": "픽업시간 :",
-    "od4": "주문번호 :",
-    "od5": "레스토랑  이름: ",
-    "odn5": "데이블 번호 ",
-    "od6": "소계:",
-    "od7": "총 금액:",
-    "od8": "연락처:",
-    "odn8": "연락담당: ",
-    "od9": "이메일:",
-    "od10": "결제 상태:",
-    "od11": "결제 방법::",
-    "od12": "메뉴 번호",
-    "od13": "메뉴 명 ",
-    "od14": "메뉴  가격",
-    "od15": "메뉴  수량",
-    "od16": "배달 주소: ",
-    "ad17": "팁: ",
-    "ad18": "배달원 팁: ",
-    "ad19": "비교: ",
-    "ad20": "음료수:{num}잔  포장박스:{count}개"
+  'orderDetails': {
+    'od1': '순서 :',
+    'od2': '주문시간 :',
+    'od3': '유형:',
+    'odn3': '픽업시간 :',
+    'od4': '주문번호 :',
+    'od5': '레스토랑  이름: ',
+    'odn5': '데이블 번호 ',
+    'od6': '소계:',
+    'od7': '총 금액:',
+    'od8': '연락처:',
+    'odn8': '연락담당: ',
+    'od9': '이메일:',
+    'od10': '결제 상태:',
+    'od11': '결제 방법::',
+    'od12': '메뉴 번호',
+    'od13': '메뉴 명 ',
+    'od14': '메뉴  가격',
+    'od15': '메뉴  수량',
+    'od16': '배달 주소: ',
+    'od17': 'Coupons',
+    'ad17': '팁: ',
+    'ad18': '배달원 팁: ',
+    'ad19': '비교: ',
+    'ad20': '음료수:{num}잔  포장박스:{count}개',
+    'ad21': '세금'
   },
-  "discount": {
-    "dc1": "주문된 레스토랑 이름을 입력하세요",
-    "dc2": "혜택 유형",
-    "dc3": "할인류",
-    "dc4": "뉴 고객",
-    "dc5": "기존 고객",
-    "dc6": "고객 혜택을  입력하세요",
-    "dc7": "이벤트 일시:",
-    "dc8": "까지",
-    "dc9": "시작일시",
-    "dc10": "끝난일시 ",
-    "dc11": "만지엔(일정 금액을 초과하면 할인해 주는 혜택)",
-    "dc12": "가격을 입력하세요",
-    "dc13": "혜택 가격을 입력하세요",
-    "dc14": "만",
-    "dc15": "이벤트 일시:",
-    "dc16": "이벤트 규칙",
-    "dc17": "수정",
-    "dc18": "확인",
-    "dc19": "혜택유형을  추가하세요",
-    "dc20": "할인 이벤트 일시를  선택하세요",
-    "dc21": "만지엔  이벤트  일시를  선택하세요",
-    "dc22": "이벤트 규칙을  입력하세요",
-    "dc23": "수정되었습니다",
-    "dc24": "추가되었습니다 ",
-    "dc25": "이 혜택를 삭제합니까?",
-    "dc26": "팁",
-    "dc27": "확인",
-    "dc28": "취소"
+  'discount': {
+    'dc1': '주문된 레스토랑 이름을 입력하세요',
+    'dc2': '혜택 유형',
+    'dc3': '할인류',
+    'dc4': '뉴 고객',
+    'dc5': '기존 고객',
+    'dc6': '고객 혜택을  입력하세요',
+    'dc7': '이벤트 일시:',
+    'dc8': '까지',
+    'dc9': '시작일시',
+    'dc10': '끝난일시 ',
+    'dc11': '만지엔(일정 금액을 초과하면 할인해 주는 혜택)',
+    'dc12': '가격을 입력하세요',
+    'dc13': '혜택 가격을 입력하세요',
+    'dc14': '만',
+    'dc15': '이벤트 일시:',
+    'dc16': '이벤트 규칙',
+    'dc17': '수정',
+    'dc18': '확인',
+    'dc19': '혜택유형을  추가하세요',
+    'dc20': '할인 이벤트 일시를  선택하세요',
+    'dc21': '만지엔  이벤트  일시를  선택하세요',
+    'dc22': '이벤트 규칙을  입력하세요',
+    'dc23': '수정되었습니다',
+    'dc24': '추가되었습니다 ',
+    'dc25': '이 혜택를 삭제합니까?',
+    'dc26': '팁',
+    'dc27': '확인',
+    'dc28': '취소'
   },
-  "menu": {
-    "m1": "주문된 레스토랑 이름을 입력하세요",
-    "m2": "보기",
-    "m3": "그롭계정  리스트 ",
-    "m4": "보통계정  리스트 ",
-    "mn4": "계정 리스트 ",
-    "m5": "순서 ",
-    "m6": "가계  아이디",
-    "m7": "가계  이름",
-    "m8": "가계 유형",
-    "m9": "레스토랑  유형",
-    "m10": "상태",
-    "m11": "레스토랑 정보",
-    "m12": "아이디: ",
-    "m13": "비밀번호:",
-    "m14": "레스토랑  주소",
-    "m15": "레스토랑  도입",
-    "m16": "메뉴  도입",
-    "m17": "레스토랑정보 도입",
-    "m18": "혜택정보",
-    "m19": "내역조회 ",
-    "m20": "혜택 추가 ",
-    "m21": "상태",
-    "m22": "원인 조회",
-    "m23": "레스토랑  조작 ",
-    "m24": "메뉴  보기",
-    "m25": "편집 ",
-    "m26": "삭제 ",
-    "m27": "분류",
-    "m28": "레스토랑  담당자 이름",
-    "m29": "이메일 ",
-    "m30": "연락처",
-    "m31": "레스토랑  개수 ",
-    "m32": "조작",
-    "m33": "새 레스토랑  추가 ",
-    "m34": "편집 ",
-    "m35": "삭제 ",
-    "m36": "실패한  이유 ",
-    "m37": "잠시 이유가 없습니다!",
-    "m38": "확인",
-    "m39": "이 레스토랑을 삭제합니까? ",
-    "m40": "팁",
-    "m41": "확인",
-    "m42": "취소",
-    "m43": ".xlsx문서만  업로드합니다",
-    "m44": "크기가  5M  초과하면 안 됩니다",
-    "m45": "잠시만,  문서를  한 번만  한 번식  업로드합니다",
-    "m46": "도입되었습니다",
-    "m47": "레스토랑 상태를 수정합니까?",
-    "m48": "삭제되었습니다",
-    "m49": "수정되었습니다",
-    "m50": "이 레스토랑담당자를  삭제합니까? ",
-    "m51": [
-      "휴업중",
-      "영업중",
-      "심의중",
-      "심의 통과하지 않음",
-      "삭제되었습니다"
-    ]
+  'menu': {
+    'm1': '주문된 레스토랑 이름을 입력하세요',
+    'm2': '보기',
+    'm3': '그롭계정  리스트 ',
+    'm4': '보통계정  리스트 ',
+    'mn4': '계정 리스트 ',
+    'm5': '순서 ',
+    'm6': '가계  아이디',
+    'm7': '가계  이름',
+    'm8': '가계 유형',
+    'm9': '레스토랑  유형',
+    'm10': '상태',
+    'm11': '레스토랑 정보',
+    'm12': '아이디: ',
+    'm13': '비밀번호:',
+    'm14': '레스토랑  주소',
+    'm15': '레스토랑  도입',
+    'm16': '메뉴  도입',
+    'm17': '레스토랑정보 도입',
+    'm18': '혜택정보',
+    'm19': '내역조회 ',
+    'm20': '혜택 추가 ',
+    'm21': '상태',
+    'm22': '원인 조회',
+    'm23': '레스토랑  조작 ',
+    'm24': '메뉴  보기',
+    'm25': '편집 ',
+    'm26': '삭제 ',
+    'm27': '분류',
+    'm28': '레스토랑  담당자 이름',
+    'm29': '이메일 ',
+    'm30': '연락처',
+    'm31': '레스토랑  개수 ',
+    'm32': '조작',
+    'm33': '새 레스토랑  추가 ',
+    'm34': '편집 ',
+    'm35': '삭제 ',
+    'm36': '실패한  이유 ',
+    'm37': '잠시 이유가 없습니다!',
+    'm38': '확인',
+    'm39': '이 레스토랑을 삭제합니까? ',
+    'm40': '팁',
+    'm41': '확인',
+    'm42': '취소',
+    'm43': '.xlsx문서만  업로드합니다',
+    'm44': '크기가  5M  초과하면 안 됩니다',
+    'm45': '잠시만,  문서를  한 번만  한 번식  업로드합니다',
+    'm46': '도입되었습니다',
+    'm47': '레스토랑 상태를 수정합니까?',
+    'm48': '삭제되었습니다',
+    'm49': '수정되었습니다',
+    'm50': '이 레스토랑담당자를  삭제합니까? ',
+    'm51': [
+      '휴업중',
+      '영업중',
+      '심의중',
+      '심의 통과하지 않음',
+      '삭제되었습니다'
+    ],
+    m52: '삭제하십니까?'
   },
-  "dishes": {
-    "d1": "주문유형",
-    "d2": "배달",
-    "d3": "포장",
-    "d4": "다인-인 ",
-    "d5": "메뉴 검색",
-    "d6": "보기",
-    "d7": "이 전에 ",
-    "d8": "메뉴 추가 ",
-    "d9": "모든  메뉴를 삭제되었습니다",
-    "d10": "번호  ",
-    "d11": "메뉴  유형 ",
-    "d12": "메뉴 명 ",
-    "d13": "메뉴  가격",
-    "d14": "메뉴  분류",
-    "d15": "메뉴  세트",
-    "d16": "메뉴  규격",
-    "d17": "수량",
-    "d18": "메뉴  이미지 ",
-    "d19": "메뉴  제공시간 ",
-    "d20": "상태",
-    "d211": "원인 조회",
-    "d21": "조작",
-    "d22": "추천메뉴로 설지합니까? ",
-    "d23": "삭제 ",
-    "d24": "내리기",
-    "d25": "올리기",
-    "d26": "상품",
-    "d27": "편집 ",
-    "d28": "실패한  이유 ",
-    "d29": "잠시 이유가 없습니다!",
-    "d30": "확인",
-    "d31": "전제",
-    "d32": "블랙퍼스트",
-    "d33": "점심",
-    "d34": "애프터눈 티",
-    "d35": "저녁",
-    "d36": "야식",
-    "d37": "추천메뉴로 설지합니까? ",
-    "d38": "추천메뉴를 취소합니까?",
-    "d39": "삭제됩니까? ",
-    "d40": "이 메뉴를 내립니까?",
-    "d41": "이 메뉴를 올립니까?",
-    "d42": "모든 메뉴를 삭제됩니까? ",
-    "d43": "삭제되었습니다",
-    "d44": [
-      "심의중",
-      "통과되었습니다",
-      "통과하지 않습니다"
+  'dishes': {
+    'd1': '주문유형',
+    'd2': '배달',
+    'd3': '포장',
+    'd4': '다인-인 ',
+    'd5': '메뉴 검색',
+    'd6': '보기',
+    'd7': '이 전에 ',
+    'd8': '메뉴 추가 ',
+    'd9': '모든  메뉴를 삭제되었습니다',
+    'd10': '번호  ',
+    'd11': '메뉴  유형 ',
+    'd12': '메뉴 명 ',
+    'd13': '메뉴  가격',
+    'd14': '메뉴  분류',
+    'd15': '메뉴  세트',
+    'd16': '메뉴  규격',
+    'd17': '수량',
+    'd18': '메뉴  이미지 ',
+    'd19': '메뉴  제공시간 ',
+    'd20': '상태',
+    'd211': '원인 조회',
+    'd21': '조작',
+    'd22': '추천메뉴로 설지합니까? ',
+    'd23': '삭제 ',
+    'd24': '내리기',
+    'd25': '올리기',
+    'd26': '상품',
+    'd27': '편집 ',
+    'd28': '실패한  이유 ',
+    'd29': '잠시 이유가 없습니다!',
+    'd30': '확인',
+    'd31': '전제',
+    'd32': '블랙퍼스트',
+    'd33': '점심',
+    'd34': '애프터눈 티',
+    'd35': '저녁',
+    'd36': '야식',
+    'd37': '추천메뉴로 설지합니까? ',
+    'd38': '추천메뉴를 취소합니까?',
+    'd39': '삭제됩니까? ',
+    'd40': '이 메뉴를 내립니까?',
+    'd41': '이 메뉴를 올립니까?',
+    'd42': '모든 메뉴를 삭제됩니까? ',
+    'd43': '삭제되었습니다',
+    'd44': [
+      '심의중',
+      '통과되었습니다',
+      '통과하지 않습니다'
     ],
-    "d45": "수정되었습니다!"
+    'd45': '수정되었습니다!'
   },
-  "menuInfo": {
-    "mi1": "메뉴명:",
-    "mi2": "메뉴가격:",
-    "mi3": "재고 수량:",
-    "mi4": "메뉴 이미지: ",
-    "mi5": "메뉴  제공시간: ",
-    "mi6": "추천합니까? ",
-    "mi7": "시그니처메뉴로 설정:",
-    "mi8": "메뉴종류: ",
-    "mi9": "메뉴 유효기간: ",
-    "mi10": "메뉴  분류:",
-    "mi11": "메뉴 태크: ",
-    "mi12": "메뉴 세율: ",
-    "mi13": "메뉴 세율",
-    "mi14": "매운  정도: ",
-    "mi15": "메뉴  세트:",
-    "mi16": "메뉴  규격:",
-    "mi17": "속성",
-    "mi18": "단가",
-    "mi19": "메뉴를 추가: ",
-    "mi20": "메뉴 비교: ",
-    "mi21": "구매 방법:",
-    "mi22": "선택하세요",
-    "mi23": "메뉴를  수정",
-    "mi24": "리뷰하기",
-    "mi25": "구매 방법을 선택하세요",
-    "mi26": "메뉴 유효기간을  선택하세요",
-    "mi27": "메뉴",
-    "mi28": "음료",
-    "mi29": "포장",
-    "mi30": "배달",
-    "mi31": "다인-인 ",
-    "mi32": "메뉴명을 입력하세요",
-    "mi33": "메뉴가격을 입력하세요",
-    "mi34": "재고 수량을 입력하세요",
-    "mi35": "제공한 시간을 선택하세요",
-    "mi36": "메뉴 종류를 선택하세요 ",
-    "mi37": "위안(元) / 엔",
-    "mi38": "달러 ",
-    "mi39": "유로 ",
-    "mi40": "추가되었습니다 ",
-    "mi41": "편집되었습니다"
+  'menuInfo': {
+    'mi1': '메뉴명',
+    'mi2': '메뉴가격',
+    'mi3': '재고 수량',
+    'mi4': '메뉴 이미지',
+    'mi5': '메뉴  제공시간',
+    'mi6': '추천합니까? ',
+    'mi7': '시그니처메뉴로 설정',
+    'mi8': '메뉴종류',
+    'mi9': '메뉴 유효기간',
+    'mi10': '메뉴  분류',
+    'mi11': '메뉴 태크',
+    'mi12': '메뉴 세율',
+    'mi13': '메뉴 세율',
+    'mi14': '매운  정도',
+    'mi15': '메뉴  세트',
+    'mi16': '메뉴  규격',
+    'mi17': '속성',
+    'mi18': '단가',
+    'mi19': '메뉴를 추가',
+    'mi20': '메뉴 비교',
+    'mi21': '구매 방법',
+    'mi22': '선택하세요',
+    'mi23': '메뉴를  수정',
+    'mi24': '리뷰하기',
+    'mi25': '구매 방법을 선택하세요',
+    'mi26': '메뉴 유효기간을  선택하세요',
+    'mi27': '메뉴',
+    'mi28': '음료',
+    'mi29': '포장',
+    'mi30': '배달',
+    'mi31': '다인-인 ',
+    'mi32': '메뉴명을 입력하세요',
+    'mi33': '메뉴가격을 입력하세요',
+    'mi34': '재고 수량을 입력하세요',
+    'mi35': '제공한 시간을 선택하세요',
+    'mi36': '메뉴 종류를 선택하세요 ',
+    'mi37': '위안(元) / 엔',
+    'mi38': '달러 ',
+    'mi39': '유로 ',
+    'mi40': '추가되었습니다 ',
+    'mi41': '편집되었습니다',
+    mi42: '메뉴 종류를 입력하세요',
+    mi43: '메뉴 세율을 입력하세요',
+    mi44: '피자인지 확임',
+    mi45: '메뉴 순위',
+    mi46: "해당 순위에 메뉴가 있습니다.  새 메뉴로 바꿉니까? 본 음식점이 최대 메뉴순위는 ：",
+
+    mi47: "피자  종류",
+    mi48: '사이즈',
+    mi49: "피자 선택",
+    mi50: '토핑-1（무료）',
+    mi51: '토핑-2（유료）',
+    mi52: "토핑-3（정한 단가로 ）",
+    mi53: '피자 종류 선택하세요',
+    mi54: '토핑 무료 수량',
+    mi55: "단가"
+
+
   },
-  "addHoliday": {
-    "ah1": "레스토랑  검색하기",
-    "ah2": "휴일 설정:",
-    "ah3": "시간 시간:",
-    "ah4": "시간 시간",
-    "ah5": "끝난 시간:",
-    "ah6": "끝난시간",
-    "ah7": "확인",
-    "ah8": "레스토랑을 선택하세요",
-    "ah9": "일시를 선택하세요",
-    "ah10": "시작시간을 선택하세요 ",
-    "ah11": "끝난시간을 선택하세요",
-    "ah12": "편집되었습니다",
-    "ah13": "추가되었습니다 "
+  'addHoliday': {
+    'ah1': '레스토랑  검색하기',
+    'ah2': '휴일 설정:',
+    'ah3': '시간 시간:',
+    'ah4': '시간 시간',
+    'ah5': '끝난 시간:',
+    'ah6': '끝난시간',
+    'ah7': '확인',
+    'ah8': '레스토랑을 선택하세요',
+    'ah9': '일시를 선택하세요',
+    'ah10': '시작시간을 선택하세요 ',
+    'ah11': '끝난시간을 선택하세요',
+    'ah12': '편집되었습니다',
+    'ah13': '추가되었습니다 '
   },
-  "holiday": {
-    "h1": "휴일 설정",
-    "h2": "추가",
-    "h3": "순서 ",
-    "h4": "일시",
-    "h5": "시작시간",
-    "h6": "끝난시간",
-    "h7": "레스토랑 이름 ",
-    "h8": "조작",
-    "h9": "편집 ",
-    "h10": "삭제 ",
-    "h11": "휴일 설정",
-    "h12": "설정된 휴일을 삭제합니까?",
-    "h13": "삭제되었습니다"
+  'holiday': {
+    'h1': '휴일 설정',
+    'h2': '추가',
+    'h3': '순서 ',
+    'h4': '일시',
+    'h5': '시작시간',
+    'h6': '끝난시간',
+    'h7': '레스토랑 이름 ',
+    'h8': '조작',
+    'h9': '편집 ',
+    'h10': '삭제 ',
+    'h11': '휴일 설정',
+    'h12': '설정된 휴일을 삭제합니까?',
+    'h13': '삭제되었습니다'
   },
-  "person": {
-     p1: '번호',
+  'person': {
+    p1: '번호',
     p2: '이름',
     p3: '성별',
     p4: '전화',
@@ -506,20 +542,20 @@ const ko = {
     p16: '여자',
     p17: '아이디'
   },
-  "qrcode": {
-    "qc1": "QR코드  만들기",
-    "qc2": "대량으로 다운로드",
-    "qc3": "순서 ",
-    "qc4": "QR코드 ",
-    "qc5": "데이블 번호 ",
-    "qc6": "조작",
-    "qc7": "QR코드  저장합니다 ",
-    "qc8": "삭제 ",
-    "qc9": "데이블 번호를  입력하세요",
-    "qc10": "추가되었습니다 ",
-    "qc11": "삭제되었습니다"
+  'qrcode': {
+    'qc1': 'QR코드  만들기',
+    'qc2': '대량으로 다운로드',
+    'qc3': '순서 ',
+    'qc4': 'QR코드 ',
+    'qc5': '데이블 번호 ',
+    'qc6': '조작',
+    'qc7': 'QR코드  저장합니다 ',
+    'qc8': '삭제 ',
+    'qc9': '데이블 번호를  입력하세요',
+    'qc10': '추가되었습니다 ',
+    'qc11': '삭제되었습니다'
   },
   ...koLocale
 }
 
-export default ko;
\ No newline at end of file
+export default ko
diff --git a/src/i18n/langs/zh-TW.js b/src/i18n/langs/zh-TW.js
index dd0f714b7db4e308b2f2ffa178d5d4998f1e5835..19d21d375bd8939230926d372f612c7469b48457 100644
--- a/src/i18n/langs/zh-TW.js
+++ b/src/i18n/langs/zh-TW.js
@@ -1,171 +1,172 @@
 import ztLocale from 'element-ui/lib/locale/lang/zh-TW'
 const zhTW = {
-  "home": {
-    "userInfo": "用戶信息",
-    "order": "訂單數",
-    "menu": "菜單管理",
-    "holiday": "假期設置",
-    "registered": [
-      "7天",
-      "14天",
-      "30天",
-      "90天"
+  'home': {
+    'userInfo': '用戶信息',
+    'order': '訂單數',
+    'menu': '菜單管理',
+    'holiday': '假期設置',
+    'registered': [
+      '7天',
+      '14天',
+      '30天',
+      '90天'
     ],
-    "registeredTitle": "商家註冊量",
-    "signout": "退出登錄"
+    'registeredTitle': '商家註冊量',
+    'signout': '退出登錄'
   },
-  "router": {
-    "home": "首頁",
-    "distributor": "分銷商",
-    "restaurant": "餐廳管理",
-    "data": "數據管理",
-    "editUser": "編輯用戶",
-    "addUser": "新增用戶",
-    "editRestaurant": "編輯餐廳信息",
-    "dishes": "菜品列表",
-    "r1": "用戶信息管理",
-    "r2": "訂單管理",
-    "r3": "訂單詳情",
-    "r4": "菜單管理",
-    "r5": "添加餐廳",
-    "r6": "添加菜品",
-    "r7": "優惠類型",
-    "r8": "假期設置",
-    "r9": "二維碼管理",
+  'router': {
+    'home': '首頁',
+    'distributor': '分銷商',
+    'restaurant': '餐廳管理',
+    'data': '數據管理',
+    'editUser': '編輯用戶',
+    'addUser': '新增用戶',
+    'editRestaurant': '編輯餐廳信息',
+    'dishes': '菜品列表',
+    'r1': '用戶信息管理',
+    'r2': '訂單管理',
+    'r3': '訂單詳情',
+    'r4': '菜單管理',
+    'r5': '添加餐廳',
+    'r6': '添加菜品',
+    'r7': '優惠類型',
+    'r8': '假期設置',
+    'r9': '二維碼管理',
     r10: '用戶管理',
-    r11: '用戶詳情'
+    r11: '用戶詳情',
+    title: 'Management System'
   },
-  "users": {
-    "u1": "新增用戶",
-    "u2": "集團賬號列表",
-    "u3": "普通賬號列表",
-    "u4": "編號",
-    "u5": "電話",
-    "u6": "姓氏",
-    "u7": "名稱",
-    "u8": "地址",
-    "u9": "城市",
-    "u10": "州",
-    "u11": "郵編",
-    "u12": "國家",
-    "u13": "郵箱",
-    "u14": "操作",
-    "u15": "編輯"
+  'users': {
+    'u1': '新增用戶',
+    'u2': '集團賬號列表',
+    'u3': '普通賬號列表',
+    'u4': '編號',
+    'u5': '電話',
+    'u6': '姓氏',
+    'u7': '名稱',
+    'u8': '地址',
+    'u9': '城市',
+    'u10': '州',
+    'u11': '郵編',
+    'u12': '國家',
+    'u13': '郵箱',
+    'u14': '操作',
+    'u15': '編輯'
   },
-  "editUser": {
-    "eu1": "電話：",
-    "eu2": "姓氏：",
-    "eu3": "名稱：",
-    "eu4": "地址：",
-    "eu5": "城市：",
-    "eu6": "州：",
-    "eu7": "郵編：",
-    "eu8": "國家：",
-    "eu9": "郵箱：",
-    "eu10": "確定",
-    "rules": {
-      "r1": "請輸入聯繫方式",
-      "r2": "長度在 6 到 11 個字符",
-      "r3": "請輸入姓氏",
-      "r4": "請輸入名稱",
-      "r5": "請輸入詳細地址",
-      "r6": "請輸入所在城市",
-      "r7": "請輸入所在州/省",
-      "r8": "請輸入所在國家",
-      "r9": "請輸入郵箱",
-      "r10": "請輸入正確的郵箱"
+  'editUser': {
+    'eu1': '電話：',
+    'eu2': '姓氏：',
+    'eu3': '名稱：',
+    'eu4': '地址：',
+    'eu5': '城市：',
+    'eu6': '州：',
+    'eu7': '郵編：',
+    'eu8': '國家：',
+    'eu9': '郵箱：',
+    'eu10': '確定',
+    'rules': {
+      'r1': '請輸入聯繫方式',
+      'r2': '長度在 6 到 11 個字符',
+      'r3': '請輸入姓氏',
+      'r4': '請輸入名稱',
+      'r5': '請輸入詳細地址',
+      'r6': '請輸入所在城市',
+      'r7': '請輸入所在州/省',
+      'r8': '請輸入所在國家',
+      'r9': '請輸入郵箱',
+      'r10': '請輸入正確的郵箱'
     }
   },
-  "addUser": {
-    "au1": "餐廳負責人信息",
-    "au2": "餐廳信息",
-    "au3": "請完善負責人信息!",
-    "au4": "提示",
-    "au5": "確定",
-    "au6": "取消",
-    "au7": "添加成功",
-    "au8": "餐廳賬號",
-    "au9": "餐廳密碼",
-    "au10": "下載",
-    "au11": "負責人id不存在"
+  'addUser': {
+    'au1': '餐廳負責人信息',
+    'au2': '餐廳信息',
+    'au3': '請完善負責人信息!',
+    'au4': '提示',
+    'au5': '確定',
+    'au6': '取消',
+    'au7': '添加成功',
+    'au8': '餐廳賬號',
+    'au9': '餐廳密碼',
+    'au10': '下載',
+    'au11': '負責人id不存在'
   },
-  "restaurantUser": {
-    "ru1": "負責人姓氏：",
-    "ru2": "負責人名字：",
-    "ru3": "負責人電話：",
-    "ru4": "負責人地址：",
-    "ru5": "城市：",
-    "ru6": "州/省：",
-    "ru7": "郵編：",
-    "ru8": "國家：",
-    "ru9": "請選擇",
-    "ru10": "郵箱：",
-    "ru11": "餐廳類型：",
-    "ru12": "下一步",
-    "rules": {
-      "r1": "請輸入聯繫方式",
-      "r2": "請輸入姓氏",
-      "r3": "請輸入名稱",
-      "r4": "請輸入詳細地址",
-      "r5": "請輸入所在城市",
-      "r6": "請輸入所在州/省",
-      "r7": "請輸入所在國家",
-      "r8": "請選擇餐廳類型",
-      "r9": "請輸入郵箱",
-      "r10": "請輸入正確的郵箱",
-      "r11": "集團賬號",
-      "r12": "個人餐廳賬號",
-      "r13": "日本"
+  'restaurantUser': {
+    'ru1': '負責人姓氏：',
+    'ru2': '負責人名字：',
+    'ru3': '負責人電話：',
+    'ru4': '負責人地址：',
+    'ru5': '城市：',
+    'ru6': '州/省：',
+    'ru7': '郵編：',
+    'ru8': '國家：',
+    'ru9': '請選擇',
+    'ru10': '郵箱：',
+    'ru11': '餐廳類型：',
+    'ru12': '下一步',
+    'rules': {
+      'r1': '請輸入聯繫方式',
+      'r2': '請輸入姓氏',
+      'r3': '請輸入名稱',
+      'r4': '請輸入詳細地址',
+      'r5': '請輸入所在城市',
+      'r6': '請輸入所在州/省',
+      'r7': '請輸入所在國家',
+      'r8': '請選擇餐廳類型',
+      'r9': '請輸入郵箱',
+      'r10': '請輸入正確的郵箱',
+      'r11': '集團賬號',
+      'r12': '個人餐廳賬號',
+      'r13': '日本'
     }
   },
-  "restaurantInfo": {
-    "ri1": "餐廳名字：",
-    "ri2": "餐廳類型：",
-    "ri3": "餐廳logo：",
-    "ri4": "餐廳詳細地址：",
-    "ri5": "國家：",
-    "ri6": "請選擇",
-    "ri7": "省份：",
-    "ri8": "城市：",
-    "ri9": "街道：",
-    "rin9": "詳細地址：",
-    "ri10": "餐廳電話：",
-    "ri11": "餐廳郵箱：",
-    "ri12": "餐廳行業：",
-    "ri13": "稅率：",
-    "ri14": "小費：",
-    "ri15": "餐廳營業時間：",
-    "ri16": "增加",
-    "ri17": "餐廳介紹描述：",
-    "ri18": "餐廳環境圖片：",
-    "ri19": "餐廳基礎語言：",
-    "ri20": "支持國家化語言：",
-    "ri21": "是否支持外賣：",
-    "ri22": "支持外賣時間：",
-    "ri23": "起始時間",
-    "ri24": "結束時間",
-    "ri25": "外賣接單區間：",
-    "ri26": "外賣接單區間數量：",
-    "ri27": "餐廳外送範圍：",
-    "ri28": "是否支持自取：",
-    "ri29": "餐廳經緯度：",
-    "ri30": "經度",
-    "ri31": "緯度",
-    "ri32": "是否是合作餐廳：",
-    "ri33": "確定修改",
-    "ri34": "確定並生成賬號",
-    "ri35": "請添加營業時間",
-    "ri36": "請選擇外賣時間",
-    "ri37": "最多課添加9張圖片",
-    "ri38": "請選擇時間類型",
-    "ri39": "該時間類型已選擇",
-    "ri40": "請輸入時間",
-    "ri41": "請輸入正確的時間格式",
-    "ri42": "外賣開始時間",
-    "ri43": "外賣結束時間",
-    "ri44": "接單數量",
-    "ri45": "餐廳外送範圍",
-    "ri46": "請輸入",
+  'restaurantInfo': {
+    'ri1': '餐廳名字：',
+    'ri2': '餐廳類型：',
+    'ri3': '餐廳logo：',
+    'ri4': '餐廳詳細地址：',
+    'ri5': '國家：',
+    'ri6': '請選擇',
+    'ri7': '省份：',
+    'ri8': '城市：',
+    'ri9': '街道：',
+    'rin9': '詳細地址：',
+    'ri10': '餐廳電話：',
+    'ri11': '餐廳郵箱：',
+    'ri12': '餐廳行業：',
+    'ri13': '稅率：',
+    'ri14': '小費：',
+    'ri15': '餐廳營業時間：',
+    'ri16': '增加',
+    'ri17': '餐廳介紹描述：',
+    'ri18': '餐廳環境圖片：',
+    'ri19': '餐廳基礎語言：',
+    'ri20': '支持國家化語言：',
+    'ri21': '是否支持外賣：',
+    'ri22': '支持外賣時間：',
+    'ri23': '起始時間',
+    'ri24': '結束時間',
+    'ri25': '外賣接單區間：',
+    'ri26': '外賣接單區間數量：',
+    'ri27': '餐廳外送範圍：',
+    'ri28': '是否支持自取：',
+    'ri29': '餐廳經緯度：',
+    'ri30': '經度',
+    'ri31': '緯度',
+    'ri32': '是否是合作餐廳：',
+    'ri33': '確定修改',
+    'ri34': '確定並生成賬號',
+    'ri35': '請添加營業時間',
+    'ri36': '請選擇外賣時間',
+    'ri37': '最多課添加9張圖片',
+    'ri38': '請選擇時間類型',
+    'ri39': '該時間類型已選擇',
+    'ri40': '請輸入時間',
+    'ri41': '請輸入正確的時間格式',
+    'ri42': '外賣開始時間',
+    'ri43': '外賣結束時間',
+    'ri44': '接單數量',
+    'ri45': '餐廳外送範圍',
+    'ri46': '請輸入',
     ri47: '是否支持打印機:',
     ri48: '綁定打印機',
     ri49: '打印機名稱',
@@ -174,320 +175,353 @@ const zhTW = {
     ri52: '前臺打印機',
     ri53: '後廚打印機',
     ri54: '打印機已存在',
-    "rules": {
-      "r1": "請輸入餐廳名稱",
-      "r2": "請輸入餐廳類型",
-      "r3": "請選擇國家",
-      "r4": "請輸入城市",
-      "r5": "請輸入省份",
-      "r6": "請輸入詳細地址",
-      "r7": "請輸入店鋪行業",
-      "r8": "請輸入餐廳電話",
-      "r9": "長度在 6 到 11 個字符",
-      "r10": "請選擇基礎語言",
-      "r11": "請輸入郵箱",
-      "r12": "請輸入正確的郵箱",
-      "r13": "請輸入營業時間"
+
+    ri55: '是否参与红包活动:',
+    ri56: '活动类型:',
+    ri57: 'Support Dine-in or Not',
+
+    ri58:'外賣費',
+    ri59:'所屬時區',
+    ri60:'請選擇所屬時區',
+    
+    'rules': {
+      'r1': '請輸入餐廳名稱',
+      'r2': '請輸入餐廳類型',
+      'r3': '請選擇國家',
+      'r4': '請輸入城市',
+      'r5': '請輸入省份',
+      'r6': '請輸入詳細地址',
+      'r7': '請輸入店鋪行業',
+      'r8': '請輸入餐廳電話',
+      'r9': '長度在 6 到 11 個字符',
+      'r10': '請選擇基礎語言',
+      'r11': '請輸入郵箱',
+      'r12': '請輸入正確的郵箱',
+      'r13': '請輸入營業時間'
     },
-    "week": {
-      "w1": "星期一",
-      "w2": "星期二",
-      "w3": "星期三",
-      "w4": "星期四",
-      "w5": "星期五",
-      "w6": "星期六",
-      "w7": "星期日"
+    'week': {
+      'w1': '星期一',
+      'w2': '星期二',
+      'w3': '星期三',
+      'w4': '星期四',
+      'w5': '星期五',
+      'w6': '星期六',
+      'w7': '星期日'
     },
-    "time": {
-      "t1": "上午",
-      "t2": "下午",
-      "t3": "晚上",
-      "t4": "全天"
+    'time': {
+      't1': '上午',
+      't2': '下午',
+      't3': '晚上',
+      't4': '全天'
     }
   },
-  "header": {
-    "h1": "確定退出登錄嗎？",
-    "h2": "提示",
-    "h3": "確定",
-    "h4": "取消"
+  'header': {
+    'h1': '確定退出登錄嗎？',
+    'h2': '提示',
+    'h3': '確定',
+    'h4': '取消'
   },
-  "request": {
-    "r1": "請求時出錯",
-    "r2": "服務器錯誤"
+  'request': {
+    'r1': '請求時出錯',
+    'r2': '網絡超時，請刷新重試',
+    'r3': '網絡異常，請檢查您的網絡'
   },
-  "orderList": {
-    "ol1": "請輸入查看訂單的餐廳名稱",
-    "ol2": "至",
-    "ol3": "開始日期",
-    "ol4": "結束日期",
-    "ol5": "訂單類型",
-    "ol6": "查 詢",
-    "ol7": "序號",
-    "ol8": "時間",
-    "ol9": "類型",
-    "ol10": "訂單編號",
-    "ol11": "餐廳名稱",
-    "ol12": "小計",
-    "ol13": "總價",
-    "ol14": "電話",
-    "ol15": "訂單狀態",
-    "ol16": "未支付",
-    "oln17": "已支付",
-    "ol17": "製作中",
-    "ol18": "操作",
-    "ol19": "查看訂單詳情",
-    "ol20": "外賣",
-    "ol21": "堂食",
-    "ol22": "自取",
-    "oln22": "打包",
-    "ol23": "儲蓄卡",
-    "ol24": "信用卡",
-    "ol25": "現金",
-    "ol26": "其他",
-    "ol27": "已取消",
-    "o128": "取消訂單"
+  'orderList': {
+    'ol1': '請輸入查看訂單的餐廳名稱',
+    'ol2': '至',
+    'ol3': '開始日期',
+    'ol4': '結束日期',
+    'ol5': '訂單類型',
+    'ol6': '查 詢',
+    'ol7': '序號',
+    'ol8': '時間',
+    'ol9': '類型',
+    'ol10': '訂單編號',
+    'ol11': '餐廳名稱',
+    'ol12': '小計',
+    'ol13': '總價',
+    'ol14': '電話',
+    'ol15': '訂單狀態',
+    'ol16': '未支付',
+    'oln17': '已支付',
+    'ol17': '製作中',
+    'ol18': '操作',
+    'ol19': '查看訂單詳情',
+    'ol20': '外賣',
+    'ol21': '堂食',
+    'ol22': '自取',
+    'oln22': '打包',
+    'ol23': '儲蓄卡',
+    'ol24': '信用卡',
+    'ol25': '現金',
+    'ol26': '其他',
+    'ol27': '已取消',
+    'ol28': '取消訂單',
+    "ol28": "取消訂單",
+    "ol29 ": "今日訂單",
+    "ol30": "全部訂單",
+    "ol31": "完成訂單",
+    "ol32": "刪除訂單",
+    ol33: '查看菜品選項'
   },
-  "orderDetails": {
-    "od1": "序號：",
-    "od2": "下單時間：",
-    "od3": "類型：",
-    "odn3": "取餐時間：",
-    "od4": "訂單編號：",
-    "od5": "餐廳名字：",
-    "odn5": "桌號",
-    "od6": "小計：",
-    "od7": "總價：",
-    "od8": "聯繫電話：",
-    "odn8": "聯繫人：",
-    "od9": "聯繫郵箱：",
-    "od10": "付款狀態：",
-    "od11": "付款方式：",
-    "od12": "菜名編號",
-    "od13": "菜名名稱",
-    "od14": "菜名價格",
-    "od15": "菜名數量",
-    "od16": "外賣地址：",
-    "ad17": "小費：",
-    "ad18": "快遞員小費：",
-    "ad19": "備註",
-    "ad20": "飲料:{num}杯 打包盒:{count}個"
+  'orderDetails': {
+    'od1': '序號：',
+    'od2': '下單時間：',
+    'od3': '類型：',
+    'odn3': '取餐時間：',
+    'od4': '訂單編號：',
+    'od5': '餐廳名字：',
+    'odn5': '桌號：',
+    'od6': '小計：',
+    'od7': '總價：',
+    'od8': '聯繫電話：',
+    'odn8': '聯繫人：',
+    'od9': '聯繫郵箱：',
+    'od10': '付款狀態：',
+    'od11': '付款方式：',
+    'od12': '菜名編號',
+    'od13': '菜名名稱',
+    'od14': '菜名價格',
+    'od15': '菜名數量',
+    'od16': '外賣地址：',
+    'ad17': '小費：',
+    'ad18': '快遞員小費：',
+    'ad19': '備註',
+    'ad20': '飲料:{num}杯 打包盒:{count}個',
+    'ad21': '稅費'
   },
-  "discount": {
-    "dc1": "請輸入查看訂單的餐廳名字",
-    "dc2": "優惠類型：",
-    "dc3": "折扣類",
-    "dc4": "新客戶：",
-    "dc5": "老客戶：",
-    "dc6": "請輸入用戶折扣",
-    "dc7": "活動日期：",
-    "dc8": "至",
-    "dc9": "開始日期",
-    "dc10": "結束日期",
-    "dc11": "滿減類",
-    "dc12": "請輸入價格",
-    "dc13": "請輸入優惠價格",
-    "dc14": "滿",
-    "dc15": "活動日期：",
-    "dc16": "活動規則",
-    "dc17": "修 改",
-    "dc18": "確 定",
-    "dc19": "請添加優惠類型",
-    "dc20": "請選擇折扣的活動日期",
-    "dc21": "請選擇滿減的活動日期",
-    "dc22": "請輸入活動規則",
-    "dc23": "修改成功",
-    "dc24": "添加成功",
-    "dc25": "確定刪除該條優惠嗎？",
-    "dc26": "提示",
-    "dc27": "確定",
-    "dc28": "取消"
+  'discount': {
+    'dc1': '請輸入查看訂單的餐廳名字',
+    'dc2': '優惠類型：',
+    'dc3': '折扣類',
+    'dc4': '新客戶：',
+    'dc5': '老客戶：',
+    'dc6': '請輸入用戶折扣',
+    'dc7': '活動日期：',
+    'dc8': '至',
+    'dc9': '開始日期',
+    'dc10': '結束日期',
+    'dc11': '滿減類',
+    'dc12': '請輸入價格',
+    'dc13': '請輸入優惠價格',
+    'dc14': '滿',
+    'dc15': '活動日期：',
+    'dc16': '活動規則',
+    'dc17': '修 改',
+    'dc18': '確 定',
+    'dc19': '請添加優惠類型',
+    'dc20': '請選擇折扣的活動日期',
+    'dc21': '請選擇滿減的活動日期',
+    'dc22': '請輸入活動規則',
+    'dc23': '修改成功',
+    'dc24': '添加成功',
+    'dc25': '確定刪除該條優惠嗎？',
+    'dc26': '提示',
+    'dc27': '確定',
+    'dc28': '取消'
   },
-  "menu": {
-    "m1": "請輸入查看訂單的餐廳名字",
-    "m2": "查 詢",
-    "m3": "集團賬號列表",
-    "m4": "普通賬號列表",
-    "mn4": "賬號列表",
-    "m5": "序號",
-    "m6": "店鋪ID",
-    "m7": "店鋪名稱",
-    "m8": "店鋪行業",
-    "m9": "餐廳類型",
-    "m10": "上線狀態",
-    "m11": "餐廳賬號密碼",
-    "m12": "賬號：",
-    "m13": "密碼：",
-    "m14": "店鋪地址",
-    "m15": "餐廳導入",
-    "m16": "導入菜單",
-    "m17": "導入餐廳信息",
-    "m18": "優惠信息",
-    "m19": "查看詳情",
-    "m20": "添加優惠",
-    "m21": "審核狀態",
-    "m22": "查看原因",
-    "m23": "餐廳操作",
-    "m24": "查看菜單",
-    "m25": "編輯",
-    "m26": "刪除",
-    "m27": "類別",
-    "m28": "餐廳負責人姓名",
-    "m29": "郵箱",
-    "m30": "電話",
-    "m31": "餐廳數量",
-    "m32": "操作",
-    "m33": "添加餐廳",
-    "m34": "編輯",
-    "m35": "刪除",
-    "m36": "審核失敗原因",
-    "m37": "暫無原因！",
-    "m38": "確 定",
-    "m39": "確定刪除該餐廳嗎？",
-    "m40": "提示",
-    "m41": "確定",
-    "m42": "取消",
-    "m43": "只能上傳後綴是.xlsx的文件",
-    "m44": "文件大小不得超過5M",
-    "m45": "請稍候,一次只能上傳一個一個文件",
-    "m46": "導入成功",
-    "m47": "確定修改餐廳狀態嗎？",
-    "m48": "刪除成功",
-    "m49": "修改成功",
-    "m50": "確定刪除該餐廳負責人嗎？",
-    "m51": [
-      "休息中",
-      "營業中",
-      "審核中",
-      "審核未通過",
-      "已刪除"
-    ]
+  'menu': {
+    'm1': '請輸入查看訂單的餐廳名字',
+    'm2': '查 詢',
+    'm3': '集團賬號列表',
+    'm4': '普通賬號列表',
+    'mn4': '賬號列表',
+    'm5': '序號',
+    'm6': '店鋪ID',
+    'm7': '店鋪名稱',
+    'm8': '店鋪行業',
+    'm9': '餐廳類型',
+    'm10': '上線狀態',
+    'm11': '餐廳賬號密碼',
+    'm12': '賬號：',
+    'm13': '密碼：',
+    'm14': '店鋪地址',
+    'm15': '餐廳導入',
+    'm16': '導入菜單',
+    'm17': '導入餐廳信息',
+    'm18': '優惠信息',
+    'm19': '查看詳情',
+    'm20': '添加優惠',
+    'm21': '審核狀態',
+    'm22': '查看原因',
+    'm23': '餐廳操作',
+    'm24': '查看菜單',
+    'm25': '編輯',
+    'm26': '刪除',
+    'm27': '類別',
+    'm28': '餐廳負責人姓名',
+    'm29': '郵箱',
+    'm30': '電話',
+    'm31': '餐廳數量',
+    'm32': '操作',
+    'm33': '添加餐廳',
+    'm34': '編輯',
+    'm35': '刪除',
+    'm36': '審核失敗原因',
+    'm37': '暫無原因！',
+    'm38': '確 定',
+    'm39': '確定刪除該餐廳嗎？',
+    'm40': '提示',
+    'm41': '確定',
+    'm42': '取消',
+    'm43': '只能上傳後綴是.xlsx的文件',
+    'm44': '文件大小不得超過5M',
+    'm45': '請稍候,一次只能上傳一個一個文件',
+    'm46': '導入成功',
+    'm47': '確定修改餐廳狀態嗎？',
+    'm48': '刪除成功',
+    'm49': '修改成功',
+    'm50': '確定刪除該餐廳負責人嗎？',
+    'm51': [
+      '休息中',
+      '營業中',
+      '審核中',
+      '審核未通過',
+      '已刪除'
+    ],
+    m52: '確定要進行刪除嗎？'
   },
-  "dishes": {
-    "d1": "訂單類型",
-    "d2": "外賣",
-    "d3": "自取",
-    "d4": "堂食",
-    "d5": "搜索菜品",
-    "d6": "查 詢",
-    "d7": "返回",
-    "d8": "添加菜品",
-    "d9": "刪除全部菜品",
-    "d10": "編號",
-    "d11": "菜單類型",
-    "d12": "菜品名稱",
-    "d13": "菜品價格",
-    "d14": "菜品分類",
-    "d15": "菜品搭配",
-    "d16": "菜品規格",
-    "d17": "數量",
-    "d18": "菜品圖片",
-    "d19": "菜品供應時間",
-    "d20": "審核狀態",
-    "d211": "查看原因",
-    "d21": "操作",
-    "d22": "是否設置為推薦菜",
-    "d23": "刪除",
-    "d24": "下架",
-    "d25": "上架",
-    "d26": "商品",
-    "d27": "編輯",
-    "d28": "審核失敗原因",
-    "d29": "暫無原因！",
-    "d30": "確 定",
-    "d31": "全體",
-    "d32": "早餐",
-    "d33": "午餐",
-    "d34": "下午茶",
-    "d35": "晚餐",
-    "d36": "夜宵",
-    "d37": "是否設置為推薦菜？",
-    "d38": "是否取消推薦菜？",
-    "d39": "是否刪除菜品？",
-    "d40": "是否下架菜品？",
-    "d41": "是否上架菜品？",
-    "d42": "是否刪除全部菜品？",
-    "d43": "刪除成功",
-    "d44": [
-      "審核中",
-      "已審核",
-      "未通過"
+  'dishes': {
+    'd1': '訂單類型',
+    'd2': '外賣',
+    'd3': '自取',
+    'd4': '堂食',
+    'd5': '搜索菜品',
+    'd6': '查 詢',
+    'd7': '返回',
+    'd8': '添加菜品',
+    'd9': '刪除全部菜品',
+    'd10': '編號',
+    'd11': '菜單類型',
+    'd12': '菜品名稱',
+    'd13': '菜品價格',
+    'd14': '菜品分類',
+    'd15': '菜品搭配',
+    'd16': '菜品規格',
+    'd17': '數量',
+    'd18': '菜品圖片',
+    'd19': '菜品供應時間',
+    'd20': '審核狀態',
+    'd211': '查看原因',
+    'd21': '操作',
+    'd22': '是否設置為推薦菜',
+    'd23': '刪除',
+    'd24': '下架',
+    'd25': '上架',
+    'd26': '商品',
+    'd27': '編輯',
+    'd28': '審核失敗原因',
+    'd29': '暫無原因！',
+    'd30': '確 定',
+    'd31': '全體',
+    'd32': '早餐',
+    'd33': '午餐',
+    'd34': '下午茶',
+    'd35': '晚餐',
+    'd36': '夜宵',
+    'd37': '是否設置為推薦菜？',
+    'd38': '是否取消推薦菜？',
+    'd39': '是否刪除菜品？',
+    'd40': '是否下架菜品？',
+    'd41': '是否上架菜品？',
+    'd42': '是否刪除全部菜品？',
+    'd43': '刪除成功',
+    'd44': [
+      '審核中',
+      '已審核',
+      '未通過'
     ],
-    "d45": "修改成功!"
+    'd45': '修改成功!'
   },
-  "menuInfo": {
-    "mi1": "菜品名稱:",
-    "mi2": "菜品價格:",
-    "mi3": "庫存數量:",
-    "mi4": "菜品圖片:",
-    "mi5": "菜品供應時間:",
-    "mi6": "是否推薦:",
-    "mi7": "設置為招牌菜:",
-    "mi8": "菜品類別:",
-    "mi9": "菜品有效日期:",
-    "mi10": "菜品分類:",
-    "mi11": "菜品標籤:",
-    "mi12": "菜品稅率:",
-    "mi13": "菜品稅率",
-    "mi14": "辣度:",
-    "mi15": "菜品搭配:",
-    "mi16": "菜品規格:",
-    "mi17": "屬性",
-    "mi18": "單價",
-    "mi19": "加菜:",
-    "mi20": "菜品備註:",
-    "mi21": "購買方式:",
-    "mi22": "請選擇",
-    "mi23": "修改菜品",
-    "mi24": "提交審核",
-    "mi25": "請選擇購買方式",
-    "mi26": "請選擇菜品有效日期",
-    "mi27": "菜品",
-    "mi28": "飲品",
-    "mi29": "自取",
-    "mi30": "外賣",
-    "mi31": "堂食",
-    "mi32": "請輸入菜品名稱",
-    "mi33": "請輸入菜品價格",
-    "mi34": "請輸入庫存數量",
-    "mi35": "請選擇菜品供應時間",
-    "mi36": "請選擇菜品類別",
-    "mi37": "人民幣/日元",
-    "mi38": "美元",
-    "mi39": "歐元",
-    "mi40": "添加成功",
-    "mi41": "編輯成功"
+  'menuInfo': {
+    'mi1': '菜品名稱',
+    'mi2': '菜品價格',
+    'mi3': '庫存數量',
+    'mi4': '菜品圖片',
+    'mi5': '菜品供應時間',
+    'mi6': '是否推薦',
+    'mi7': '設置為招牌菜',
+    'mi8': '菜品類別',
+    'mi9': '菜品有效日期',
+    'mi10': '菜品分類',
+    'mi11': '菜品標籤',
+    'mi12': '菜品稅率',
+    'mi13': '菜品稅率',
+    'mi14': '辣度',
+    'mi15': '菜品搭配',
+    'mi16': '菜品規格',
+    'mi17': '屬性',
+    'mi18': '單價',
+    'mi19': '加菜',
+    'mi20': '菜品備註',
+    'mi21': '購買方式',
+    'mi22': '請選擇',
+    'mi23': '修改菜品',
+    'mi24': '提交審核',
+    'mi25': '請選擇購買方式',
+    'mi26': '請選擇菜品有效日期',
+    'mi27': '菜品',
+    'mi28': '飲品',
+    'mi29': '自取',
+    'mi30': '外賣',
+    'mi31': '堂食',
+    'mi32': '請輸入菜品名稱',
+    'mi33': '請輸入菜品價格',
+    'mi34': '請輸入庫存數量',
+    'mi35': '請選擇菜品供應時間',
+    'mi36': '請選擇菜品類別',
+    'mi37': '人民幣/日元',
+    'mi38': '美元',
+    'mi39': '歐元',
+    'mi40': '添加成功',
+    'mi41': '編輯成功',
+    "mi42": "請輸入菜品分類",
+    "mi43": "請輸入菜品稅率",
+    "mi44": "是否為披薩",
+    mi45: '菜品排序',
+    mi46: "當前排序已有菜品，是否需要替換該菜品排序？當前餐廳最大排序號為：",
+    mi47: "披薩類型",
+    mi48: '尺寸',
+    mi49: "規格",
+    mi50: '配料-1（免費）',
+    mi51: '配料-2（收費）',
+    mi52: "配料-3（以固定單價收費）",
+    mi53: '請選擇披薩類型',
+    mi54: '配料免費個數',
+    mi55: "單價"
+
   },
-  "addHoliday": {
-    "ah1": "搜索餐廳",
-    "ah2": "設置假期日期：",
-    "ah3": "開始時間：",
-    "ah4": "起始時間",
-    "ah5": "結束時間：",
-    "ah6": "結束時間",
-    "ah7": "確 定",
-    "ah8": "請選擇餐廳",
-    "ah9": "請選擇日期",
-    "ah10": "請選擇開始時間",
-    "ah11": "請選擇結束時間",
-    "ah12": "編輯成功",
-    "ah13": "添加成功"
+  'addHoliday': {
+    'ah1': '搜索餐廳',
+    'ah2': '設置假期日期：',
+    'ah3': '開始時間：',
+    'ah4': '起始時間',
+    'ah5': '結束時間：',
+    'ah6': '結束時間',
+    'ah7': '確 定',
+    'ah8': '請選擇餐廳',
+    'ah9': '請選擇日期',
+    'ah10': '請選擇開始時間',
+    'ah11': '請選擇結束時間',
+    'ah12': '編輯成功',
+    'ah13': '添加成功'
   },
-  "holiday": {
-    "h1": "假期設置",
-    "h2": "添加",
-    "h3": "序號",
-    "h4": "日期",
-    "h5": "開始時間",
-    "h6": "結束時間",
-    "h7": "結束餐廳名字",
-    "h8": "操作",
-    "h9": "編輯",
-    "h10": "刪除",
-    "h11": "編輯假期",
-    "h12": "確定刪除該餐廳假期？",
-    "h13": "刪除成功"
+  'holiday': {
+    'h1': '假期設置',
+    'h2': '添加',
+    'h3': '序號',
+    'h4': '日期',
+    'h5': '開始時間',
+    'h6': '結束時間',
+    'h7': '結束餐廳名字',
+    'h8': '操作',
+    'h9': '編輯',
+    'h10': '刪除',
+    'h11': '編輯假期',
+    'h12': '確定刪除該餐廳假期？',
+    'h13': '刪除成功'
   },
-  "person": {
+  'person': {
     p1: '編號',
     p2: '姓名',
     p3: '性別',
@@ -506,19 +540,19 @@ const zhTW = {
     p16: '女',
     p17: '賬號'
   },
-  "qrcode": {
-    "qc1": "生成二維碼",
-    "qc2": "批量下載",
-    "qc3": "序號",
-    "qc4": "二維碼",
-    "qc5": "桌號",
-    "qc6": "操作",
-    "qc7": "保存二維碼",
-    "qc8": "刪除",
-    "qc9": "請填寫桌號",
-    "qc10": "添加成功",
-    "qc11": "刪除成功"
+  'qrcode': {
+    'qc1': '生成二維碼',
+    'qc2': '批量下載',
+    'qc3': '序號',
+    'qc4': '二維碼',
+    'qc5': '桌號',
+    'qc6': '操作',
+    'qc7': '保存二維碼',
+    'qc8': '刪除',
+    'qc9': '請填寫桌號',
+    'qc10': '添加成功',
+    'qc11': '刪除成功'
   },
   ...ztLocale
 }
-export default zhTW;
\ No newline at end of file
+export default zhTW
diff --git a/src/i18n/langs/zh.js b/src/i18n/langs/zh.js
index 899a169065f34215f06593291f71fc107e98574b..f1e744576a9a3c7a3d16f5ccf4dbc111c6c71f8a 100644
--- a/src/i18n/langs/zh.js
+++ b/src/i18n/langs/zh.js
@@ -28,7 +28,8 @@ const zh = {
     r8: '假期设置',
     r9: '二维码管理',
     r10: '用户管理',
-    r11: '用户详情'
+    r11: '用户详情',
+    title:'管理后台'
   },
   users: {
     u1: '新增用户',
@@ -45,7 +46,7 @@ const zh = {
     u12: '国家',
     u13: '邮箱',
     u14: '操作',
-    u15: '编辑',
+    u15: '编辑'
   },
   editUser: {
     eu1: '电话：',
@@ -172,6 +173,14 @@ const zh = {
     ri53: '后厨打印机',
     ri54: '打印机已存在',
 
+    ri55: '是否参与红包活动:',
+    ri56: '活动类型:',
+    ri57: '是否支持堂食：',
+    ri58: '外卖费',
+   
+    ri59:'所属时区',
+    ri60:'请选择所属时区',
+
     rules: {
       r1: '请输入餐厅名称',
       r2: '请输入餐厅类型',
@@ -211,7 +220,8 @@ const zh = {
   },
   request: {
     r1: '请求时出错',
-    r2: '服务器错误',
+    r2: '网络超时，请刷新重试',
+    r3: '网络异常，请检查您的网络',
   },
   orderList: {
     ol1: '请输入查看订单的餐厅名称',
@@ -243,7 +253,13 @@ const zh = {
     ol25: '现金',
     ol26: '其他',
     ol27: '已取消',
-    o128: "取消订单"
+    ol28: '取消订单',
+    ol29: '今日订单',
+    ol30: '全部订单',
+    ol31: '完成订单',
+    ol32: '删除订单',
+    ol33: '查看菜品选项',
+    ol34: '刷卡支付'
   },
   orderDetails: {
     od1: '序号：',
@@ -252,7 +268,7 @@ const zh = {
     odn3: '取餐时间：',
     od4: '订单编号：',
     od5: '餐厅名字：',
-    odn5: '桌号',
+    odn5: '桌号：',
     od6: '小计：',
     od7: '总价：',
     od8: '联系电话：',
@@ -265,10 +281,12 @@ const zh = {
     od14: '菜名价格',
     od15: '菜名数量',
     od16: '外卖地址：',
+    od17: '优惠券:',
     ad17: '小费：',
     ad18: '快递员小费：',
     ad19: '备注',
-    ad20: '饮料:{num}杯 打包盒:{count}个'
+    ad20: '饮料:{num}杯 打包盒:{count}个',
+    ad21: '税费：'
   },
   discount: {
     dc1: '请输入查看订单的餐厅名字',
@@ -353,6 +371,7 @@ const zh = {
     m49: '修改成功',
     m50: '确定删除该餐厅负责人吗？',
     m51: ['休息中', '营业中', '审核中', '审核未通过', '已删除'],
+    m52: '确定要进行删除吗?'
   },
   dishes: {
     d1: '订单类型',
@@ -386,7 +405,7 @@ const zh = {
     d28: '审核失败原因',
     d29: '暂无原因！',
     d30: '确 定',
-    d31: '全体',
+    d31: '全天',
     d32: '早餐',
     d33: '午餐',
     d34: '下午茶',
@@ -405,27 +424,27 @@ const zh = {
     d45: '修改成功!'
   },
   menuInfo: {
-    mi1: '菜品名称:',
-    mi2: '菜品价格:',
-    mi3: '库存数量:',
-    mi4: '菜品图片:',
-    mi5: '菜品供应时间:',
-    mi6: '是否推荐:',
-    mi7: '设置为招牌菜:',
-    mi8: '菜品类别:',
-    mi9: '菜品有效日期:',
-    mi10: '菜品分类:',
-    mi11: '菜品标签:',
-    mi12: '菜品税率:',
+    mi1: '菜品名称',
+    mi2: '菜品价格',
+    mi3: '库存数量',
+    mi4: '菜品图片',
+    mi5: '菜品供应时间',
+    mi6: '是否推荐',
+    mi7: '设置为招牌菜',
+    mi8: '菜品类别',
+    mi9: '菜品有效日期',
+    mi10: '菜品分类',
+    mi11: '菜品标签',
+    mi12: '菜品税率',
     mi13: '菜品税率',
-    mi14: '辣度:',
-    mi15: '菜品搭配:',
-    mi16: '菜品规格:',
+    mi14: '辣度',
+    mi15: '菜品搭配',
+    mi16: '菜品规格',
     mi17: '属性',
     mi18: '单价',
-    mi19: '加菜:',
-    mi20: '菜品备注:',
-    mi21: '购买方式:',
+    mi19: '加菜',
+    mi20: '菜品备注',
+    mi21: '购买方式',
     mi22: '请选择',
     mi23: '修改菜品',
     mi24: '提交审核',
@@ -447,7 +466,23 @@ const zh = {
     mi40: '添加成功',
     mi41: '编辑成功',
     mi42: '请输入菜品分类',
-    mi43: '请输入菜品税率'
+    mi43: '请输入菜品税率',
+    mi44: '是否为披萨',
+
+    mi45:'菜品排序',
+    mi46:'当前排序已有菜品，是否需要替换该菜品排序？当前餐厅最大排序号为：',
+
+    //披萨相关新增
+    mi47:"披萨类型",
+    mi48:'尺寸',
+    mi49:"规格",
+    mi50:'配料-1（免费）',
+    mi51:'配料-2（收费）',
+    mi52:"配料-3（以固定单价收费）",
+    mi53:'请选择披萨类型',
+    mi54:'配料免费个数',
+    mi55:"单价"
+
   },
   addHoliday: {
     ah1: '搜索餐厅',
@@ -514,4 +549,4 @@ const zh = {
   ...zhLocale
 }
 
-export default zh;
+export default zh
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 78159c8e6437a1957388b1954fe365694e629502..04e58cd2337b87a31f8d295fd4ed77ebac9fb7c1 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -75,15 +75,15 @@ export default {
         { label: '한국어', value: 'ko' },
         { label: '简体中文', value: 'zh' },
         { label: '繁体中文', value: 'zhTW' },
-        { label: 'Deutsch', value: 'de' },
-        { label: 'русский', value: 'ru' },
-        { label: 'Français', value: 'fr' },
+        // { label: 'Deutsch', value: 'de' },
+        // { label: 'русский', value: 'ru' },
+        // { label: 'Français', value: 'fr' },
         { label: 'Español', value: 'es' }
       ],
       msgCount: null
     }
   },
-  created () {
+  mounted () {
     let lang = localStorage.getItem('lang');
     if (!lang) {
       lang = navigator.language.slice(0, 2) || 'zh'
diff --git a/src/utils/fetch.js b/src/utils/fetch.js
index 1831df9d1c14d0c9d054c1764394481899df038d..e8aac9360baa17e9b59f98ba70c4a74e363ea3d7 100644
--- a/src/utils/fetch.js
+++ b/src/utils/fetch.js
@@ -1,20 +1,25 @@
 import axios from 'axios'
 import {Message} from 'element-ui'
 // export const apiPath = 'https://web-api.mr-menu.com';//'https://dev-mr-menu.mr-menu.com'; https://web-api.mr-menu.com
-export const apiPath = 'https://test-mr-menu.mr-menu.com/';//'https://dev-mr-menu.mr-menu.com'; https://web-api.mr-menu.com//'http://10.214.20.126:8087/'
-// export const apiPath = 'http://10.214.20.126:8087';
+ export const apiPath = 'https://test-mr-menu.mr-menu.com/';//'https://dev-mr-menu.mr-menu.com'; https://web-api.mr-menu.com//'http://10.214.20.126:8087/'
+// export const apiPath = 'http://10.214.20.126:8088';
 import Vue from 'vue'
 import i18n from './../i18n/i18n'
 let _vm =  new Vue({i18n});
 
+let baseLang = localStorage.getItem('lang');
+let userLang = localStorage.getItem('lang')
+
 const service = axios.create({
   baseURL: apiPath,
-  timeout: 50000
+  timeout: 61000
 });
 
 
 service.interceptors.request.use(
   config => {
+    config.headers['userLanguage'] = userLang;
+    config.headers['baseLanguage'] = baseLang;
     return config;
   },
   error => {
@@ -38,14 +43,18 @@ export default function request (options = {}) {
     service(options)
       .then(response => {
         let {code, message, data, flexiPageDto} = response.data;
-        if (code == 200) {
-          resolve({data, flexiPageDto});
+        if (code == 200 || response.status == 200) {
+          if(response.status == 200) {
+            resolve(response.data);
+          } else {
+            resolve({data, flexiPageDto});
+          }
         } else {
           if (message) {
             let text = message || _vm.$t('request.r1');
             Message.error(text);
           } else {
-            Message.error(_vm.$t('request.r2'));
+            Message.error(_vm.$t('request.r3'));
           }
           reject(new Error(_vm.$t('request.r1')));
         }
diff --git a/src/utils/request.js b/src/utils/request.js
index 2fb95ac0fa781dd3c17f30b41b13dcd4dffbf2e9..9684ac9220d6b32b4a938da374a8170a5d1423cf 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,13 +3,23 @@ import { MessageBox, Message } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 
+
+// export const apisUrl = 'https://test-api.mr-menu.com'
+
+export function apisUrl() {
+  let a = 'https://api.mr-menu.com';
+  // let a = 'https://test-api.mr-menu.com';
+  return a
+}
 // create an axios instance
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
+  // baseURL: ''
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 5000 // request timeout
 })
 
+
 // request interceptor
 service.interceptors.request.use(
   config => {
@@ -19,7 +29,7 @@ service.interceptors.request.use(
       // let each request carry token
       // ['X-Token'] is a custom headers key
       // please modify it according to the actual situation
-      config.headers['X-Token'] = getToken()
+      config.headers['X-Token'] = getToken();
     }
     return config
   },
diff --git a/src/utils/timeZone.js b/src/utils/timeZone.js
new file mode 100644
index 0000000000000000000000000000000000000000..c75d4e8ca4ab07d6e2deb6aa4393d49e8728b97b
--- /dev/null
+++ b/src/utils/timeZone.js
@@ -0,0 +1,37 @@
+export const countryData = [
+    {
+        name: "US",
+        value: 'en',
+        timeZone: [{ "zoneName": "America/Adak", "gmtOffset": -36000, "gmtOffsetName": "UTC-10:00", "abbreviation": "HST", "tzName": "Hawaiiu2013Aleutian Standard Time" }, { "zoneName": "America/Anchorage", "gmtOffset": -32400, "gmtOffsetName": "UTC-09:00", "abbreviation": "AKST", "tzName": "Alaska Standard Time" }, { "zoneName": "America/Boise", "gmtOffset": -25200, "gmtOffsetName": "UTC-07:00", "abbreviation": "MST", "tzName": "Mountain Standard Time (North America" }, { "zoneName": "America/Chicago", "gmtOffset": -21600, "gmtOffsetName": "UTC-06:00", "abbreviation": "CST", "tzName": "Central Standard Time (North America" }, { "zoneName": "America/Denver", "gmtOffset": -25200, "gmtOffsetName": "UTC-07:00", "abbreviation": "MST", "tzName": "Mountain Standard Time (North America" }, { "zoneName": "America/Detroit", "gmtOffset": -18000, "gmtOffsetName": "UTC-05:00", "abbreviation": "EST", "tzName": "Eastern Standard Time (North America" }, { "zoneName": "America/Indiana/Indianapolis", "gmtOffset": -18000, "gmtOffsetName": "UTC-05:00", "abbreviation": "EST", "tzName": "Eastern Standard Time (North America" }, { "zoneName": "America/Indiana/Knox", "gmtOffset": -21600, "gmtOffsetName": "UTC-06:00", "abbreviation": "CST", "tzName": "Central Standard Time (North America" }, { "zoneName": "America/Indiana/Marengo", "gmtOffset": -18000, "gmtOffsetName": "UTC-05:00", "abbreviation": "EST", "tzName": "Eastern Standard Time (North America" }, { "zoneName": "America/Indiana/Petersburg", "gmtOffset": -18000, "gmtOffsetName": "UTC-05:00", "abbreviation": "EST", "tzName": "Eastern Standard Time (North America" }, { "zoneName": "America/Indiana/Tell_City", "gmtOffset": -21600, "gmtOffsetName": "UTC-06:00", "abbreviation": "CST", "tzName": "Central Standard Time (North America" }, { "zoneName": "America/Indiana/Vevay", "gmtOffset": -18000, "gmtOffsetName": "UTC-05:00", "abbreviation": "EST", "tzName": "Eastern Standard Time (North America" }, { "zoneName": "America/Indiana/Vincennes", "gmtOffset": -18000, "gmtOffsetName": "UTC-05:00", "abbreviation": "EST", "tzName": "Eastern Standard Time (North America" }, { "zoneName": "America/Indiana/Winamac", "gmtOffset": -18000, "gmtOffsetName": "UTC-05:00", "abbreviation": "EST", "tzName": "Eastern Standard Time (North America" }, { "zoneName": "America/Juneau", "gmtOffset": -32400, "gmtOffsetName": "UTC-09:00", "abbreviation": "AKST", "tzName": "Alaska Standard Time" }, { "zoneName": "America/Kentucky/Louisville", "gmtOffset": -18000, "gmtOffsetName": "UTC-05:00", "abbreviation": "EST", "tzName": "Eastern Standard Time (North America" }, { "zoneName": "America/Kentucky/Monticello", "gmtOffset": -18000, "gmtOffsetName": "UTC-05:00", "abbreviation": "EST", "tzName": "Eastern Standard Time (North America" }, { "zoneName": "America/Los_Angeles", "gmtOffset": -28800, "gmtOffsetName": "UTC-08:00", "abbreviation": "PST", "tzName": "Pacific Standard Time (North America" }, { "zoneName": "America/Menominee", "gmtOffset": -21600, "gmtOffsetName": "UTC-06:00", "abbreviation": "CST", "tzName": "Central Standard Time (North America" }, { "zoneName": "America/Metlakatla", "gmtOffset": -32400, "gmtOffsetName": "UTC-09:00", "abbreviation": "AKST", "tzName": "Alaska Standard Time" }, { "zoneName": "America/New_York", "gmtOffset": -18000, "gmtOffsetName": "UTC-05:00", "abbreviation": "EST", "tzName": "Eastern Standard Time (North America" }, { "zoneName": "America/Nome", "gmtOffset": -32400, "gmtOffsetName": "UTC-09:00", "abbreviation": "AKST", "tzName": "Alaska Standard Time" }, { "zoneName": "America/North_Dakota/Beulah", "gmtOffset": -21600, "gmtOffsetName": "UTC-06:00", "abbreviation": "CST", "tzName": "Central Standard Time (North America" }, { "zoneName": "America/North_Dakota/Center", "gmtOffset": -21600, "gmtOffsetName": "UTC-06:00", "abbreviation": "CST", "tzName": "Central Standard Time (North America" }, { "zoneName": "America/North_Dakota/New_Salem", "gmtOffset": -21600, "gmtOffsetName": "UTC-06:00", "abbreviation": "CST", "tzName": "Central Standard Time (North America" }, { "zoneName": "America/Phoenix", "gmtOffset": -25200, "gmtOffsetName": "UTC-07:00", "abbreviation": "MST", "tzName": "Mountain Standard Time (North America" }, { "zoneName": "America/Sitka", "gmtOffset": -32400, "gmtOffsetName": "UTC-09:00", "abbreviation": "AKST", "tzName": "Alaska Standard Time" }, { "zoneName": "America/Yakutat", "gmtOffset": -32400, "gmtOffsetName": "UTC-09:00", "abbreviation": "AKST", "tzName": "Alaska Standard Time" }, { "zoneName": "Pacific/Honolulu", "gmtOffset": -36000, "gmtOffsetName": "UTC-10:00", "abbreviation": "HST", "tzName": "Hawaiiu2013Aleutian Standard Time" }]
+    },
+    {
+        name: "日本",
+        value: 'ja',
+        timeZone: [{ "zoneName": "Asia/Tokyo", "gmtOffset": 32400, "gmtOffsetName": "UTC+09:00", "abbreviation": "JST", "tzName": "Japan Standard Time" }],
+    },
+    {
+        name: "대한민국",
+        value: 'ko',
+        timeZone: [{ "zoneName": "Asia/Seoul", "gmtOffset": 32400, "gmtOffsetName": "UTC+09:00", "abbreviation": "KST", "tzName": "Korea Standard Time" }]
+    },
+    {
+        name: "中國台灣",
+        value: 'zh-TW',
+        timeZone: [{ "zoneName": "Asia/Taipei", "gmtOffset": 28800, "gmtOffsetName": "UTC+08:00", "abbreviation": "CST", "tzName": "China Standard Time" }]
+    },
+    {
+        name: "Deutschland",
+        value: 'de',
+        timeZone: [{ "zoneName": "Europe/Berlin", "gmtOffset": 3600, "gmtOffsetName": "UTC+01:00", "abbreviation": "CET", "tzName": "Central European Time" }, { "zoneName": "Europe/Busingen", "gmtOffset": 3600, "gmtOffsetName": "UTC+01:00", "abbreviation": "CET", "tzName": "Central European Time" }]
+    },
+    {
+        name: "España",
+        value: 'es',
+        timeZone: [{ "zoneName": "Africa/Ceuta", "gmtOffset": 3600, "gmtOffsetName": "UTC+01:00", "abbreviation": "CET", "tzName": "Central European Time" }, { "zoneName": "Atlantic/Canary", "gmtOffset": 0, "gmtOffsetName": "UTCu00b100", "abbreviation": "WET", "tzName": "Western European Time" }, { "zoneName": "Europe/Madrid", "gmtOffset": 3600, "gmtOffsetName": "UTC+01:00", "abbreviation": "CET", "tzName": "Central European Time" }]
+    },
+    {
+        name: "中国",
+        value: 'zh',
+        timeZone: [{ "zoneName": "Asia/Shanghai", "gmtOffset": 28800, "gmtOffsetName": "UTC+08:00", "abbreviation": "CST", "tzName": "China Standard Time" }, { "zoneName": "Asia/Urumqi", "gmtOffset": 21600, "gmtOffsetName": "UTC+06:00", "abbreviation": "XJT", "tzName": "China Standard Time" }]
+    }
+]
\ No newline at end of file
diff --git a/src/views/distribution/menu/createRestaurant.vue b/src/views/distribution/menu/createRestaurant.vue
index 4c222e11b58c937da2f219d7b3c5788fb31e2786..35948e1f68bb0500a56e17d18c95bad3f01db1b9 100644
--- a/src/views/distribution/menu/createRestaurant.vue
+++ b/src/views/distribution/menu/createRestaurant.vue
@@ -8,6 +8,9 @@
 import restaurantInfo from '@/components/createdUser/restaurantInfo'
 import {addMenuRestaurant, updateRestaurant} from '@/api/distribution'
 import {mapGetters} from 'vuex'
+import Cookies from 'js-cookie'
+import axios from 'axios'
+import {apisUrl} from '../../../utils/request.js'
 export default {
   components: {
     restaurantInfo
@@ -32,6 +35,7 @@ export default {
     onSubmit (data) {
       data.salesMethodWm = Number(data.salesMethodWm);
       data.salesMethodZq = Number(data.salesMethodZq);
+	  data.salesMethodTs = Number(data.salesMethodTs)
       if (this.itemData) {
         this.updateRestaurant(data);
       } else {
@@ -39,9 +43,32 @@ export default {
       }
     },
     async updateRestaurant (data) {
+      let base = localStorage.getItem('lang');
+      let userLang = localStorage.getItem('lang')
       try {
         this.loading = true;
         let result = await updateRestaurant(data);
+        if(result) {
+          let idsList = [data.activeRuler];
+          idsList.push()
+          let parmas = {
+            productCode: 10025,
+            activityIds: idsList,
+            storeId: data.restaurantId,
+            userId: Cookies.get('userId'),
+          };
+		  axios({
+			  headers: {'userLanguage': userLang,'baseLanguage': base},
+			  url: apisUrl() + '/coupon/activity/store/save',
+			  method: 'post',
+			  data: parmas
+		  })
+          .then(res => {
+            if(res.data.code == 0) {
+              
+            }
+          })
+        }
         this.loading = false;
         this.$message.success(this.$t('discount.dc23'));
         this.$router.go(-1);
@@ -60,7 +87,7 @@ export default {
         }
         this.loading = true;
         let result = await addMenuRestaurant({
-          baseLang: 'en',	
+          baseLang: 'en',
           language: localStorage.getItem('lang'),
           companyId: companyId,
           contractType: 1,	// 1法人 2个体户 3快捷账号
@@ -132,4 +159,4 @@ export default {
     text-align: center;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/distribution/menu/dishesList.vue b/src/views/distribution/menu/dishesList.vue
index 78cf063715b753327498c6dd9f1ec7d08f47c7ce..efbac74b043877c9b58680c71347e7d885d8d1c0 100644
--- a/src/views/distribution/menu/dishesList.vue
+++ b/src/views/distribution/menu/dishesList.vue
@@ -61,6 +61,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="stock" :label="$t('dishes.d17')" align="center" width="65"></el-table-column>
+      <el-table-column prop="sorts" :label="$t('menuInfo.mi45')" align="center" width="100"></el-table-column>
       <el-table-column :label="$t('dishes.d18')" align="center">
         <template slot-scope="scope">
           <img v-if="scope.row.goodsUrl" :src="scope.row.goodsUrl" alt="">
diff --git a/src/views/distribution/menu/index.vue b/src/views/distribution/menu/index.vue
index bd54894c17ccb8387aecaf3988aed076c4d2d90f..e2cb77ee029813ec02d7307c098c79d3cc25611b 100644
--- a/src/views/distribution/menu/index.vue
+++ b/src/views/distribution/menu/index.vue
@@ -57,8 +57,8 @@
               </el-table-column>
               <el-table-column :label="$t('menu.m11')" width="150">
                 <template slot-scope="scope">
-                  <p>{{$t('menu.m12')}}：{{scope.row.username}}</p>
-                  <p>{{$t('menu.m13')}}：{{scope.row.password}}</p>
+                  <p>{{$t('menu.m12')}}{{scope.row.username}}</p>
+                  <p>{{$t('menu.m13')}}{{scope.row.password}}</p>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('menu.m14')" prop="pcUrl">
@@ -131,7 +131,7 @@
         <el-table-column :label="$t('menu.m32')" align="center">
           <template slot-scope="scope">
             <div class="menu-btns">
-              <el-button type="text" :disabled="contractType == 2 && scope.row.restaurantList.length >= 1" @click="addRestaurant(scope.row)">{{$t('menu.m33')}}</el-button>
+              <el-button type="text" v-if="source==1" :disabled="contractType == 2 && scope.row.restaurantList.length >= 1" @click="addRestaurant(scope.row)">{{$t('menu.m33')}}</el-button>
               <el-button type="text" @click="editInfoHandle(scope.row)">{{$t('menu.m34')}}</el-button>
               <el-button type="text" @click="delUser(scope.row.companyId)">{{$t('menu.m35')}}</el-button>
             </div>
@@ -163,7 +163,7 @@
 </template>
 
 <script>
-import {getMenulist, getActivity, importExcel, updateStatus, deleteUser, getCheckInfo} from '@/api/distribution'
+import {getMenulist, getActivity, importExcel, updateStatus, deleteUser, getCheckInfo,} from '@/api/distribution'
 import {mapActions, mapGetters} from 'vuex'
 
 export default {
@@ -436,4 +436,4 @@ export default {
     cursor: pointer;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/distribution/menu/menuInfo.vue b/src/views/distribution/menu/menuInfo.vue
index 6624189552769575778915c0d38377fcbdbb5785..1d6c4afa1e9ae63726bf225ebc64d4163bcebe9f 100644
--- a/src/views/distribution/menu/menuInfo.vue
+++ b/src/views/distribution/menu/menuInfo.vue
@@ -1,22 +1,39 @@
 <template>
   <div class="menu-data">
-    <el-form ref="queryForm" :model="formData" label-width="115px" :rules="rules">
+    <el-form
+      ref="queryForm"
+      :model="formData"
+      label-width="260px"
+      :rules="rules"
+    >
       <el-form-item :label="$t('menuInfo.mi1')" prop="goodsName">
-        <el-input v-model="formData.goodsName" placeholder=""></el-input>
+        <el-input v-model="formData.goodsName" placeholder="" />
       </el-form-item>
       <el-form-item :label="$t('menuInfo.mi2')" prop="goodsPrice">
-        <el-input class="price" v-model="formData.goodsPrice" type="number" placeholder=""></el-input>
-        <el-select class="price-select" v-model="formData.metasymbol" :placeholder="$t('restaurantUser.ru9')">
+        <el-input
+          v-model="formData.goodsPrice"
+          class="price"
+          type="number"
+          placeholder=""
+        />
+        <el-select
+          v-model="formData.metasymbol"
+          class="price-select"
+          :placeholder="$t('restaurantUser.ru9')"
+        >
           <el-option
             v-for="item in unitList"
             :key="item.value"
             :label="item.value"
-            :value="item.value">
-          </el-option>
+            :value="item.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('menuInfo.mi3')" prop="stock">
-        <el-input v-model="formData.stock" type="number" placeholder=""></el-input>
+        <el-input v-model="formData.stock" type="number" placeholder="" />
+      </el-form-item>
+      <el-form-item :label="$t('menuInfo.mi45')" prop="sorts">
+        <el-input-number v-model="formData.sorts" />
       </el-form-item>
       <el-form-item :label="$t('menuInfo.mi4')">
         <el-upload
@@ -30,71 +47,162 @@
           :on-success="updateSuccess"
           :file-list="fileList"
         >
-          <i class="el-icon-plus"></i>
+          <i class="el-icon-plus" />
         </el-upload>
       </el-form-item>
       <el-form-item :label="$t('menuInfo.mi5')" prop="goodsServiceTime">
         <!-- <el-input v-model="formData.foodName" placeholder=""></el-input> -->
-        <el-select v-model="formData.goodsServiceTime" multiple :placeholder="$t('restaurantUser.ru9')">
+        <el-select
+          v-model="goodsTypeData"
+          multiple
+          :placeholder="$t('restaurantUser.ru9')"
+          @change="selectTime"
+        >
           <el-option
             v-for="item in foodSupplyTimeList"
-            :key="item.value"
+            :key="'info' + item.value"
             :label="item.label"
-            :value="item.value">
-          </el-option>
+            :value="item.value"
+          />
         </el-select>
       </el-form-item>
+      <template v-if="aryList.length != 0">
+        <el-form-item
+          :label="item.name"
+          v-for="(item, i) in aryList"
+          :key="item.code"
+        >
+          <!-- {{item}} -->
+          <div class="tag-item">
+            <!-- <el-tag
+              closable
+              :disable-transitions="true">
+              {{item.statTime + '-' + item.endTime}}
+            </el-tag> -->
+            <!-- <el-select v-model="item.type" :placeholder="$t('restaurantInfo.ri16')" v-if="item.showInput">
+              <el-option
+                v-for="item in timeType"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select> -->
+            <el-input
+              class="input-new-tag"
+              v-model="item.time"
+              maxlength="11"
+              @keyup.enter.native="addFoodTime(item, i)"
+              @blur="addFoodTime(item, i)"
+            >
+            </el-input>
+          </div>
+        </el-form-item>
+      </template>
       <el-form-item :label="$t('menuInfo.mi6')">
-        <el-switch v-model="formData.hot" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+        <el-switch
+          v-model="formData.hot"
+          active-color="#13ce66"
+          inactive-color="#ff4949"
+        />
       </el-form-item>
-      <el-form-item :label="$t('menuInfo.mi7')" v-if="formData.hot">
-        <el-switch v-model="formData.special" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+      <el-form-item v-if="formData.hot" :label="$t('menuInfo.mi7')">
+        <el-switch
+          v-model="formData.special"
+          active-color="#13ce66"
+          inactive-color="#ff4949"
+        />
       </el-form-item>
       <el-form-item :label="$t('menuInfo.mi8')" prop="attribute">
-        <el-select v-model="formData.attribute" :placeholder="$t('restaurantUser.ru9')">
+        <el-select
+          v-model="formData.attribute"
+          :placeholder="$t('restaurantUser.ru9')"
+        >
           <el-option
             v-for="item in foodTypeList"
             :key="item.value"
             :label="item.label"
-            :value="item.value">
-          </el-option>
+            :value="item.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('menuInfo.mi9')" prop="goodsTime">
         <el-date-picker
           v-model="goodsTime"
           type="daterange"
-           :range-separator="$t('discount.dc8')"
+          :range-separator="$t('discount.dc8')"
           :start-placeholder="$t('discount.dc9')"
           :end-placeholder="$t('discount.dc10')"
           value-format="yyyy-MM-dd"
           unlink-panels
-        >
-        </el-date-picker>
+        />
       </el-form-item>
       <el-form-item :label="$t('menuInfo.mi10')" prop="secondSort">
-        <el-input v-model="formData.secondSort" :placeholder="$t('menuInfo.mi10')"></el-input>
+        <el-input
+          v-model="formData.secondSort"
+          :placeholder="$t('menuInfo.mi10')"
+        />
       </el-form-item>
       <el-form-item :label="$t('menuInfo.mi11')">
-        <el-input v-model="formData.goodsSorts" :placeholder="$t('menuInfo.mi11')"></el-input>
+        <el-input
+          v-model="formData.goodsSorts"
+          :placeholder="$t('menuInfo.mi11')"
+        />
       </el-form-item>
       <el-form-item :label="$t('menuInfo.mi12')" prop="goodsTaxRate">
-        <el-input v-model="formData.goodsTaxRate" :placeholder="$t('menuInfo.mi13')"></el-input>
+        <el-input
+          v-model="formData.goodsTaxRate"
+          :placeholder="$t('menuInfo.mi13')"
+        />
       </el-form-item>
       <el-form-item :label="$t('menuInfo.mi15')">
-         <el-input type="textarea" v-model="formData.remark" placeholder=""></el-input>
+        <el-input v-model="formData.remark" type="textarea" placeholder="" />
       </el-form-item>
-      <el-form-item class="tag-form" :label="$t('menuInfo.mi14')">
-        <add-tabs @getTabsList="getPpepperList" :isEdit="true" :tabs="ppepperTabs"/>
+
+      <!-- 类型是否披萨 -->
+
+      <el-form-item :label="$t('menuInfo.mi44')">
+        <el-switch
+          v-model="formData.pizzaStatus"
+          active-color="#13ce66"
+          inactive-color="#ff4949"
+        />
+      </el-form-item>
+
+      <!-- 辣度 -->
+      <el-form-item
+        class="tag-form"
+        :label="$t('menuInfo.mi14')"
+        v-if="!formData.pizzaStatus"
+      >
+        <add-tabs
+          :is-edit="true"
+          :tabs="ppepperTabs"
+          @getTabsList="getPpepperList"
+        />
       </el-form-item>
-      <el-form-item class="tag-form" :label="$t('menuInfo.mi16')">
-         <add-tabs @getTabsList="getSkuList" :isEdit="true" :tabs="skuTabs"/>
+
+      <!-- 菜品规格 -->
+      <el-form-item
+        class="tag-form"
+        :label="$t('menuInfo.mi16')"
+        v-if="!formData.pizzaStatus"
+      >
+        <add-tabs :is-edit="true" :tabs="skuTabs" @getTabsList="getSkuList" />
       </el-form-item>
-      <el-form-item :label="item.value + ':'" v-for="(item, i) in skuList.values" :key="i">
-         <!-- <el-input  v-model="formData.sku" placeholder=""></el-input> -->
-         <add-tabs @getTabsList="skuItemData" :tabs="item.tablist || null" :change-index="i"/>
-         <!-- {{item.list}} -->
-         <el-table :data="item.list" style="width: 100%">
+      <el-form-item
+        v-if="!formData.pizzaStatus"
+        v-for="(item, i) in skuList.values"
+        :key="i"
+        :label="item.value + ':'"
+      >
+        <!-- <el-input  v-model="formData.sku" placeholder=""></el-input> -->
+        <add-tabs
+          :tabs="item.tablist || null"
+          :change-index="i"
+          @getTabsList="skuItemData"
+        />
+        <!-- {{item.list}} -->
+        <el-table :data="item.list" style="width: 100%">
           <el-table-column :label="$t('menuInfo.mi17')" prop="value">
             <!-- <template slot-scope="scope">
               <el-button type="primary" plain v-for="(val, k) in scope.row.attr" :key="k">{{val}}</el-button>
@@ -102,70 +210,294 @@
           </el-table-column>
           <el-table-column :label="$t('menuInfo.mi18')">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.price" :placeholder="$t('menuInfo.mi18')"></el-input>
+              <el-input
+                v-model="scope.row.price"
+                :placeholder="$t('menuInfo.mi18')"
+              />
             </template>
           </el-table-column>
-         </el-table>
+        </el-table>
       </el-form-item>
-      <el-form-item class="tag-form" :label="$t('menuInfo.mi19')">
-        <add-tabs @getTabsList="getSideDishList" :isEdit="true" :tabs="sideDishTabs"/>
+
+      <!-- 加菜 -->
+      <el-form-item
+        class="tag-form"
+        :label="$t('menuInfo.mi19')"
+        v-if="!formData.pizzaStatus"
+      >
+        <add-tabs
+          :is-edit="true"
+          :tabs="sideDishTabs"
+          @getTabsList="getSideDishList"
+        />
       </el-form-item>
-      <el-form-item :label="item.value + ':'" v-for="(item, i) in sideDishList.values" :key="'v'+ (i+1)">
-         <!-- <el-input  v-model="formData.sku" placeholder=""></el-input> -->
-         <add-tabs @getTabsList="sideDishItemData" :tabs="item.sideDishTabs || null" :change-index="i"/>
-         <el-table :data="sideDishList.list" style="width: 100%" v-if="i >= sideDishList.values.length - 1">
-          <el-table-column prop="value" :label="$t('menuInfo.mi17')"></el-table-column>
+      <el-form-item
+        v-if="!formData.pizzaStatus"
+        v-for="(item, i) in sideDishList.values"
+        :key="'v' + (i + 1)"
+        :label="item.value + ':'"
+      >
+        <!-- <el-input  v-model="formData.sku" placeholder=""></el-input> -->
+        <add-tabs
+          :tabs="item.sideDishTabs || null"
+          :change-index="i"
+          @getTabsList="sideDishItemData"
+        />
+        <el-table :data="item.list" style="width: 100%">
+          <el-table-column prop="value" :label="$t('menuInfo.mi17')" />
           <el-table-column :label="$t('menuInfo.mi18')">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.price" :placeholder="$t('menuInfo.mi18')"></el-input>
+              <el-input
+                v-model="scope.row.price"
+                :placeholder="$t('menuInfo.mi18')"
+              />
             </template>
           </el-table-column>
-         </el-table>
+        </el-table>
       </el-form-item>
-      <el-form-item :label="$t('menuInfo.mi20')">
-         <!-- <el-input v-model="formData.taste" placeholder=""></el-input> -->
-        <add-tabs @getTabsList="getTasteList" :isEdit="true" :tabs="tasteTabs"/>
+
+      <!-- 披萨类型 -->
+      <el-form-item
+        :label="$t('menuInfo.mi47')"
+        prop="pizzaType"
+        v-if="formData.pizzaStatus"
+      >
+        <el-select
+          v-model="formData.pizzaType"
+          :placeholder="$t('restaurantUser.ru9')"
+        >
+          <el-option :label="$t('menuInfo.mi50')" :value="1" />
+          <el-option :label="$t('menuInfo.mi51')" :value="2" />
+          <el-option :label="$t('menuInfo.mi52')" :value="3" />
+        </el-select>
+      </el-form-item>
+      <!-- 免费个数 -->
+      <el-form-item
+        :label="$t('menuInfo.mi54')"
+        v-if="formData.pizzaStatus && formData.pizzaType == 3"
+      >
+        <el-input-number v-model="formData.exemptionNum" :min="0" />
       </el-form-item>
-      <el-form-item  class="tag-form" :label="item.value + ':'" v-for="(item, i) in tasteList.values" :key="'t'+ (i+1)">
-         <!-- <el-input  v-model="formData.sku" placeholder=""></el-input> -->
-         <add-tabs @getTabsList="tasteItemData" :change-index="i" :tabs="item.list"/>
+      <el-form-item
+        :label="$t('menuInfo.mi55')"
+        v-if="formData.pizzaStatus && formData.pizzaType == 3"
+      >
+        <el-input v-model="formData.multiple" />
+      </el-form-item>
+
+      <!-- 披萨尺寸 -->
+      <el-form-item
+        class="tag-form"
+        :label="$t('menuInfo.mi48')"
+        v-if="formData.pizzaStatus"
+      >
+        <add-tabs :is-edit="true" :tabs="skuTabs" @getTabsList="getSkuList" />
       </el-form-item>
+      <el-form-item
+        v-if="formData.pizzaStatus"
+        v-for="(item, i) in skuList.values"
+        :key="i"
+        :label="item.value + ':'"
+      >
+        <add-tabs
+          :tabs="item.tablist || null"
+          :change-index="i"
+          @getTabsList="skuItemData"
+        />
+        <el-table :data="item.list" style="width: 100%">
+          <el-table-column :label="$t('menuInfo.mi17')" prop="value">
+          </el-table-column>
+          <el-table-column :label="$t('menuInfo.mi18')">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.price"
+                :placeholder="$t('menuInfo.mi18')"
+              />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form-item>
+
+      <!-- 披萨规格 -->
+      <!-- 整份 WHOLE -->
+      <div v-if="formData.pizzaStatus">
+        <el-form-item class="tag-form" label="WHOLE">
+          <add-tabs
+            :is-edit="true"
+            :tabs="pizzaWHOLE.tabs"
+            @getTabsList="getWHOLETab"
+          />
+        </el-form-item>
+        <el-form-item
+          class="tag-form"
+          v-for="(item, index) in pizzaWHOLE.values"
+          :key="index"
+          :label="item.value"
+        >
+          <add-tabs
+            :tabs="item.tablist || null"
+            :change-index="index"
+            @getTabsList="getWHOLItem"
+          />
+          <el-table :data="item.list" style="width: 100%">
+            <el-table-column :label="$t('menuInfo.mi17')" prop="value">
+            </el-table-column>
+            <el-table-column :label="$t('menuInfo.mi18')">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.price"
+                  :placeholder="$t('menuInfo.mi18')"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
+      </div>
+
+      <!-- 左边 HALF -->
+      <div v-if="formData.pizzaStatus">
+        <el-form-item class="tag-form" label="HALF 1">
+          <add-tabs
+            :is-edit="true"
+            :tabs="pizzaHALF_L.tabs"
+            @getTabsList="getHALF1Tab"
+          />
+        </el-form-item>
+        <el-form-item
+          class="tag-form"
+          v-for="(item, index) in pizzaHALF_L.values"
+          :key="index"
+          :label="item.value"
+        >
+          <add-tabs
+            :tabs="item.tablist || null"
+            :change-index="index"
+            @getTabsList="getHALF1Item"
+          />
+          <el-table :data="item.list" style="width: 100%">
+            <el-table-column :label="$t('menuInfo.mi17')" prop="value">
+            </el-table-column>
+            <el-table-column :label="$t('menuInfo.mi18')">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.price"
+                  :placeholder="$t('menuInfo.mi18')"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
+      </div>
+
+      <!-- 右边 HALF -->
+      <div v-if="formData.pizzaStatus">
+        <el-form-item class="tag-form" label="HALF 2">
+          <add-tabs
+            :is-edit="true"
+            :tabs="pizzaHALF_R.tabs"
+            @getTabsList="getHALF2Tab"
+          />
+        </el-form-item>
+        <el-form-item
+          class="tag-form"
+          v-for="(item, index) in pizzaHALF_R.values"
+          :key="index"
+          :label="item.value"
+        >
+          <add-tabs
+            :tabs="item.tablist || null"
+            :change-index="index"
+            @getTabsList="getHALF2Item"
+          />
+          <el-table :data="item.list" style="width: 100%">
+            <el-table-column :label="$t('menuInfo.mi17')" prop="value">
+            </el-table-column>
+            <el-table-column :label="$t('menuInfo.mi18')">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.price"
+                  :placeholder="$t('menuInfo.mi18')"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
+      </div>
+
+      <!-- 菜品备注 -->
+      <el-form-item :label="$t('menuInfo.mi20')" v-if="!formData.pizzaStatus">
+        <!-- <el-input v-model="formData.taste" placeholder=""></el-input> -->
+        <add-tabs
+          :is-edit="true"
+          :tabs="tasteTabs"
+          @getTabsList="getTasteList"
+        />
+      </el-form-item>
+      <el-form-item
+        v-for="(item, i) in tasteList.values"
+        :key="'t' + (i + 1)"
+        class="tag-form"
+        :label="item.value + ':'"
+      >
+        <!-- <el-input  v-model="formData.sku" placeholder=""></el-input> -->
+        <add-tabs
+          :change-index="i"
+          :tabs="item.list"
+          @getTabsList="tasteItemData"
+        />
+      </el-form-item>
+
+      <el-form-item label="printerCode" prop="printerCode">
+        <el-input v-model="formData.printerCode" />
+      </el-form-item>
+
       <el-form-item :label="$t('menuInfo.mi21')" prop="goodsmethod">
-         <!-- <el-input v-model="formData.foodName" placeholder=""></el-input> -->
-         <el-select v-model="goodsmethod" multiple :placeholder="$t('restaurantUser.ru9')">
+        <el-select
+          v-model="goodsmethod"
+          multiple
+          :placeholder="$t('restaurantUser.ru9')"
+        >
           <el-option
             v-for="item in goodsmethodList"
             :key="item.value"
             :label="item.label"
-            :value="item.value">
-          </el-option>
+            :value="item.value"
+          />
         </el-select>
       </el-form-item>
-      <el-form-item >
-        <el-button type="primary" @click="submitData" :loading="loading">{{isEdit ? $t('menuInfo.mi23'): $t('menuInfo.mi24')}}</el-button>
+      <el-form-item>
+        <el-button type="primary" :loading="loading" @click="submitData">{{
+          isEdit ? $t("menuInfo.mi23") : $t("menuInfo.mi24")
+        }}</el-button>
       </el-form-item>
     </el-form>
   </div>
 </template>
 <script>
-import addTabs from '@/components/addTabs'
-import {uploadFile, addGoods, getSelectGoods, updateGoods} from '@/api/distribution'
-import dayjs from 'dayjs'
-import {mapGetters} from 'vuex'
+import addTabs from "@/components/addTabs";
+import {
+  uploadFile,
+  addGoods,
+  getSelectGoods,
+  updateGoods,
+  checkSort,
+} from "@/api/distribution";
+import dayjs from "dayjs";
+import { mapGetters } from "vuex";
 export default {
   components: {
-    addTabs
+    addTabs,
   },
-  data () {
-    let checkGoodsmethod = (rule, value, callback) => {
+  data() {
+    const checkGoodsmethod = (rule, value, callback) => {
       if (this.goodsmethod.length <= 0) {
-        return callback(new Error(this.$t('menuInfo.mi25')));
+        return callback(new Error(this.$t("menuInfo.mi25")));
       }
       callback();
     };
-    let checkGoodsTime = (rule, value, callback) => {
+    const checkGoodsTime = (rule, value, callback) => {
       if (!this.goodsTime || this.goodsTime.length <= 0) {
-        return callback(new Error(this.$t('menuInfo.mi26')));
+        return callback(new Error(this.$t("menuInfo.mi26")));
       }
       callback();
     };
@@ -173,66 +505,90 @@ export default {
       uploadFile,
       isEdit: false,
       formData: {
-        goodsName: '',
-        goodsPrice: '',
-        stock: '',
+        goodsName: "",
+        goodsPrice: "",
+        stock: "",
+        sorts: 1,
         // goodsUrl: '',
-        goodsServiceTime: '',
+        goodsServiceTime: "",
         hot: false,
         special: false,
-        attribute: '',
-        secondSort: '',
-        goodsSorts: '',
-        remark: '',
-        sku: '',
-        sideDish: '',
-        taste: '',
-        status: '1',
-        pepper: '',
-        goodsTaxRate: '',
-        metasymbol: '$',
+        attribute: "",
+        secondSort: "",
+        goodsSorts: "",
+        remark: "",
+        sku: "",
+        sideDish: "",
+        taste: "",
+        status: "1",
+        pepper: "",
+        goodsTaxRate: "",
+        metasymbol: "$",
+        //披萨相关
+        pizzaType: "", //类型
+        multiple: "", //单价
+        exemptionNum: 1, //免费个数
+        pizzaSideDish: null, //披萨规格选项
+		    printerCode:''
+      },
+
+      //披萨整份
+      pizzaWHOLE: {
+        tabs: [],
+        values: [],
+      },
+      //披萨左边
+      pizzaHALF_L: {
+        tabs: [],
+        values: [],
       },
-      goodsmethod: '',
-      goodsTime: '', // 菜品的时间范围
+      //披萨右边
+      pizzaHALF_R: {
+        tabs: [],
+        values: [],
+      },
+
+      goodsmethod: "",
+      goodsTime: "", // 菜品的时间范围
       foodSupplyTimeList: [
         {
-          value: '1',
-          label: this.$t('dishes.d31')
-        },
-        {
-          value: '2',
-          label: this.$t('dishes.d32')
-        },
-        {
-          value: '3',
-          label: this.$t('dishes.d33')
+          value: "1",
+          label: this.$t("dishes.d31"),
         },
         {
-          value: '4',
-          label: this.$t('dishes.d34')
+          value: "2",
+          label: this.$t("dishes.d32"),
         },
         {
-          value: '5',
-          label: this.$t('dishes.d35')
+          value: "3",
+          label: this.$t("dishes.d33"),
         },
         {
-          value: '6',
-          label: this.$t('dishes.d36')
+          value: "4",
+          label: this.$t("dishes.d35"),
         },
+        // {
+        //   value: "5",
+        //   label: this.$t("dishes.d34"),
+        // },
+        // {
+        //   value: "6",
+        //   label: this.$t("dishes.d36"),
+        // },
       ],
       foodTypeList: [
         {
           value: 1,
-          label: this.$t('menuInfo.mi27')
+          label: this.$t("menuInfo.mi27"),
         },
         {
           value: 2,
-          label: this.$t('menuInfo.mi28')
-        }
+          label: this.$t("menuInfo.mi28"),
+        },
       ],
       skuList: {
         values: [],
-        list: []
+        list: [],
       },
       skuTabs: null,
       sideDishTabs: null,
@@ -240,81 +596,257 @@ export default {
       ppepperTabs: null,
       sideDishList: {
         values: [],
-        list: []
+        list: [],
       },
       tasteList: {
         values: [],
-        list: []
+        list: [],
       },
       goodsmethodList: [
         {
-          value: 'zq',
-          label: this.$t('menuInfo.mi29')
+          value: "zq",
+          label: this.$t("menuInfo.mi29"),
         },
         {
-          value: 'wm',
-          label: this.$t('menuInfo.mi30')
+          value: "wm",
+          label: this.$t("menuInfo.mi30"),
         },
         {
-          value: 'ts',
-          label: this.$t('menuInfo.mi31')
-        }
+          value: "ts",
+          label: this.$t("menuInfo.mi31"),
+        },
       ],
       rules: {
         goodsName: [
-          { required: true, message: this.$t('menuInfo.mi32'), trigger: 'blur' }
-        ],
-        goodsPrice: [
-          { required: true, message: this.$t('menuInfo.mi33')}
+          {
+            required: true,
+            message: this.$t("menuInfo.mi32"),
+            trigger: "blur",
+          },
         ],
+        goodsPrice: [{ required: true, message: this.$t("menuInfo.mi33") }],
         stock: [
-          { required: true, message: this.$t('menuInfo.mi34'), trigger: 'blur' }
+          {
+            required: true,
+            message: this.$t("menuInfo.mi34"),
+            trigger: "blur",
+          },
         ],
         goodsServiceTime: [
-          { required: true, message: this.$t('menuInfo.mi35'), trigger: 'change'}
+          {
+            required: true,
+            message: this.$t("menuInfo.mi35"),
+            trigger: "blur",
+          },
         ],
         secondSort: [
-          { required: true, message: this.$t('menuInfo.mi42'), trigger: 'blur' }
+          {
+            required: true,
+            message: this.$t("menuInfo.mi42"),
+            trigger: "blur",
+          },
         ],
         goodsTaxRate: [
-           { required: true, message: this.$t('menuInfo.mi43'), trigger: 'blur' }
-         ],
+          {
+            required: true,
+            message: this.$t("menuInfo.mi43"),
+            trigger: "blur",
+          },
+        ],
 
         attribute: [
-          { required: true, message: this.$t('menuInfo.mi36'), trigger: 'change' }
+          {
+            required: true,
+            message: this.$t("menuInfo.mi36"),
+            trigger: "change",
+          },
         ],
-        goodsmethod: [
-          { validator: checkGoodsmethod, trigger: 'blur' }
+        goodsmethod: [{ validator: checkGoodsmethod, trigger: "blur" }],
+        goodsTime: [{ validator: checkGoodsTime, trigger: "blur" }],
+
+        pizzaType: [
+          {
+            required: true,
+            message: this.$t("menuInfo.mi53"),
+            trigger: "blur",
+          },
         ],
-        goodsTime: [
-          { validator: checkGoodsTime, trigger: 'blur' }
-        ]
       },
       unitList: [
-        { value: '¥', label: this.$t('menuInfo.mi37') },
-        { value: '$', label: this.$t('menuInfo.mi38') },
-        { value: '€', label: this.$t('menuInfo.mi39') }
+        { value: "¥", label: this.$t("menuInfo.mi37") },
+        { value: "$", label: this.$t("menuInfo.mi38") },
+        { value: "€", label: this.$t("menuInfo.mi39") },
       ],
       loading: false,
       fileList: [],
-      goodsUrl: []
-    }
+      goodsUrl: [],
+      aryList: [],
+      goodsTypeData: [],
+    };
   },
   computed: {
-    ...mapGetters(['source'])
+    ...mapGetters(["source"]),
   },
-  created () {
-    let {goodsId} = this.$route.query;
+  created() {
+    const { goodsId } = this.$route.query;
     if (goodsId) {
       this.isEdit = true;
       this.getGoodsData(goodsId);
     }
   },
   methods: {
-    deepClone (source) {
+    //获取整份披萨tab
+    getWHOLETab(data) {
+      this.updatePizzaData("WHOLE", data, this.pizzaWHOLE.values);
+    },
+
+    getWHOLItem(data, index) {
+      this.updatePizzaItemData("WHOLE", data, index, this.pizzaWHOLE.values);
+    },
+
+    //获取左边披萨tab
+    getHALF1Tab(data) {
+      this.updatePizzaData("HALF1", data, this.pizzaHALF_L.values);
+    },
+    getHALF1Item(data, index) {
+      this.updatePizzaItemData("HALF1", data, index, this.pizzaHALF_L.values);
+    },
+
+    //获取右边披萨tab
+    getHALF2Tab(data) {
+      this.updatePizzaData("HALF2", data, this.pizzaHALF_R.values);
+    },
+    getHALF2Item(data, index) {
+      this.updatePizzaItemData("HALF2", data, index, this.pizzaHALF_R.values);
+    },
+
+    //处理披萨数据封装方法
+    updatePizzaData(type, newData, oldData) {
+      if (type == "WHOLE") {
+        this.pizzaWHOLE.tabs = newData;
+      } else if (type == "HALF1") {
+        this.pizzaHALF_L.tabs = newData;
+      } else if (type == "HALF2") {
+        this.pizzaHALF_R.tabs = newData;
+      }
+      var arr = [];
+      if (newData.length == oldData.length) {
+        newData.map((item, index) => {
+          arr.push({
+            list: oldData[index].list,
+            tablist: oldData[index].tablist,
+            value: item,
+          });
+        });
+      } else {
+        var arrValue = oldData.map((item) => {
+          return item.value;
+        });
+        newData.map((item, index) => {
+          if (arrValue.indexOf(item) > -1) {
+            arr.push({
+              list: oldData[arrValue.indexOf(item)].list,
+              tablist: oldData[arrValue.indexOf(item)].tablist,
+              value: item,
+            });
+          } else {
+            arr.push({
+              list: [],
+              tablist: [],
+              value: item,
+            });
+          }
+        });
+      }
+      if (type == "WHOLE") {
+        this.pizzaWHOLE.values = arr;
+      } else if (type == "HALF1") {
+        this.pizzaHALF_L.values = arr;
+      } else if (type == "HALF2") {
+        this.pizzaHALF_R.values = arr;
+      }
+    },
+
+    //处理披萨配料数据封装方法
+    updatePizzaItemData(type, newData, index, oldData) {
+      var arr = [];
+
+      oldData[index].tablist = newData;
+      const list = oldData[index].list;
+
+      var arrValue = list.map((item, index) => {
+        return item.value;
+      });
+      var arr = [];
+      newData.map((item, index) => {
+        if (arrValue.indexOf(item) > -1) {
+          arr.push({
+            value: item,
+            price: list[arrValue.indexOf(item)].price,
+          });
+        } else {
+          arr.push({
+            value: item,
+            price: "",
+          });
+        }
+      });
+      if (type == "WHOLE") {
+        this.pizzaWHOLE.values[index].list = arr;
+      } else if (type == "HALF1") {
+        this.pizzaHALF_L.values[index].list = arr;
+      } else if (type == "HALF2") {
+        this.pizzaHALF_R.values[index].list = arr;
+      }
+    },
+
+    addFoodTime(item, index) {
+      this.formData.goodsServiceTime = [];
+      if (item.time == null || item.time == "") {
+        this.$message.error(this.$t("restaurantInfo.ri40"));
+        return;
+      }
+      let time = item.time.match(
+        /^(\d{1,2})(:)(\d{1,2})-(\d{1,2})(:)(\d{1,2})$/
+      );
+      if (!time) {
+        this.$message.error(this.$t("restaurantInfo.ri41"));
+        return;
+      }
+      this.aryList[index].time = item.time;
+      this.aryList.map((item, index) => {
+        let statTime = item.time.split("-")[0];
+        let endTime = item.time.split("-")[1];
+        this.formData.goodsServiceTime.push({
+          code: item.code,
+          statTime: statTime,
+          endTime: endTime,
+        });
+      });
+      // console.log(this.formData.goodsServiceTime)
+    },
+    selectTime(list) {
+      let ary = [];
+      list.map((item, index) => {
+        this.foodSupplyTimeList.map((items, indexs) => {
+          if (item == items.value) {
+            ary.push({ code: items.value, name: items.label, time: "" });
+          }
+        });
+      });
+      ary.map((item, index) => {
+        this.aryList.map((items, indexs) => {
+          if (item.code == items.code) {
+            ary[index].time = this.aryList[indexs].time;
+          }
+        });
+      });
+      this.aryList = ary;
+    },
+    deepClone(source) {
       if (!source || typeof source !== "object") return source;
       var target = source.constructor === Object ? {} : [];
-      Object.keys(source).forEach(key => {
+      Object.keys(source).forEach((key) => {
         if (typeof source[key] === "object") {
           target[key] = this.deepClone(source[key]);
         } else {
@@ -323,70 +855,157 @@ export default {
       });
       return target;
     },
-    async getGoodsData (gid) {
+    async getGoodsData(gid) {
       try {
-        let result = await getSelectGoods({
+        const result = await getSelectGoods({
           goodsId: gid,
-          language: localStorage.getItem('lang'),
+          language: localStorage.getItem("lang"),
           source: this.source,
         });
         if (result) {
-          let itemData = result.data;
+          const itemData = result.data;
           this.formData = {
             goodsName: itemData.goodsName,
             goodsPrice: itemData.goodsPrice,
             stock: itemData.stock,
+            sorts: itemData.sorts,
             // goodsUrl: itemData.goodsUrl,
-            goodsServiceTime: itemData.goodsServiceTime ? JSON.parse(itemData.goodsServiceTime) : null,
+            goodsServiceTime: itemData.goodsServiceTime
+              ? JSON.parse(itemData.goodsServiceTime)
+              : null,
             hot: !!itemData.hot,
             special: !!itemData.special,
+            pizzaStatus: !!itemData.pizzaStatus,
             attribute: itemData.attribute,
             secondSort: itemData.secondSort,
             goodsSorts: itemData.goodsSorts,
             remark: itemData.remark,
-            sku: '',
-            sideDish: '',
-            taste: '',
+            sku: "",
+            sideDish: "",
+            taste: "",
             status: itemData.status,
+            printerCode:itemData.printerCode,
             goodsTaxRate: itemData.goodsTaxRate,
-            metasymbol: itemData.metasymbol || '$'
+            metasymbol: itemData.metasymbol || "$",
+            exemptionNum:itemData.exemptionNum,
+            multiple:itemData.multiple,
+            pizzaType:itemData.pizzaType,
+
+          };
+
+          if (this.formData.goodsServiceTime) {
+            this.formData.goodsServiceTime.map((item, index) => {
+              this.foodSupplyTimeList.map((items, indexs) => {
+                if (item.code == items.value) {
+                  this.goodsTypeData.push(items.value);
+                  this.aryList.push({
+                    code: items.value,
+                    name: items.label,
+                    time: item.statTime + "-" + item.endTime,
+                  });
+                }
+              });
+            });
           }
           if (itemData.pepper) {
             this.formData.pepper = itemData.pepper;
-            this.ppepperTabs = itemData.pepper.split(',');
+            this.ppepperTabs = itemData.pepper.split(",");
           }
           this.goodsmethod = [];
           if (itemData.salesGoodsmethodWm == 1) {
-            this.goodsmethod.push('wm');
+            this.goodsmethod.push("wm");
           }
           if (itemData.salesGoodsmethodZq == 1) {
-            this.goodsmethod.push('zq');
+            this.goodsmethod.push("zq");
           }
           if (itemData.salesGoodsmethodTs == 1) {
-            this.goodsmethod.push('ts');
+            this.goodsmethod.push("ts");
           }
 
           if (itemData.statsTime && itemData.endTime) {
-            this.goodsTime = [dayjs(itemData.statsTime).format('YYYY-MM-DD'), dayjs(itemData.endTime).format('YYYY-MM-DD')];
+            this.goodsTime = [
+              dayjs(itemData.statsTime).format("YYYY-MM-DD"),
+              dayjs(itemData.endTime).format("YYYY-MM-DD"),
+            ];
           }
+
+         //处理回显披萨数据
+         if(itemData.pizzaSideDish){
+           var pizzaData = JSON.parse(itemData.pizzaSideDish)
+           if(pizzaData&&pizzaData[0]&&pizzaData[0].type=='WHOLE'){
+              let list = pizzaData[0].child
+              this.pizzaWHOLE.tabs = list.map((item,index)=>{
+                return item.parent
+              })
+              this.pizzaWHOLE.values = list.map((item,index)=>{
+                var tabs = item.child.map((item1)=>{
+                  return item1.value
+                })
+                return {
+                  value:item.parent,
+                  list:item.child,
+                  tablist:tabs
+                }
+              })
+           }
+
+           if(pizzaData&&pizzaData[1]&&pizzaData[1].type=='HALF1'){
+              let list = pizzaData[1].child
+              this.pizzaHALF_L.tabs = list.map((item,index)=>{
+                return item.parent
+              })
+              this.pizzaHALF_L.values = list.map((item,index)=>{
+                var tabs = item.child.map((item1)=>{
+                  return item1.value
+                })
+                return {
+                  value:item.parent,
+                  list:item.child,
+                  tablist:tabs
+                }
+              })
+           }
+
+           if(pizzaData&&pizzaData[2]&&pizzaData[2].type=='HALF2'){
+              let list = pizzaData[2].child
+              this.pizzaHALF_R.tabs = list.map((item,index)=>{
+                return item.parent
+              })
+              this.pizzaHALF_R.values = list.map((item,index)=>{
+                var tabs = item.child.map((item1)=>{
+                  return item1.value
+                })
+                return {
+                  value:item.parent,
+                  list:item.child,
+                  tablist:tabs
+                }
+              })
+           }
+         }
+
+
+
           // 编辑内容复现展示内容
           if (itemData.sku) {
-            let sku = JSON.parse(itemData.sku);
-            let list = [];
-            this.skuList.values = sku.map(item => {
+            const sku = JSON.parse(itemData.sku);
+            const list = [];
+            this.skuList.values = sku.map((item) => {
               list.push(item.attribute);
-              let obj = {};
+              const obj = {};
               obj.value = item.attribute;
-              obj.tablist = item.detail.map(val => val.attr);
-              obj.list = item.detail.map(val => {
+              obj.tablist = item.detail.map((val) => val.attr);
+              obj.list = item.detail.map((val) => {
                 return {
                   value: val.attr,
-                  price: val.money
-                }
-              })
+                  price: val.money,
+                  id: val.id,
+                };
+              });
               return obj;
-            })
+            });
             this.skuTabs = list;
+            // console.log(this.skuList.values);
             // this.skuTabs = sku.attribute;
             // let list = [];
             // this.skuList.values = sku.attribute.map(item => {
@@ -412,64 +1031,150 @@ export default {
           }
 
           if (itemData.sideDish) {
-            let sideDish = JSON.parse(itemData.sideDish);
+            const sideDish = JSON.parse(itemData.sideDish);
             this.sideDishList.values = [];
             this.sideDishList.list = [];
             this.sideDishTabs = [];
-            sideDish.forEach(item => {
-              let obj = {value: item.parent};
-              let list = item.child.map(v => {
-                return v.value
+
+            //修改菜品同名问题之前的代码
+            // console.log(sideDish)
+            // sideDish.forEach((item) => {
+            //   const obj = { value: item.parent };
+            //   const list = item.child.map((v) => {
+            //     return v.value;
+            //   });
+            //   this.sideDishTabs.push(item.parent);
+            //   // obj.list = [...list];deepClone
+            //   // obj.sideDishTabs = [...list];
+            //   obj.list = this.deepClone(list);
+            //   obj.sideDishTabs = this.deepClone(list);
+            //   this.sideDishList.values.push(obj);
+            //   this.sideDishList.list = this.sideDishList.list.concat(
+            //     item.child
+            //   );
+            // });
+
+            sideDish.forEach((item) => {
+              const obj = { value: item.parent, list: item.child };
+              const list = item.child.map((v) => {
+                return v.value;
               });
+              obj.sideDishTabs = [...list];
               this.sideDishTabs.push(item.parent);
-              // obj.list = [...list];deepClone
-              // obj.sideDishTabs = [...list];
-              obj.list = this.deepClone(list);
-              obj.sideDishTabs = this.deepClone(list);
               this.sideDishList.values.push(obj);
-              this.sideDishList.list = this.sideDishList.list.concat(item.child);
             });
           }
 
           if (itemData.taste) {
             itemData.taste = JSON.parse(itemData.taste);
             this.tasteTabs = [];
-            this.tasteList.values = itemData.taste.map(item => {
-              this.tasteTabs.push(item.parent + ',' + (item.num || ''));
+            this.tasteList.values = itemData.taste.map((item) => {
+              this.tasteTabs.push(item.parent + "," + (item.num || ""));
               return {
                 value: item.parent,
-                list: item.child
-              }
-            })
+                list: item.child,
+                number: item.num,
+              };
+            });
           }
           if (itemData.goodsUrl) {
-            this.fileList = itemData.goodsUrl.split(',').map(v => {
-              return {url: v}
-            })
+            this.fileList = itemData.goodsUrl.split(",").map((v) => {
+              return { url: v };
+            });
           }
         }
       } catch (error) {
-        console.log(error)
+        console.log(error);
       }
     },
-    getPpepperList (data) {
+    getPpepperList(data) {
       if (data) {
-        this.formData.pepper = data.join(',');
+        this.formData.pepper = data.join(",");
       }
     },
-    getSkuList (data) {
-      this.updateTagList('skuList', data);
+    //菜品规格修改
+    getSkuList(data) {
+      // this.updateTagList("skuList", data);
+      this.skuTabs = data
+      var list = this.skuList.values;
+      var arr = [];
+
+      if (data.length == this.skuList.values.length) {
+        data.map((item, index) => {
+          arr.push({
+            list: list[index].list,
+            tablist: list[index].tablist,
+            value: item,
+          });
+        });
+      } else {
+        var arrValue = list.map((item) => {
+          return item.value;
+        });
+        data.map((item, index) => {
+          if (arrValue.indexOf(item) > -1) {
+            arr.push({
+              list: list[arrValue.indexOf(item)].list,
+              tablist: list[arrValue.indexOf(item)].tablist,
+              value: item,
+            });
+          } else {
+            arr.push({
+              list: [],
+              tablist: [],
+              value: item,
+            });
+          }
+        });
+      }
+
+      this.skuList.values = arr;
     },
-    skuItemData (data, index) {
+    skuItemData(data, index) {
       // console.log(this.skuList, data, index);
-      let list = this.skuList.values[index].list;
-      this.skuList.values[index].list = data.map((item, index) => {
-        let checkItem = list.filter((v, i) => v.value == item && index == i)[0];
-        return this.deepClone(checkItem) || {
-          value: item,
-          price: ''
+      this.skuList.values[index].tablist = data;
+      const list = this.skuList.values[index].list;
+      //修改前的代码
+      // this.skuList.values[index].list = data.map((item, index) => {
+      //   const checkItem = list.filter(
+      //     (v, i) => v.value == item && index == i
+      //   )[0];
+      //   return (
+      //     this.deepClone(checkItem) || {
+      //       value: item,
+      //       price: "",
+      //     }
+      //   );
+      // });
+
+      //修改后的代码
+      var arrValue = list.map((item, index) => {
+        return item.value;
+      });
+      var arr = [];
+      data.map((item, index) => {
+        if (arrValue.indexOf(item) > -1) {
+          if(list[arrValue.indexOf(item)].id){
+            arr.push({
+              value: item,
+              price: list[arrValue.indexOf(item)].price,
+              id:list[arrValue.indexOf(item)].id
+            });
+          }else{
+            arr.push({
+              value: item,
+              price: list[arrValue.indexOf(item)].price,
+            });
+          }
+        } else {
+          arr.push({
+            value: item,
+            price: "",
+          });
         }
-      })
+      });
+      this.skuList.values[index].list = arr;
+
       // console.log(this.skuList.values);
       // this.udapteTagItems('skuList', data, index);
       // this.skuList.values.forEach(item => {
@@ -512,51 +1217,207 @@ export default {
       //   }
       // })
     },
-    getSideDishList (data) {
-      this.updateTagList('sideDishList', data);
-    },
-    sideDishItemData (data, index) {
-      this.udapteTagItems('sideDishList', data, index);
-      let tabList = [];
-      this.sideDishList.values.forEach((item, i) => {
-        let list = item.list.map(val => {
-          let checkItem = this.sideDishList.list.filter((v, i) => v.value == val)[0];
-          return this.deepClone(checkItem) || {
-            value: val,
-            price: 0
+    //加菜修改
+    getSideDishList(data) {
+      // this.updateTagList("sideDishList", data);
+      // console.log(data)
+      this.sideDishTabs = data
+      var list = this.sideDishList.values;
+      var arr = [];
+      if (data.length == this.sideDishList.values.length) {
+        data.map((item, index) => {
+          arr.push({
+            list: list[index].list,
+            sideDishTabs: list[index].sideDishTabs,
+            value: item,
+          });
+        });
+      } else {
+        var arrValue = list.map((item) => {
+          return item.value;
+        });
+        data.map((item, index) => {
+          if (arrValue.indexOf(item) > -1) {
+            arr.push({
+              list: list[arrValue.indexOf(item)].list,
+              sideDishTabs: list[arrValue.indexOf(item)].sideDishTabs,
+              value: item,
+            });
+          } else {
+            arr.push({
+              list: [],
+              sideDishTabs: [],
+              value: item,
+            });
           }
         });
-        tabList = tabList.concat(list)
+      }
+      this.sideDishList.values = arr;
+      // console.log(this.sideDishList.values)
+    },
+    sideDishItemData(data, index) {
+      //修改菜品同名问题之前的代码
+      // this.udapteTagItems("sideDishList", data, index);
+      // let tabList = [];
+      // this.sideDishList.values.forEach((item, i) => {
+      //   const list = item.list.map((val) => {
+      //     const checkItem = this.sideDishList.list.filter(
+      //       (v, i) => v.value == val
+      //     )[0];
+      //     return (
+      //       this.deepClone(checkItem) || {
+      //         value: val,
+      //         price: 0,
+      //       }
+      //     );
+      //   });
+      //   tabList = tabList.concat(list);
+      // });
+      // this.sideDishList.list = tabList;
+      this.sideDishList.values[index].sideDishTabs = data;
+      const list = this.sideDishList.values[index].list;
+      //修改前的代码
+      // this.sideDishList.values[index].list = data.map((item, index) => {
+      //   const checkItem = list.filter(
+      //     (v, i) => v.value == item && index == i
+      //   )[0];
+      //   return (
+      //     this.deepClone(checkItem) || {
+      //       value: item,
+      //       price: "",
+      //     }
+      //   );
+      // });
+      //修改后的代码
+      var arrValue = list.map((item, index) => {
+        return item.value;
+      });
+      var arr = [];
+      data.map((item, index) => {
+        if (arrValue.indexOf(item) > -1) {
+          if(list[arrValue.indexOf(item)].id){
+            arr.push({
+              value: item,
+              price: list[arrValue.indexOf(item)].price,
+              id:list[arrValue.indexOf(item)].id
+            });
+          }else{
+            arr.push({
+              value: item,
+              price: list[arrValue.indexOf(item)].price
+            });
+          }
+        } else {
+          arr.push({
+            value: item,
+            price: "",
+          });
+        }
       });
-      this.sideDishList.list = tabList;
+      this.sideDishList.values[index].list = arr;
+      // console.log(this.sideDishList.values)
     },
-    getTasteList (data) {
-      this.updateTagList('tasteList', data, 'taste');
+    //菜品备注修改
+    getTasteList(data) {
+      // this.updateTagList("tasteList", data, "taste");
+      // console.log(this.tasteList);
+      var list = this.tasteList.values;
+      console.log(this.tasteList.values)
+      var arr = [];
+      if (data.length == this.tasteList.values.length) {
+        data.map((item, index) => {
+          item.replace("，", ",");
+          const name = item.split(",");
+          if(item.id){
+            arr.push({
+              list: list[index].list,
+              number: name[1] || 0,
+              value: name[0],
+              id:item.id
+            });
+          }else{
+            arr.push({
+              list: list[index].list,
+              number: name[1] || 0,
+              value: name[0],
+            });
+          }
+        });
+      } else {
+        var arrValue = list.map((item) => {
+          return item.value;
+        });
+        data.map((item, index) => {
+          item.replace("，", ",");
+          const name = item.split(",");
+          if (arrValue.indexOf(name[0]) > -1) {
+            if(item.id){
+              arr.push({
+                list: list[arrValue.indexOf(name[0])].list,
+                number: name[1] || 0,
+                value: name[0],
+                id:item.id
+              });
+            }else{
+              arr.push({
+                list: list[arrValue.indexOf(name[0])].list,
+                number: name[1] || 0,
+                value: name[0],
+              });
+            }
+          } else {
+            arr.push({
+              list: [],
+              number: name[1] || 0,
+              value: name[0],
+            });
+          }
+        });
+      }
+      this.tasteList.values = arr;
     },
-    tasteItemData (data, index) {
-      this.udapteTagItems('tasteList', data, index);
+    tasteItemData(data, index) {
+      this.udapteTagItems("tasteList", data, index);
     },
-    updateTagList (key, data, type) {
-      let filtersList = (list, value) => list.filter(v => v.value === value)[0];
-      this[key].values =  data.map(item => {
-        let checkItem = filtersList(this[key].values, item);
-        if (type == 'taste') {
-          item = item.replace('，', ',');
-          let name = item.split(',');
-          return checkItem || {
-            value: name[0], list: [], number: name[1] || 0
-          }
-        }
-        return this.deepClone(checkItem) || {
-          value: item, list: []
+    updateTagList(key, data, type) {
+      const filtersList = (list, value) => {
+        list.filter((v) => v.value === value.split(",")[0])[0];
+      };
+      this[key].values = data.map((item, index) => {
+        const checkItem = filtersList(this[key].values, item);
+        if (type == "taste") {
+          item = item.replace("，", ",");
+          const name = item.split(",");
+          // console.log(this[key].values[index].list)
+          return (
+            checkItem || {
+              value: name[0],
+              list:
+                this[key].values[index] == undefined
+                  ? []
+                  : this[key].values[index].list,
+              number: name[1] || 0,
+            }
+          );
         }
+        return (
+          this.deepClone(checkItem) || {
+            value: item,
+            list:
+              this[key].values[index] == undefined
+                ? []
+                : this[key].values[index].list,
+          }
+        );
       });
     },
-    udapteTagItems (key, data, index) {
-      let list = this[key].values[index].list;
-      this[key].values[index].list = data.map(item => {
-        let checkValue = list.filter((v,i) => v.value === item && i == index)[0];
-        return checkValue ? this.deepClone(checkValue) : item
+    udapteTagItems(key, data, index) {
+      const list = this[key].values[index].list;
+      this[key].values[index].list = data.map((item) => {
+        const checkValue = list.filter(
+          (v, i) => v.value === item && i == index
+        )[0];
+        return checkValue ? this.deepClone(checkValue) : item;
       });
     },
     handleRemove(file, fileList) {
@@ -567,7 +1428,7 @@ export default {
       this.dialogImageUrl = file.url;
       this.showDialog = true;
     },
-    handleBeforeUpload (file) {
+    handleBeforeUpload(file) {
       // console.log(file);
     },
     updateSuccess(response) {
@@ -575,97 +1436,217 @@ export default {
       if (response.code == 200) {
         // this.fop.push(response.data)
         // this.formData.goodsUrl = response.data;
-       this.fileList.push({url: response.data});
+        this.fileList.push({ url: response.data });
       }
     },
-    handelExceed (files, fileList) {
+    handelExceed(files, fileList) {
       // console.log(files, fileList);
     },
     handleClose(item, i) {
       item.list.splice(i, 1);
     },
-    submitData () {
-      this.$refs['queryForm'].validate((valid) => {
+    submitData() {
+      this.formData.goodsServiceTime = [];
+      this.aryList.map((item, index) => {
+        let statTime = item.time.split("-")[0];
+        let endTime = item.time.split("-")[1];
+        this.formData.goodsServiceTime.push({
+          code: item.code,
+          statTime: statTime,
+          endTime: endTime,
+        });
+      });
+      for (var i = 0; i < this.formData.goodsServiceTime.length; i++) {
+        if (
+          !this.formData.goodsServiceTime[i].statTime &&
+          !this.formData.goodsServiceTime[i].endTime
+        ) {
+          this.$message.error(this.$t("restaurantInfo.ri40"));
+          return;
+        }
+      }
+
+      if (this.formData.pizzaStatus) {
+        //处理披萨规格数据
+        var pizzaData = [
+          {
+            type: "WHOLE",
+            child:[]
+          },
+          {
+            type: "HALF1",
+            child:[]
+          },
+          {
+            type: "HALF2",
+            child:[]
+          },
+        ];
+        this.pizzaWHOLE.values.map((item,index)=>{
+          pizzaData[0].child.push({
+              parent: item.value,
+              child: item.list,
+            })
+        })
+        this.pizzaHALF_L.values.map((item,index)=>{
+          pizzaData[1].child.push({
+              parent: item.value,
+              child: item.list,
+            })
+        })
+        this.pizzaHALF_R.values.map((item,index)=>{
+          pizzaData[2].child.push({
+              parent: item.value,
+              child: item.list,
+            })
+        })
+        this.formData.pizzaSideDish = JSON.stringify(pizzaData)
+      }
+
+      this.$refs["queryForm"].validate(async (valid) => {
         if (valid) {
-          let {formData, skuList, sideDishList, tasteList,goodsmethod, goodsTime} = this;
+          const {
+            formData,
+            skuList,
+            sideDishList,
+            tasteList,
+            goodsmethod,
+            goodsTime,
+          } = this;
+
           // let sku = {list: skuList.list};
           // sku.attribute = skuList.values.map(item => item.value);
-          let sku = this.skuList.values.map(val => {
-            let obj = {};
+          const sku = this.skuList.values.map((val) => {
+            const obj = {};
             obj.attribute = val.value;
-            obj.detail = val.list.map(attr => {
+            obj.detail = val.list.map((attr) => {
               return {
                 attr: attr.value,
-                money: attr.price
-              }
-            })
+                money: attr.price,
+                id: attr.id,
+              };
+            });
             return obj;
-          })
+          });
           if (sku.length > 0) {
             formData.sku = JSON.stringify(sku);
           } else {
             formData.sku = null;
           }
-          let sideDish =  sideDishList.values.map(item => {
-            let child = [];
-            item.list.forEach(v => {
-              let item = sideDishList.list.filter(attr => attr.value == v)[0];
-              if (item) {
-                child.push(item);
-              }
-            })
+          const sideDish = sideDishList.values.map((item) => {
+            //修改菜品同名问题之前的代码
+            // const child = [];
+            // item.list.forEach((v) => {
+            //   const item = sideDishList.list.filter(
+            //     (attr) => attr.value == v
+            //   )[0];
+            //   if (item) {
+            //     child.push(item);
+            //   }
+            // });
+            // return {
+            //   parent: item.value,
+            //   child
+            // };
+
             return {
               parent: item.value,
-              child
-            }
-          })
-          formData.sideDish = sideDish && sideDish.length > 0 ? JSON.stringify(sideDish) : null;
-
+              child: item.list,
+            };
+          });
+          formData.sideDish =
+            sideDish && sideDish.length > 0 ? JSON.stringify(sideDish) : null;
           formData.hot = Number(formData.hot);
           formData.special = Number(formData.special);
-          let taste = tasteList.values.map(item => {
+          formData.pizzaStatus = Number(formData.pizzaStatus);
+          const taste = tasteList.values.map((item) => {
             return {
               parent: item.value,
               child: item.list,
-              num: item.number
-            }
+              num: item.number,
+            };
           });
           formData.taste = taste.length > 0 ? JSON.stringify(taste) : null;
           // console.log('sku:', JSON.stringify(sku));
 
           if (this.fileList.length > 0) {
-            this.formData.goodsUrl = this.fileList.map(item => item.url).join(',');
+            this.formData.goodsUrl = this.fileList
+              .map((item) => item.url)
+              .join(",");
+          }else{
+            this.formData.goodsUrl = ''
           }
           if (goodsmethod) {
-            formData.salesGoodsmethodZq  = goodsmethod.includes('zq') ? 1 : 0;
-            formData.salesGoodsmethodWm  = goodsmethod.includes('wm') ? 1 : 0;
-            formData.salesGoodsmethodTs  = goodsmethod.includes('ts') ? 1 : 0;
+            formData.salesGoodsmethodZq = goodsmethod.includes("zq") ? 1 : 0;
+            formData.salesGoodsmethodWm = goodsmethod.includes("wm") ? 1 : 0;
+            formData.salesGoodsmethodTs = goodsmethod.includes("ts") ? 1 : 0;
           }
           if (goodsTime) {
             formData.statsTime = goodsTime[0];
             formData.endTime = goodsTime[1];
           }
           // console.log(formData, sideDishList);
+          let obj = {};
+          //校验排序
           if (this.isEdit) {
-            this.updateGoods(formData);
+            obj = {
+              userId: this.$route.query.userId,
+              sorts: this.formData.sorts,
+              goodsId: this.$route.query.goodsId,
+            };
           } else {
-            this.addGoods(formData);
+            obj = {
+              userId: this.$route.query.userId,
+              sorts: this.formData.sorts,
+            };
+          }
+
+          let res = await checkSort(obj);
+          if (res && res.code == 200) {
+            if (res.data) {
+              //当前新增菜品排序已经存在菜品
+              this.formData.updGoodsId = res.data[0].goods_id;
+              this.formData.sortsType = 1;
+              this.$confirm(
+                `${this.$t("menuInfo.mi46") + res.data[0].maxSorts}`,
+                this.$t("header.h2"),
+                {
+                  confirmButtonText: this.$t("header.h3"),
+                  cancelButtonText: this.$t("header.h4"),
+                  type: "warning",
+                }
+              ).then(() => {
+                if (this.isEdit) {
+                  this.updateGoods(formData);
+                } else {
+                  this.addGoods(formData);
+                }
+              });
+            } else {
+              if (this.isEdit) {
+                this.updateGoods(formData);
+              } else {
+                //当前新增菜品排序已经不存在菜品
+                this.formData.sortsType = 0;
+                this.addGoods(formData);
+              }
+            }
           }
         } else {
-          console.log('error submit!!');
+          console.log("error submit!!");
           return false;
         }
       });
     },
-    async addGoods (form) {
+    async addGoods(form) {
       try {
-        let {userId} = this.$route.query;
-        form.baseLang = 'en';
-        form.language = localStorage.getItem('lang');
+        const { userId } = this.$route.query;
+        form.baseLang = "en";
+        form.language = localStorage.getItem("lang");
         form.userId = userId;
         this.loading = true;
-        let result = await addGoods(form);
-        this.$message.success(this.$t('menuInfo.mi40'));
+        const result = await addGoods(form);
+        this.$message.success(this.$t("menuInfo.mi40"));
         setTimeout(() => {
           this.loading = false;
           this.$router.go(-1);
@@ -677,27 +1658,30 @@ export default {
     },
     async updateGoods(form) {
       try {
-        let {userId, goodsId} = this.$route.query;
-        form.baseLang = 'en';
-        form.language = localStorage.getItem('lang');
+        const { userId, goodsId } = this.$route.query;
+        form.baseLang = "en";
+        form.language = localStorage.getItem("lang");
         form.userId = userId;
         form.goodsId = goodsId;
         this.loading = true;
-        let result = await updateGoods(form);
-        this.$message.success(this.$t('menuInfo.mi41'));
+        const result = await updateGoods(form);
+        this.$message.success(this.$t("menuInfo.mi41"));
         this.loading = false;
         setTimeout(() => {
           // this.$router.go(-1);
-          let {userId, pageNum} = this.$route.query;
-          this.$router.replace({path: '/dishesList', query: {userId, pageNum}});
+          const { userId, pageNum } = this.$route.query;
+          this.$router.replace({
+            path: "/dishesList",
+            query: { userId, pageNum },
+          });
         }, 120);
       } catch (error) {
         this.loading = false;
         console.log(error);
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss">
diff --git a/src/views/distribution/order/orderDetails.vue b/src/views/distribution/order/orderDetails.vue
index 5c7c284713640bc184392b4296c09f806830a56f..3a4c72c2dca12d7026fba86e4f6013506e5c2ff4 100644
--- a/src/views/distribution/order/orderDetails.vue
+++ b/src/views/distribution/order/orderDetails.vue
@@ -1,66 +1,148 @@
 <template>
   <div class="order-details">
     <el-form label-width="130px">
-      <el-form-item :label="$t('orderDetails.od1')">{{formItem.orderId}}</el-form-item>
-      <el-form-item :label="$t('orderDetails.od2')">{{formItem.createTime}}</el-form-item>
-      <el-form-item :label="$t('orderDetails.od3')">{{formItem.purchaseMethod}}</el-form-item>
+      <el-form-item :label="$t('orderDetails.od1')">{{ formItem.orderId }}</el-form-item>
+      <el-form-item :label="$t('orderDetails.od2')">{{ formItem.createTime }}</el-form-item>
+      <el-form-item :label="$t('orderDetails.od3')">{{ formItem.purchaseMethod }}</el-form-item>
       <el-form-item :label="$t('orderDetails.odn3')">
-        <span v-if="formItem.goodsDeliveryModelList">{{formItem.goodsDeliveryModelList.deliveryTime}}</span>
+        <span v-if="formItem.goodsDeliveryModelList">{{ formItem.goodsDeliveryModelList.deliveryTime }}</span>
       </el-form-item>
-      
-      <el-form-item :label="$t('orderDetails.od4')">{{formItem.orderId}}</el-form-item>
-      <el-form-item :label="$t('orderDetails.od5')">{{formItem.restaurantName}}</el-form-item>
-      <el-form-item :label="$t('orderDetails.odn5')">{{formItem.deskNo}}</el-form-item>
-      <el-form-item :label="$t('orderDetails.od6')">{{formItem.orderAmount}}</el-form-item>
-      <el-form-item :label="$t('orderDetails.od7')">{{formItem.metasymbol}}{{formItem.payAmount}}</el-form-item>
-      <el-form-item :label="$t('orderDetails.od8')">{{formItem.memberPhone}}</el-form-item>
+
+      <el-form-item :label="$t('orderDetails.od4')">{{ formItem.orderId }}</el-form-item>
+      <el-form-item :label="$t('orderDetails.od5')">{{ formItem.restaurantName }}</el-form-item>
+      <el-form-item :label="$t('orderDetails.odn5')">{{ formItem.deskNo }}</el-form-item>
+      <el-form-item :label="$t('orderDetails.od6')">{{ formItem.metasymbol }}{{ formItem.orderAmount }}</el-form-item>
+      <el-form-item :label="$t('orderDetails.od17')">-{{ formItem.metasymbol }}{{ formItem.discountPrice }}</el-form-item>
+      <el-form-item :label="$t('orderDetails.od7')">{{ formItem.metasymbol }}{{ formItem.payAmount }}</el-form-item>
+      <el-form-item :label="$t('orderDetails.od8')">{{ formItem.memberPhone }}</el-form-item>
       <el-form-item :label="$t('orderDetails.odn8')">
         <span v-if="formItem.goodsDeliveryModelList">
-          {{formItem.goodsDeliveryModelList.firstName}} {{formItem.goodsDeliveryModelList.lastName}}
+          {{ formItem.goodsDeliveryModelList.firstName }} {{ formItem.goodsDeliveryModelList.lastName }}
         </span>
       </el-form-item>
-      
-      <el-form-item :label="$t('orderDetails.od9')">{{formItem.memberEmail}}</el-form-item>
+
+      <el-form-item :label="$t('orderDetails.od9')">{{ formItem.memberEmail }}</el-form-item>
       <el-form-item :label="$t('orderDetails.od10')">
         <!-- {{formItem.orderStatus}} -->
-        <span v-if="formItem.orderStatus == 0">{{$t('orderList.ol16')}}</span>
-        <span v-else-if="formItem.orderStatus == 1">{{$t('orderList.oln17')}}</span>
-        <span v-else-if="formItem.orderStatus == 2">{{$t('orderList.ol17')}}</span>
-        <span v-else-if="formItem.orderStatus == 3">{{$t('orderList.ol27')}}</span>
+        <span v-if="formItem.orderStatus == 0">{{ $t('orderList.ol16') }}</span>
+        <span v-else-if="formItem.orderStatus == 1">{{ $t('orderList.oln17') }}</span>
+        <span v-else-if="formItem.orderStatus == 2">{{ $t('orderList.ol17') }}</span>
+        <span v-else-if="formItem.orderStatus == 3">{{ $t('orderList.ol27') }}</span>
       </el-form-item>
-      <el-form-item :label="$t('orderDetails.od11')">{{formItem.payMethod}}</el-form-item>
+      <el-form-item :label="$t('orderDetails.od11')">{{ formItem.payMethod }}</el-form-item>
       <el-form-item :label="$t('orderDetails.od16')">
-        <span v-if="formItem.goodsDeliveryModelList">{{formItem.goodsDeliveryModelList.address}}</span>
+        <span v-if="formItem.goodsDeliveryModelList">{{ formItem.goodsDeliveryModelList.address }}</span>
       </el-form-item>
-       <el-form-item :label="$t('orderDetails.ad17')">{{formItem.tip}}</el-form-item>
-    <el-form-item :label="$t('orderDetails.ad18')">{{formItem.wmTip}}</el-form-item>
+      <el-form-item :label="$t('orderDetails.ad17')">{{ formItem.metasymbol }}{{ formItem.tip }}</el-form-item>
+      <el-form-item :label="$t('orderDetails.ad21')">{{ formItem.metasymbol }}{{ formItem.taxRate }}</el-form-item>
+      <el-form-item :label="$t('restaurantInfo.ri58') + '：'">{{ formItem.metasymbol }}{{ formItem.wmTip }}</el-form-item>
     </el-form>
 
-    <el-table :data="formItem.goodsModelList"  border style="width: 100%">
-      <el-table-column prop="goodsId" :label="$t('orderDetails.od12')"></el-table-column>
+    <el-table :data="formItem.goodsModelList" border style="width: 100%">
+      <el-table-column prop="goodsId" :label="$t('orderDetails.od12')" />
       <el-table-column :label="$t('orderDetails.od13')">
         <template slot-scope="scope">
-          {{scope.row.goodsName}}: {{getSkuText(scope.row)}}
+          {{ scope.row.goodsName }} {{ getSkuText(scope.row) }}
+          <el-button type="text" size="small" v-if="formItem.orderTypeCode == 1" @click="showSpec(scope.row)">{{$t('orderList.ol33')}}</el-button>
+          <el-button type="text" size="small" v-if="formItem.orderTypeCode == 2 && scope.row.taste.length > 22" @click="showSpec(scope.row)">{{$t('orderList.ol33')}}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column prop="" :label="$t('orderDetails.ad19')">
+        <template>
+          <span>{{ formItem.descrip }}</span>
+          <p>{{ packingNotes }}</p>
         </template>
       </el-table-column>
-       <el-table-column prop="" :label="$t('orderDetails.ad19')">
-         <template>
-           <span>{{formItem.descrip}}</span>
-           <p>{{packingNotes}}</p>
-         </template>
-       </el-table-column>
-      <el-table-column prop="goodsPrice" :label="$t('orderDetails.od14')"></el-table-column>
-      <el-table-column prop="goodsNum" :label="$t('orderDetails.od15')"></el-table-column>
+      <el-table-column prop="goodsPrice" :label="$t('orderDetails.od14')" />
+      <el-table-column prop="goodsNum" :label="$t('orderDetails.od15')" />
     </el-table>
-   
+
+    <el-dialog title="" :visible.sync="dialogVisible">
+      <div class="dialog-title dialog-btm">{{ $t('dishes.d12') }}:{{ spec.goodsName }} <span v-if="formItem.orderTypeCode != 2"> {{ getSkuText(spec) }}</span></div>
+      <div class="dialog-zy">
+        <div class="dialog-title">{{ $t('menuInfo.mi15') }}:</div>
+        <div v-if="formItem.orderTypeCode == 1" class="dialog-main">
+          <div v-if="spec.pizzaStatus">
+            <template v-if="spec.pizza_o">
+              <div class="title">{{ spec.pizza_o[0].parent }}</div>
+              <div class="list">
+                <div v-for="(item, index) in spec.pizza_o[0].child" :key="index">{{ item.value }}</div>
+              </div>
+            </template>
+            <template v-if="spec.pizza_l">
+              <div class="title">{{ spec.pizza_l[0].parent }}</div>
+              <div class="list">
+                <div v-for="(item, index) in spec.pizza_l[0].child" :key="index">{{ item.value }}</div>
+              </div>
+            </template>
+            <template v-if="spec.pizza_r">
+              <div class="title">{{ spec.pizza_r[0].parent }}</div>
+              <div class="list">
+                <div v-for="(item, index) in spec.pizza_r[0].child" :key="index">{{ item.value }}</div>
+              </div>
+            </template>
+          </div>
+          <div v-else class="dialog-main">
+            <template v-if="spec.taste">
+              <template v-for="val in spec.taste">
+                <template v-for="(attr, i) in val.child">
+                  <div v-if="val.label.indexOf(i) >= 0" :key="attr" class="label">
+                    {{ attr }}
+                    <p />
+                  </div>
+                </template>
+              </template>
+            </template>
+            <template v-if="spec.sideDish">
+              <template v-for="val in spec.sideDish">
+                <template v-for="(attr, i) in val.child">
+                  <div v-if="attr.orderCount != null && attr.orderCount != 0" class="label">
+                    {{ attr.value }} x {{ attr.orderCount }}
+                    <p />
+                  </div>
+                </template>
+              </template>
+            </template>
+          </div>
+        </div>
+        <div v-else>
+          <div class="dialog-title">
+            {{getSkuText(spec)}}
+          </div>
+          <div v-if="spec.pizzaStatus">
+            <template v-if="spec.pizza_o">
+              <div class="title" v-if="spec.pizza_o.pizzaWhole&&spec.pizza_o.pizzaWhole.length>0">Whole</div>
+              <div class="list">
+                <div v-for="(item, index) in spec.pizza_o.pizzaWhole" :key="index">{{ item.value }}</div>
+              </div>
+            </template>
+            <template v-if="spec.pizza_l">
+              <div class="title" v-if="spec.pizza_l.pizzaHalfOne&&spec.pizza_l.pizzaHalfOne.length>0">Half 1</div>
+              <div class="list">
+                <div v-for="(item, index) in spec.pizza_l.pizzaHalfOne" :key="index">{{ item.value }}</div>
+              </div>
+            </template>
+            <template v-if="spec.pizza_r">
+              <div class="title" v-if="spec.pizza_r.pizzaHalfTwo&&spec.pizza_r.pizzaHalfTwo.length>0">Half 2</div>
+              <div class="list">
+                <div v-for="(item, index) in spec.pizza_r.pizzaHalfTwo" :key="index">{{ item.value }}</div>
+              </div>
+            </template>
+          </div>
+        </div>
+      </div>
+
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import dayjs from 'dayjs'
 export default {
-  data () {
+  data() {
     return {
+      spec: {},
+      dialogVisible: false,
       formItem: {},
       orderTypeList: [
         {
@@ -74,70 +156,130 @@ export default {
         {
           value: '2',
           label: this.$t('orderList.ol22')
-        },
+        }
       ],
       payMethodList: [
-        {value: '1', label: this.$t('orderList.ol23')},
-        {value: '2', label: this.$t('orderList.ol24')},
-        {value: '3', label: this.$t('orderList.ol25')},
-        {value: '4', label: 'paypal'},
-        {value: '5', label: 'googlepay'},
-        {value: '6', label: 'apple pay'},
-        {value: '7', label: this.$t('orderList.ol26')},
+        { value: '1', label: this.$t('orderList.ol23') },
+        { value: '2', label: this.$t('orderList.ol24') },
+        { value: '3', label: this.$t('orderList.ol25') },
+        { value: '4', label: 'paypal' },
+        { value: '5', label: 'googlepay' },
+        { value: '6', label: 'apple pay' },
+        { value: '7', label: this.$t('orderList.ol26') },
+        { value: '8', label: this.$t('orderList.ol23') + '/' + this.$t('orderList.ol24') },
+        { value: '10', label: this.$t('orderList.ol34') }
       ],
       packingNotes: ''
     }
   },
-  created () {
-    let {itemData} = this.$route.query;
+  created() {
+    let { itemData } = this.$route.query
     if (itemData) {
-      itemData = JSON.parse(itemData);
-      // console.log(itemData);
-      let purchaseMethod = this.orderTypeList.filter(item => item.value == itemData.purchaseMethod)[0];
+      itemData = JSON.parse(itemData)
+      const purchaseMethod = this.orderTypeList.filter(item => item.value == itemData.purchaseMethod)[0]
       if (purchaseMethod) {
-        itemData.purchaseMethod = purchaseMethod.label;
+        itemData.purchaseMethod = purchaseMethod.label
       }
-      let payMethod = this.payMethodList.filter(item => item.value == itemData.payMethod)[0];
+      const payMethod = this.payMethodList.filter(item => item.value == itemData.payMethod)[0]
       if (payMethod) {
-        itemData.payMethod = payMethod.label;
+        itemData.payMethod = payMethod.label
       }
       if (itemData.packingNotes) {
         try {
-          let packingNotes = itemData.packingNotes.split(',');
-          this.packingNotes = this.$t('orderDetails.ad20', {num: packingNotes[0], count: packingNotes[1]})
+          const packingNotes = itemData.packingNotes.split(',')
+          this.packingNotes = this.$t('orderDetails.ad20', { num: packingNotes[0], count: packingNotes[1] })
         } catch (error) {
-          
+          console.log(error)
         }
       }
-      itemData.createTime = dayjs(itemData.createTime).format('YYYY-MM-DD HH:mm:ss');
-      this.formItem = itemData;
+      itemData.createTime = dayjs(itemData.createTime).format('YYYY-MM-DD HH:mm:ss')
+      this.formItem = itemData
     }
   },
   methods: {
-    getSkuText (item) {
-      if (item.taste) {
-        let taste = JSON.parse(item.taste);
-        if (taste.other) {
-          let text = taste.other.map(val => val.norms);
-          return text.join('、');
+    getSkuText(item) {
+      if(this.formItem.orderTypeCode == 2) {
+        let textList = [];
+        if (item.taste) {
+          let taste = item.taste
+          if (taste.other) {
+            taste.other.map(val => {
+              textList.push(val.norms)
+            })
+          }
+          if(taste.side) {
+            taste.side.map(val => {
+              textList.push(val.norms + '×' + val.num)
+            })
+          }
+          if(textList.length != 0) return textList.join('、');
         }
       }
       if (item.sku) {
-        let sku = JSON.parse(item.sku);
-        let text = sku.map(val => {
-          let {list, label} = val;
-          return list[label].name;
-        });
-        return text.join('、');
+        const sku = JSON.parse(item.sku)
+        const text = sku.map(val => {
+          const { list, label } = val
+          return list[label].name
+        })
+        return text.join('、')
       }
-      return '';
+      return ''
+    },
+    getPizaaSpec(pizza) {
+      if (!pizza) {
+        return ''
+      }
+      let resulte = ''
+      pizza.forEach(item => {
+        resulte += item.value
+      })
+      return resulte
+    },
+    showSpec(spec) {
+      this.dialogVisible = true
+      this.spec.pizza_o = JSON.parse(spec.pizza_o || null)
+      this.spec.pizza_l = JSON.parse(spec.pizza_l || null)
+      this.spec.pizza_r = JSON.parse(spec.pizza_r || null)
+      this.spec.taste = JSON.parse(spec.taste || null)
+      this.spec.sideDish = JSON.parse(spec.sideDish || null)
+      this.spec.sku = spec.sku
+      this.spec.pizzaStatus = spec.pizzaStatus
+      this.spec.goodsName = spec.goodsName
+      this.spec.goodsNum = spec.goodsNum
     }
   }
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .order-details {
   padding: 30px;
 }
-</style>
\ No newline at end of file
+.dialog-title {
+  font-size: 16px;
+  color: #333;
+  font-weight: bold;
+  margin-right: 15px;
+}
+.dialog-zy{
+  display: flex;
+  justify-content: left;
+  align-items: center;
+}
+.dialog-btm{
+  margin-bottom: 30px;
+}
+.dialog-desc {
+  margin-top: 10px;
+}
+.dialog-main {
+  color: #333;
+  padding-left: 30px;
+
+}
+.title {
+    margin-top: 10px;
+    font-weight: bold;
+    color: #333;
+  }
+</style>
diff --git a/src/views/distribution/orderList.vue b/src/views/distribution/orderList.vue
index d5f4be966466476409bda6651f536498303c842e..1e0e7e88c592411d3eee61a1afeda90fb8d03250 100644
--- a/src/views/distribution/orderList.vue
+++ b/src/views/distribution/orderList.vue
@@ -1,9 +1,15 @@
 <template>
   <div class="order-main">
+
+    <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick">
+      <el-tab-pane :label="$t('orderList.ol29')" name="1" />
+      <el-tab-pane :label="$t('orderList.ol30')" name="2" />
+    </el-tabs>
+
     <div class="query">
       <el-form ref="queryForm" :model="form" :inline="true">
-        <el-form-item>
-          <el-input v-model="form.restaurantName" :placeholder="$t('orderList.ol1')"></el-input>
+        <el-form-item style="width:350px">
+          <el-input v-model="form.restaurantName" :placeholder="$t('orderList.ol1')"  style="width:100%"/>
 
           <!-- <el-select
             v-model="form.userId"
@@ -22,7 +28,7 @@
             </el-option>
           </el-select> -->
         </el-form-item>
-        <el-form-item>
+        <el-form-item v-if="activeName==='2'">
           <el-date-picker
             v-model="createDate"
             type="daterange"
@@ -31,56 +37,56 @@
             :end-placeholder="$t('orderList.ol4')"
             value-format="yyyy-MM-dd"
             unlink-panels
-            >
-          </el-date-picker>
+          />
         </el-form-item>
         <el-form-item>
-          <el-select v-model="form.purchaseMethod" :placeholder="$t('orderList.ol5')" clearable >
+          <el-select v-model="form.purchaseMethod" :placeholder="$t('orderList.ol5')" clearable>
             <el-option
               v-for="item in orderTypeList"
               :key="item.value"
               :label="item.label"
-              :value="item.value"></el-option>
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="onSearch">{{$t('orderList.ol6')}}</el-button>
+          <el-button type="primary" @click="onSearch">{{ $t('orderList.ol6') }}</el-button>
         </el-form-item>
       </el-form>
     </div>
-    <div class="tools">
-      <!-- <el-button>下载Exce</el-button> -->
-    </div>
+
     <div class="order-table">
       <el-table
         v-loading="loading"
         :data="orderList"
-        border fit
+        border
+        fit
         :default-sort="defaultSort"
       >
-        <el-table-column type="index" :label="$t('orderList.ol7')" align="center" width="80"></el-table-column>
+        <el-table-column type="index" :label="$t('orderList.ol7')" align="center" width="80" />
         <el-table-column prop="createTime" :label="$t('orderList.ol8')" align="center" sortable>
           <template slot-scope="scope">
-            {{scope.row.createTime | formatDate}}
+            {{ scope.row.createTime | formatDate }}
           </template>
         </el-table-column>
+        <el-table-column prop="deskNo" :label="$t('orderDetails.odn5')" align="center" />
         <el-table-column prop="purchaseMethod" :label="$t('orderList.ol9')" align="center">
           <template slot-scope="scope">
-            {{formatMethod(scope.row.purchaseMethod)}}
+            {{ formatMethod(scope.row.purchaseMethod) }}
           </template>
         </el-table-column>
-        <el-table-column prop="orderId" :label="$t('orderList.ol10')" align="center"></el-table-column>
-        <el-table-column prop="restaurantName" :label="$t('orderList.ol11')" align="center"></el-table-column>
-        <el-table-column prop="orderAmount" :label="$t('orderList.ol12')" align="center" sortable></el-table-column>
-        <el-table-column prop="payAmount" :label="$t('orderList.ol13')" align="center" sortable></el-table-column>
-        <el-table-column prop="memberPhone" :label="$t('orderList.ol14')" align="center"></el-table-column>
+        <el-table-column prop="orderId" :label="$t('orderList.ol10')" align="center" />
+        <el-table-column prop="restaurantName" :label="$t('orderList.ol11')" align="center" />
+        <el-table-column prop="orderAmount" :label="$t('orderList.ol12')" align="center" sortable />
+        <el-table-column prop="payAmount" :label="$t('orderList.ol13')" align="center" sortable />
+        <el-table-column prop="memberPhone" :label="$t('orderList.ol14')" align="center" />
         <el-table-column :label="$t('orderList.ol15')" align="center">
           <template slot-scope="scope">
-            <!-- 0未支付 1已支付 2制作中 -->
-            <span class="el-icon-close-c" v-if="scope.row.orderStatus == '0'">{{$t('orderList.ol16')}}</span>
-            <i class="el-icon-check" v-else-if="scope.row.orderStatus == '1'"></i>
-            <span class="el-icon-close-c" v-else-if="scope.row.orderStatus == '2'">{{$t('orderList.ol17')}}</span>
-            <span class="el-icon-close-c" v-else-if="scope.row.orderStatus == '3'">{{$t('orderList.ol27')}}</span>
+            <!-- 0未支付 1已支付/已完成 2制作中 3已取消 4删除 -->
+            <span v-if="scope.row.orderStatus == '0'" class="el-icon-close-c">{{ $t('orderList.ol16') }}</span>
+            <i v-else-if="scope.row.orderStatus == '1'" class="el-icon-check" />
+            <span v-else-if="scope.row.orderStatus == '2'" class="el-icon-close-c">{{ $t('orderList.ol17') }}</span>
+            <span v-else-if="scope.row.orderStatus == '3'" class="el-icon-close-c">{{ $t('orderList.ol27') }}</span>
           </template>
         </el-table-column>
         <!-- <el-table-column label="已下单" align="center">
@@ -91,31 +97,39 @@
         </el-table-column> -->
         <el-table-column :label="$t('orderList.ol18')" align="center">
           <template slot-scope="scope">
-            <el-button type="text" @click="$router.push({path: '/orderDetails', query: {itemData: JSON.stringify(scope.row)}})">{{$t('orderList.ol19')}}</el-button>
-            <el-button type="text" @click="changeOrder(scope.row)" v-if="scope.row.orderStatus == '0'">{{$t('orderList.o128')}}</el-button>
+            <el-button type="text"   @click="$router.push({path: '/orderDetails', query: {itemData: JSON.stringify(scope.row)}})">{{ $t('orderList.ol19') }}</el-button>
+            <el-button style="color:#e6a23c" v-if="scope.row.orderStatus == 0 || scope.row.orderStatus ==2 " type="text" @click="changeOrder(scope.row, 3, scope.row.restaurantId, scope.row.deskNo)">{{ $t('orderList.ol28') }}</el-button>
+            <el-button style="color:#67c23a" v-if="scope.row.orderStatus != 3 && scope.row.orderStatus != 1" type="text" @click="changeOrder(scope.row, 1, scope.row.restaurantId, scope.row.deskNo)">{{ $t('orderList.ol31') }}</el-button>
+            <el-button style="color:#f56c6c" type="text" @click="changeOrder(scope.row, 4, scope.row.restaurantId, scope.row.deskNo)">{{ $t('orderList.ol32') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
       <el-pagination
         background
-        @current-change="loadData"
         :current-page.sync="pageNum"
         :page-size="pageSize"
         layout="total, prev, pager, next, jumper"
-        :total="pageTotal">
-      </el-pagination>
+        :total="pageTotal"
+        @current-change="loadData"
+      />
     </div>
   </div>
 </template>
 
 <script>
-import {orderList, queryRestaurant, updateOrder} from '@/api/distribution'
-import dayjs from 'dayjs';
+import { orderList, queryRestaurant, updateOrder } from '@/api/distribution'
+import dayjs from 'dayjs'
 import Cookies from 'js-cookie'
-import {mapGetters} from 'vuex'
+import { mapGetters } from 'vuex'
 export default {
-  data () {
+  filters: {
+    formatDate(v) {
+      return dayjs(v).format('YYYY-MM-DD HH:mm:ss')
+    }
+  },
+  data() {
     return {
+      activeName: '1',
       loading: false,
       searchLoading: false,
       pageNum: 1,
@@ -132,7 +146,7 @@ export default {
       orderList: [],
       defaultSort: {
         prop: 'date',
-        order: 'descending',
+        order: 'descending'
       },
       restaurantList: [],
       orderTypeList: [
@@ -150,34 +164,29 @@ export default {
         }
       ],
       payMethodList: [
-        {value: '1', label: this.$t('orderList.ol23')},
-        {value: '2', label: this.$t('orderList.ol24')},
-        {value: '3', label: this.$t('orderList.ol25')},
-        {value: '4', label: 'paypal'},
-        {value: '5', label: 'googlepay'},
-        {value: '6', label: 'apple pay'},
-        {value: '7', label: this.$t('orderList.ol26')},
+        { value: '1', label: this.$t('orderList.ol23') },
+        { value: '2', label: this.$t('orderList.ol24') },
+        { value: '3', label: this.$t('orderList.ol25') },
+        { value: '4', label: 'paypal' },
+        { value: '5', label: 'googlepay' },
+        { value: '6', label: 'apple pay' },
+        { value: '7', label: this.$t('orderList.ol26') }
       ],
       searchData: {}
     }
   },
   watch: {
-    createDate (newVal) {
+    createDate(newVal) {
       if (newVal) {
-        this.form.startTime = newVal[0];
-        this.form.endTime = newVal[1];
+        this.form.startTime = newVal[0]
+        this.form.endTime = newVal[1]
       } else {
-        this.form.startTime = null;
-        this.form.endTime = null;
+        this.form.startTime = null
+        this.form.endTime = null
       }
     }
   },
-  filters: {
-    formatDate (v) {
-      return dayjs(v).format('YYYY-MM-DD HH:mm:ss');
-    }
-  },
-  created () {
+  created() {
     this.loadData()
     // console.log(this.$route.query);
   },
@@ -185,54 +194,55 @@ export default {
     ...mapGetters(['source'])
   },
   methods: {
-    onSearch () {
-      this.searchData = Object.assign({}, this.form);
-      this.pageNum = 1;
-      this.loadData();
+    onSearch() {
+      this.searchData = Object.assign({}, this.form)
+      this.pageNum = 1
+      this.loadData()
     },
-    async loadData () {
-     try {
-        let {pageSize, pageNum, searchData} = this;
-        this.loading = true;
-        let userId = Cookies.get('userId');
-        let result = await orderList({
+    async loadData() {
+      try {
+        const { pageSize, pageNum, searchData } = this
+        this.loading = true
+        const userId = Cookies.get('userId')
+        const result = await orderList({
           page: pageNum,
           limit: pageSize,
           timeType: searchData.startTime ? 4 : 5,
           language: localStorage.getItem('lang'),
           baseLang: 'en',
-          source: this.source,
+          source: this.source+'',
           userId,
-          ...searchData
+          ...searchData,
+          orderType: this.activeName
           // startTime: '',
           // endTime: '',
           // userId: '222222',
           // purchaseMethod: '0'
         })
-        this.loading = false;
-        let resultData = result.data;
+        this.loading = false
+        const resultData = result.data
         if (resultData && resultData.length > 0) {
-          this.orderList = resultData;
+          this.orderList = resultData
         } else {
-          this.orderList = [];
+          this.orderList = []
         }
-        this.pageTotal = result.flexiPageDto.rowCount;
-     } catch (error) {
-       this.loading = false;
-     }
+        this.pageTotal = result.flexiPageDto.rowCount
+      } catch (error) {
+        this.loading = false
+      }
     },
-    async remoteMethod (query) {
+    async remoteMethod(query) {
       if (query !== '') {
-        this.searchLoading = true;
-         let userId = Cookies.get('userId');
-        let result = await queryRestaurant({
+        this.searchLoading = true
+        const userId = Cookies.get('userId')
+        const result = await queryRestaurant({
           restaurantName: query,
           baseLang: 'en',
           language: localStorage.getItem('lang'),
           source: this.source,
-          userId,
+          userId
         })
-        this.searchLoading = false;
+        this.searchLoading = false
         this.restaurantList = result.data.map(item => {
           return {
             label: item.restaurant_name,
@@ -240,26 +250,58 @@ export default {
           }
         })
       } else {
-        this.restaurantList = [];
+        this.restaurantList = []
       }
     },
-    async changeOrder (item) {
+    async changeOrder(item, orderStatus, restaurantId, deskNo) {
+
+      if(orderStatus == 4) {
+        await this.$confirm(this.$t('menu.m52'), this.$t('menu.m40'), {
+          confirmButtonText: this.$t('menu.m41'),
+          cancelButtonText: this.$t('menu.m42'),
+          type: 'warning'
+        });
+      }
       try {
-        let result = await updateOrder({orderNo: item.orderId});
-        this.$message.success(this.$t('orderList.ol27'));
-        this.loadData();
+        let result;
+        const userId = Cookies.get('userId')
+        result = await updateOrder({ orderNo: item.orderId, orderStatus, userId, restaurantId, deskNo})
+        console.log(result)
+        if(result.code == 200) {
+          this.$message.success(this.$t('menu.m48'));
+        }
+        this.loadData()
       } catch (error) {
-        console.log(error);
+        console.log(error)
       }
     },
-    formatMethod (v) {
-      return v ? this.orderTypeList.filter(item => item.value == v)[0].label : '';
+    formatMethod(v) {
+      return v ? this.orderTypeList.filter(item => item.value == v)[0].label : ''
+    },
+    handleTabClick(tab, event) {
+      this.form.restaurantName = null
+      this.form.startTime = null
+      this.form.endTime = null
+      this.form.purchaseMethod = null
+      this.searchData = {}
+      this.pageNum = 1
+      this.loadData()
     }
   }
 }
 </script>
 
+<style scoped>
+  .order-main .tools {
+    margin-top: 0;
+  }
+
+</style>
+
 <style lang="scss">
+ .order-main .el-form-item__content{
+    width: 100%;
+  }
 .order-main {
   padding: 35px 20px;
   .tools {
diff --git a/src/views/distribution/personList.vue b/src/views/distribution/personList.vue
index f7de6bbd4e8033e139304a6fd241b229d3f92f13..8a675e0e0f59f0c7e2aca36cdd8e8e2bad0b0889 100644
--- a/src/views/distribution/personList.vue
+++ b/src/views/distribution/personList.vue
@@ -8,7 +8,7 @@
         <el-form-item>
           <el-button type="primary" @click="onSearch">{{$t('orderList.ol6')}}</el-button>
         </el-form-item>
-        <!-- <el-form-item class="tools">
+       <!-- <el-form-item class="tools">
           <el-button @click="toExcel">{{$t('person.p13')}}</el-button>
         </el-form-item> -->
       </el-form>
@@ -111,17 +111,17 @@ export default {
       let {pageSize, pageNum} = this;
       // this.loading = true;
       let parmas = {
-        page: pageNum,
-        limit: pageSize,
+        language: localStorage.getItem('lang'),
+        searchName: this.form.searchName
       }
       excelDown(parmas).then(res => { // 调用接口
-       console.log(res); // 此处res为bolb类文件对象 Blob(4412) {size: 4412, type: "application/octet-stream"}
+       // console.log(res); // 此处res为bolb类文件对象 Blob(4412) {size: 4412, type: "application/octet-stream"}
        var blob = new Blob([res], {type: "application/vnd.ms-excel"}); //type这里表示xlsx类型
-
+       // console.log(blob)
         　　var downloadElement = document.createElement('a');
         　　var href = window.URL.createObjectURL(blob); //创建下载的链接
         　　downloadElement.href = href;
-        　　downloadElement.download = 'result.xlsx'; //下载后文件名
+        　　downloadElement.download = 'user.xlsx'; //下载后文件名
         　　document.body.appendChild(downloadElement);
         　　downloadElement.click(); //点击下载
         　　document.body.removeChild(downloadElement); //下载完成移除元素
diff --git a/src/views/distribution/qrcodeList.vue b/src/views/distribution/qrcodeList.vue
index e96678942af267c2b08d61d5c29180926db2ee5b..a5a0acdf188a27842a9e069ebfc4f095888e4fb1 100644
--- a/src/views/distribution/qrcodeList.vue
+++ b/src/views/distribution/qrcodeList.vue
@@ -18,9 +18,9 @@
         </template>
       </el-table-column>
       <el-table-column prop="deskNo" :label="$t('qrcode.qc5')" align="center"></el-table-column>
-      <el-table-column :label="$t('qrcode.qc6')" align="center" width="220">
+      <el-table-column :label="$t('qrcode.qc6')" align="center" width="420">
         <template slot-scope="scope">
-          <el-button class="downLoad" type="primary" size="mini" @click="saveQrCode(scope.row)">{{$t('qrcode.qc7')}}</el-button>
+          <el-button class="downLoad" type="primary" size="mini" @click="saveQrCode(scope.row.qrcodeUrl, scope.row.deskNo)">{{$t('qrcode.qc7')}}</el-button>
           <el-button type="danger" size="mini" @click="delQrCode(scope.row)">{{$t('qrcode.qc8')}}</el-button>
         </template>
       </el-table-column>
@@ -128,24 +128,55 @@ export default {
     handleSelectionChange (list) {
       this.selectList = list;
     },
-    saveQrCode (item) {
-      let img = new Image();
-      img.src = item.qrcodeUrl + '?time=' + Date.now();
-      img.crossOrigin = 'Anonymous';
-      img.onload = function() {
-        let canvas = document.createElement('canvas');
-        canvas.width = img.width;
-        canvas.height = img.height;
-        let context = canvas.getContext('2d');
-        context.drawImage(img, 0, 0, img.width, img.height);
-        let url = canvas.toDataURL('image/png');
-        let a = document.createElement('a');
-        a.href = url;
-        a.download = item.deskNo;
+    saveQrCode (imgsrc, name) {
+      // 保存下载图片到本地
+      // 下载图片地址和图片名
+      var image = new Image()
+      // 解决跨域 Canvas 污染问题
+      image.setAttribute('crossOrigin', 'anonymous')
+      image.onload = function () {
+        var canvas = document.createElement('canvas')
+        canvas.width = image.width
+        canvas.height = image.height
+        var context = canvas.getContext('2d')
+        context.drawImage(image, 0, 0, image.width, image.height)
+        var url = canvas.toDataURL('image/png') // 得到图片的base64编码数据
+
+        var a = document.createElement('a') // 生成一个a元素
+        var event = new MouseEvent('click') // 创建一个单击事件
+        a.download = name || 'photo' // 设置图片名称
+        a.href = url // 将生成的URL设置为a.href属性
         a.target = '_blank'
-        a.click();
+        a.dispatchEvent(event) // 触发a的单击事件
       }
+      image.src = imgsrc
+      // let img = new Image();
+      // img.src = item.qrcodeUrl;
+      // img.crossOrigin = 'Anonymous';
+      // img.onload = function() {
+      //   let canvas = document.createElement('canvas');
+      //   canvas.width = img.width;
+      //   canvas.height = img.height;
+      //   let context = canvas.getContext('2d');
+      //   context.drawImage(img, 0, 0, img.width, img.height);
+      //   let url = canvas.toDataURL('image/png');
+      //   let a = document.createElement('a');
+      //   a.href = url;
+      //   a.download = item.deskNo;
+      //   a.target = '_blank'
+      //   a.click();
+      // }
     },
+    // getBase64Image(img) {
+    //      var canvas = document.createElement("canvas");
+    //      canvas.width = img.width;
+    //      canvas.height = img.height;
+    //      var ctx = canvas.getContext("2d");
+    //      ctx.drawImage(img, 0, 0, img.width, img.height);
+    //      var ext = img.src.substring(img.src.lastIndexOf(".")+1).toLowerCase();
+    //      var dataURL = canvas.toDataURL("image/"+ext);
+    //      return dataURL;
+    // },
     downloadSelect () {
       if (this.selectList.length <=0) return
       // let el = document.querySelectorAll('.downLoad');
@@ -159,6 +190,7 @@ export default {
       try {
         await removeCode({ qrcodeId: item.qrcodeId })
         this.$message.success(this.$t('qrcode.qc11'))
+        this.loadData()
       } catch (error) {
         console.log(error);
       }
diff --git a/src/views/distribution/user/editUser.vue b/src/views/distribution/user/editUser.vue
index 8ddbd78d6d4d37deb4fef1b516611825994ffab2..da5ee02c1f167dadf1bdeb57954e6ca27fb23ca7 100644
--- a/src/views/distribution/user/editUser.vue
+++ b/src/views/distribution/user/editUser.vue
@@ -66,7 +66,7 @@ export default {
           ],
           email: [
             {required: true, message: this.$t('editUser.rules.r9'), trigger: 'blur'},
-            { pattern:/^([0-9A-Za-z\-_\.]+)@([0-9a-z]+\.[a-z]{2,3}(\.[a-z]{2})?)$/g, message: this.$t('editUser.rules.r10'), trigger: "blur"}
+            { pattern:/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/, message: this.$t('editUser.rules.r10'), trigger: "blur"}
           ]
       }
     }
diff --git a/vue.config.js b/vue.config.js
index bb04a6635388a25a63b923b057eb2bdd50ded8cc..8a32374679ef6b16a5a921cc39808ec400f53a97 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -29,27 +29,39 @@ module.exports = {
   assetsDir: 'static',
   lintOnSave: false,
   productionSourceMap: false,
+
   devServer: {
-    // proxy: {
-    //   // 匹配所有以api开头的请求路径
-    //   '/apis': {
-    //     target: 'https://test-mr-menu.mr-menu.com',
-    //     // target: 'https://test-super-menu.mr-menu.com',
-    //     changeOrigin: true,
-    //     secure: false,
-    //     // 把api替换掉
-    //     pathRewrite: {
-    //       '^/apis': '/'
-    //     }
-    //   }
-    // },
+    disableHostCheck:true,
+    proxy: {
+      // 匹配所有以api开头的请求路径
+      '/apis': {
+        // target: 'https://dev-api.mr-menu.com',
+        target: 'https://test-api.mr-menu.com',
+        changeOrigin: true,
+        secure: false,
+        // 把api替换掉
+        pathRewrite: {
+          '^/apis': ''
+        }
+      },
+      // '/test': {
+      //   // target: 'https://dev-api.mr-menu.com',
+      //   target: 'https://test-api.mr-menu.com',
+      //   changeOrigin: true,
+      //   secure: false,
+      //   // 把api替换掉
+      //   pathRewrite: {
+      //     '^/test': ''
+      //   }
+      // },
+    },
     port: port,
-    open: true,
+    open: false,
     overlay: {
       warnings: false,
       errors: true
     },
-    before: require('./mock/mock-server.js'),
+    // before: require('./mock/mock-server.js'),//配置代理需要注释
   },
   configureWebpack: {
     // provide the app's title in webpack's name field, so that