1770 会员升级 翻译

frontendApi/modules/v1/controllers/UserController.php

@@ -214,12 +214,12 @@ class UserController extends BaseController {
         ->one();
         $isOpen = !empty($isSwitchUpgrade) && isset($isSwitchUpgrade['VALUE']) ? $isSwitchUpgrade['VALUE'] : 0;
         if ($isOpen < 1) {
-            return static::notice('功能暂未开放',400);
+            return static::notice('The function is not available',400); // 功能暂未开放
         }
         $userNumber = \Yii::$app->request->request('userName');
         $baseInfo = Info::baseInfoZhByUserName($userNumber);
         if ($baseInfo['STATUS'] != 1) {
-            return static::notice('非激活用户,请联系客服',400);
+            return static::notice('Inactive user. Please contact customer service.',400);// 非激活用户,请联系客服
         }
         // 1. 如果是最高级别,则只显示用户基本信息
         // 2. 如果不是最高级别,如果用户累计报单数据是0, 或者用户累计报单业绩不符合级别信息,则提示 请联系客服核对业绩
@@ -264,10 +264,10 @@ class UserController extends BaseController {
             $nextLevelPerf = DeclarationLevel::getNextDecPref($levelPerf)['PERF'];
             // 如果总和超过了下一级业绩
             if ($userDecPvSum >= $nextLevelPerf) {
-                return static::notice('请联系客服人员核对业绩',400);
+                return static::notice('Please contact customer service to check performance.',400);// 请联系客服人员核对业绩
             }
             $type = $isObserve ? 1 : 2;
-            $userInfo['UPGRADE_FUNC'] = $isObserve ? '补差额升级' : '全额升级';// 升级方式
+            $userInfo['UPGRADE_FUNC'] = $isObserve ? 'filling up of a deficit' : 'full payment';// 升级方式
             $upgradeType = UpgradeType::getOneByType($type);
             // 如果用户不是最大级别,则需要获取是否观察期,算出PV是否有问题,应该补多少,
             $userInfo['UPGRADE_TYPE'] = $upgradeType;

frontendEle/src/views/user/upgrade.vue

@@ -45,7 +45,7 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item v-if="!isMax" label="Upgrade and make up performance"><!-- 升级补差业绩 -->
+                <el-form-item v-if="!isMax" label="Payment"><!-- 升级补差业绩 -->
                     <el-input v-model="needDiffPv"
                     disabled
                     >
@@ -127,7 +127,7 @@
                 </el-form-item>
                 <el-form-item v-if="!isMax">
                     <template slot="label">
-                        Consignee<!-- 收货人 -->
+                        Recipient name<!-- 收货人 -->
                     </template>
                     <el-input v-model="form.consignee"></el-input>
                 </el-form-item>

sql/upgrade/1770.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `AR_UPGRADE_TYPE` CHANGE COLUMN `OBSERVE_NAME` `OBSERVE_NAME_ZH` VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '升级方式名称-中文';
+ALTER TABLE `AR_UPGRADE_TYPE` ADD COLUMN `OBSERVE_NAME` VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '升级方式名称' AFTER `ID`;
+
+UPDATE `AR_UPGRADE_TYPE` SET `OBSERVE_NAME` = 'filling up of a deficit' WHERE ID = '1001565409206640A2' LIMIT 1;
+UPDATE `AR_UPGRADE_TYPE` SET `OBSERVE_NAME` = 'full payment' WHERE ID = '1001565409206640E2' LIMIT 1;