Merge branch 'feature/1600-remove-middle' into feature/theo-translate

backendEle/src/views/user/user-add-opt.vue

@@ -63,8 +63,7 @@
               </template>
               <el-radio-group v-model="form.location">
                 <el-radio-button :label="1">左区</el-radio-button>
-                <el-radio-button :label="2">中区</el-radio-button>
-                <el-radio-button :label="3">右区</el-radio-button>
+                <el-radio-button :label="2">右区</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item>
@@ -112,7 +111,7 @@
               <el-cascader
                   size="large"
                   :options="regionData"
-                  v-model="form.areaSelected" @change="handleGetSubCom">
+                  v-model="form.areaSelected">
               </el-cascader>
             </el-form-item>
             <el-collapse style="margin-bottom: 20px;">

frontendApi/modules/v1/controllers/UserController.php

@@ -428,10 +428,10 @@ class UserController extends BaseController {
         if($user){
             $userInfo['REAL_NAME'] = $user['REAL_NAME'];
             $allChildUser = UserNetwork::getFirstFloorChildren($userId);
-            $isLocation = [1 => '左-', 2 => '中-', 3 => '右-'];
+            $isLocation = [1 => 'Left-', 2 => 'Right-'];
             if($allChildUser) {
                 foreach ($allChildUser as $child) {
-                    $isLocation[$child['RELATIVE_LOCATION']].= '满';
+                    $isLocation[$child['RELATIVE_LOCATION']].= 'Filled';
                 }
             }
             $userInfo['isLocation'] = '('.implode(',',$isLocation).')';