From 9e99f1336ce7bf6eaaccb9322f637403aef5c6f7 Mon Sep 17 00:00:00 2001 From: wangzeyan <258785420@qq.com> Date: Sun, 18 May 2025 14:18:50 +0800 Subject: [PATCH 01/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9B=BEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/components/TencentMapPicker.vue | 44 ++++++++++++++++++----- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/admin/src/components/TencentMapPicker.vue b/admin/src/components/TencentMapPicker.vue index 89894672..3a9654f8 100644 --- a/admin/src/components/TencentMapPicker.vue +++ b/admin/src/components/TencentMapPicker.vue @@ -344,15 +344,34 @@ const initMap = () => { } const TMap = (window as any).TMap - const center = new TMap.LatLng(20.029077, 110.366367) + let center + + // 优先使用传入的坐标 + if (props.modelValue.lat && props.modelValue.lng) { + center = new TMap.LatLng(props.modelValue.lat, props.modelValue.lng) + } else { + // 默认使用北京坐标 + center = new TMap.LatLng(39.90403, 116.407526) + } + // 创建地图实例 map = new TMap.Map('container', { center, zoom: 12, }) + // 创建标记 marker = createMarker(map) + // 初始化时设置标记位置 + if (props.modelValue.lat && props.modelValue.lng) { + marker.updateGeometries({ + id: 'center', + position: new TMap.LatLng(props.modelValue.lat, props.modelValue.lng), + }) + } + + // 地图点击事件 map.on('click', (evt: any) => { map.setCenter(evt.latLng) marker.updateGeometries({ @@ -455,16 +474,23 @@ const handleError = (error: any) => { watch( () => props.modelValue, (newVal) => { - if (newVal.lat && newVal.lng && map) { - const latLng = new (window as any).TMap.LatLng(newVal.lat, newVal.lng) - map.setCenter(latLng) - marker?.updateGeometries({ - id: 'center', - position: latLng, - }) + if (newVal?.lat && newVal?.lng && map) { + try { + const latLng = new (window as any).TMap.LatLng(newVal.lat, newVal.lng) + map.setCenter(latLng) + marker?.updateGeometries({ + id: 'center', + position: latLng, + }) + } catch (error) { + console.warn('地图更新失败:', error) + } } }, - { immediate: true } + { + deep: true, + immediate: true, + } ) onBeforeUnmount(() => { From 61aab0870580abaff1fa4370e29800a8130ecab5 Mon Sep 17 00:00:00 2001 From: wangzeyan <258785420@qq.com> Date: Sun, 18 May 2025 18:03:46 +0800 Subject: [PATCH 02/29] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9C=BA=E5=9C=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/.env.development | 2 +- admin/.gitignore | 2 + admin/auto-imports.d.ts | 2 +- admin/components.d.ts | 5 +- admin/src/app/api/class.ts | 59 --- admin/src/app/api/classroom.ts | 66 ++++ admin/src/app/lang/zh-cn/class.class.json | 60 ++- .../app/lang/zh-cn/classroom.classroom.json | 27 ++ admin/src/app/lang/zh-cn/venue.venue.json | 2 +- admin/src/app/views/class/class.vue | 360 ------------------ .../app/views/class/components/class-edit.vue | 327 ---------------- admin/src/app/views/classroom/classroom.vue | 280 ++++++++++++++ .../classroom/components/classroom-edit.vue | 287 ++++++++++++++ .../app/views/venue/components/venue-edit.vue | 186 +++++++-- .../Class.php => classroom/Classroom.php} | 64 ++-- .../app/adminapi/controller/venue/Venue.php | 4 +- niucloud/app/adminapi/route/class.php | 28 ++ niucloud/app/adminapi/route/classroom.php | 43 +++ niucloud/app/adminapi/route/departments.php | 24 -- .../Class.php => classroom/Classroom.php} | 126 ++---- .../ClassroomService.php} | 47 ++- .../app/service/admin/venue/VenueService.php | 23 +- .../Class.php => classroom/Classroom.php} | 22 +- niucloud/app/validate/personnel/Personnel.php | 12 +- 24 files changed, 1044 insertions(+), 1014 deletions(-) delete mode 100644 admin/src/app/api/class.ts create mode 100644 admin/src/app/api/classroom.ts create mode 100644 admin/src/app/lang/zh-cn/classroom.classroom.json delete mode 100644 admin/src/app/views/class/class.vue delete mode 100644 admin/src/app/views/class/components/class-edit.vue create mode 100644 admin/src/app/views/classroom/classroom.vue create mode 100644 admin/src/app/views/classroom/components/classroom-edit.vue rename niucloud/app/adminapi/controller/{class/Class.php => classroom/Classroom.php} (62%) create mode 100644 niucloud/app/adminapi/route/classroom.php rename niucloud/app/model/{class/Class.php => classroom/Classroom.php} (55%) rename niucloud/app/service/admin/{class/ClassService.php => classroom/ClassroomService.php} (62%) rename niucloud/app/validate/{class/Class.php => classroom/Classroom.php} (56%) diff --git a/admin/.env.development b/admin/.env.development index 3eb397bf..819eabb4 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -1,5 +1,5 @@ # api请求地址 -VITE_APP_BASE_URL='http://146.56.228.75:20024/adminapi/' +VITE_APP_BASE_URL='http://zhjwxt.test/adminapi/' # 图片服务器地址 VITE_IMG_DOMAIN='' diff --git a/admin/.gitignore b/admin/.gitignore index a547bf36..de964337 100644 --- a/admin/.gitignore +++ b/admin/.gitignore @@ -22,3 +22,5 @@ dist-ssr *.njsproj *.sln *.sw? +.env.development +.env.production diff --git a/admin/auto-imports.d.ts b/admin/auto-imports.d.ts index 08908edd..a51b7a66 100644 --- a/admin/auto-imports.d.ts +++ b/admin/auto-imports.d.ts @@ -1,5 +1,5 @@ // Generated by 'unplugin-auto-import' export {} declare global { - + const ElNotification: typeof import('element-plus/es')['ElNotification'] } diff --git a/admin/components.d.ts b/admin/components.d.ts index e5b7f07b..8cdfc06d 100644 --- a/admin/components.d.ts +++ b/admin/components.d.ts @@ -10,7 +10,6 @@ declare module '@vue/runtime-core' { Attachment: typeof import('./src/components/upload-attachment/attachment.vue')['default'] DiyLink: typeof import('./src/components/diy-link/index.vue')['default'] Editor: typeof import('./src/components/editor/index.vue')['default'] - ElAlert: typeof import('element-plus/es')['ElAlert'] ElAside: typeof import('element-plus/es')['ElAside'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] @@ -45,7 +44,6 @@ declare module '@vue/runtime-core' { ElPopover: typeof import('element-plus/es')['ElPopover'] ElRadio: typeof import('element-plus/es')['ElRadio'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] - ElResult: typeof import('element-plus/es')['ElResult'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] @@ -58,8 +56,7 @@ declare module '@vue/runtime-core' { ElTabPane: typeof import('element-plus/es')['ElTabPane'] ElTabs: typeof import('element-plus/es')['ElTabs'] ElTag: typeof import('element-plus/es')['ElTag'] - ElTimeline: typeof import('element-plus/es')['ElTimeline'] - ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] + ElTimeSelect: typeof import('element-plus/es')['ElTimeSelect'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] ElTree: typeof import('element-plus/es')['ElTree'] ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] diff --git a/admin/src/app/api/class.ts b/admin/src/app/api/class.ts deleted file mode 100644 index 664832ca..00000000 --- a/admin/src/app/api/class.ts +++ /dev/null @@ -1,59 +0,0 @@ -import request from '@/utils/request' - -// USER_CODE_BEGIN -- class -/** - * 获取班级列表 - * @param params - * @returns - */ -export function getClassList(params: Record) { - return request.get(`class/class`, { params }) -} - -/** - * 获取班级详情 - * @param id 班级id - * @returns - */ -export function getClassInfo(id: number) { - return request.get(`class/class/${id}`) -} - -/** - * 添加班级 - * @param params - * @returns - */ -export function addClass(params: Record) { - return request.post('class/class', params, { - showErrorMessage: true, - showSuccessMessage: true, - }) -} - -/** - * 编辑班级 - * @param id - * @param params - * @returns - */ -export function editClass(params: Record) { - return request.put(`class/class/${params.id}`, params, { - showErrorMessage: true, - showSuccessMessage: true, - }) -} - -/** - * 删除班级 - * @param id - * @returns - */ -export function deleteClass(id: number) { - return request.delete(`class/class/${id}`, { - showErrorMessage: true, - showSuccessMessage: true, - }) -} - -// USER_CODE_END -- class diff --git a/admin/src/app/api/classroom.ts b/admin/src/app/api/classroom.ts new file mode 100644 index 00000000..89028d70 --- /dev/null +++ b/admin/src/app/api/classroom.ts @@ -0,0 +1,66 @@ +import request from '@/utils/request' + +// USER_CODE_BEGIN -- class +/** + * 获取场地管理列表 + * @param params + * @returns + */ +export function getClassroomList(params: Record) { + return request.get(`classroom/classroom`, { params }) +} + +/** + * 获取场地管理详情 + * @param id 场地管理id + * @returns + */ +export function getClassroomInfo(id: number) { + return request.get(`classroom/classroom/${id}`) +} + +/** + * 添加场地管理 + * @param params + * @returns + */ +export function addClassroom(params: Record) { + return request.post('classroom/classroom', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) +} + +/** + * 编辑场地管理 + * @param id + * @param params + * @returns + */ +export function editClassroom(params: Record) { + return request.put(`classroom/classroom/${params.id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) +} + +/** + * 删除场地管理 + * @param id + * @returns + */ +export function deleteClassroom(id: number) { + return request.delete(`classroom/classroom/${id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) +} + +export function getWithCampusList(params: Record) { + return request.get('classroom/campus_all', { params }) +} +export function getWithPersonnelList(params: Record) { + return request.get('classroom/personnel_all', { params }) +} + +// USER_CODE_END -- class diff --git a/admin/src/app/lang/zh-cn/class.class.json b/admin/src/app/lang/zh-cn/class.class.json index 5740e53d..a13a7093 100644 --- a/admin/src/app/lang/zh-cn/class.class.json +++ b/admin/src/app/lang/zh-cn/class.class.json @@ -1,35 +1,27 @@ { - "id": "班级编号", - "idPlaceholder": "请输入班级编号", - "campusId": "校区ID", - "campusIdPlaceholder": "请输入校区ID", - "campusName": "校区名称", - "campusNamePlaceholder": "请输入校区名称", - "className": "班级名称", - "classNamePlaceholder": "请输入班级名称", - "headCoach": "班级主教练", - "headCoachPlaceholder": "请输入班级主教练", - "ageGroup": "班级授课年龄段", - "ageGroupPlaceholder": "请输入班级授课年龄段", - "classType": "班级类型", - "classTypePlaceholder": "请输入班级类型", - "assistantCoach": "班级助教", - "assistantCoachPlaceholder": "请输入班级助教", - "createdAt": "创建时间", - "createdAtPlaceholder": "请输入创建时间", - "updatedAt": "修改时间", - "updatedAtPlaceholder": "请输入修改时间", - "deletedAt": "逻辑删除时间", - "deletedAtPlaceholder": "请输入逻辑删除时间", - "status": "班级状态", - "statusPlaceholder": "请输入班级状态", - "sortOrder": "班级排序", - "sortOrderPlaceholder": "请输入班级排序", - "remarks": "班级备注", - "remarksPlaceholder": "请输入班级备注", - "addClass": "添加班级", - "updateClass": "编辑班级", - "classDeleteTips": "确定要删除该数据吗?", - "startDate": "请选择开始时间", - "endDate": "请选择结束时间" -} + "campusId":"所属校区", + "campusIdPlaceholder":"全部", + "className":"场地名称", + "classNamePlaceholder":"请输入场地名称", + "headCoach":"主教练", + "headCoachPlaceholder":"全部", + "ageGroup":"授课年龄段", + "ageGroupPlaceholder":"请输入授课年龄段", + "classType":"场地类型", + "classTypePlaceholder":"请输入场地类型", + "assistantCoach":"助教", + "assistantCoachPlaceholder":"全部", + "createdAt":"创建时间", + "createdAtPlaceholder":"请输入创建时间", + "status":"班级状态", + "statusPlaceholder":"请输入班级状态", + "sortOrder":"班级排序", + "sortOrderPlaceholder":"请输入班级排序", + "remarks":"班级备注", + "remarksPlaceholder":"请输入班级备注", + "addClass":"添加场地管理", + "updateClass":"编辑场地管理", + "classDeleteTips":"确定要删除该数据吗?", + "startDate":"请选择开始时间", + "endDate":"请选择结束时间" +} \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/classroom.classroom.json b/admin/src/app/lang/zh-cn/classroom.classroom.json new file mode 100644 index 00000000..6216a9aa --- /dev/null +++ b/admin/src/app/lang/zh-cn/classroom.classroom.json @@ -0,0 +1,27 @@ +{ + "campusId":"所属校区", + "campusIdPlaceholder":"全部", + "className":"班级名称", + "classNamePlaceholder":"请输入班级名称", + "headCoach":"主教练", + "headCoachPlaceholder":"全部", + "ageGroup":"授课年龄段", + "ageGroupPlaceholder":"请输入授课年龄段", + "classType":"班级类型", + "classTypePlaceholder":"请输入班级类型", + "assistantCoach":"助教", + "assistantCoachPlaceholder":"全部", + "createdAt":"创建时间", + "createdAtPlaceholder":"请输入创建时间", + "status":"班级状态", + "statusPlaceholder":"请输入班级状态", + "sortOrder":"班级排序", + "sortOrderPlaceholder":"请输入班级排序", + "remarks":"班级备注", + "remarksPlaceholder":"请输入班级备注", + "addClassroom":"添加场地管理", + "updateClassroom":"编辑场地管理", + "classroomDeleteTips":"确定要删除该数据吗?", + "startDate":"请选择开始时间", + "endDate":"请选择结束时间" +} \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/venue.venue.json b/admin/src/app/lang/zh-cn/venue.venue.json index 45c03127..a379efef 100644 --- a/admin/src/app/lang/zh-cn/venue.venue.json +++ b/admin/src/app/lang/zh-cn/venue.venue.json @@ -7,7 +7,7 @@ "capacityPlaceholder":"请输入场地可容纳人数上限", "availabilityStatus":"场地可用状态", "availabilityStatusPlaceholder":"请输入场地可用状态", - "timeRangeType":"场地可用时间范围类型", + "timeRangeType":"时间范围类型", "timeRangeTypePlaceholder":"请输入场地可用时间范围类型", "fixedTimeRanges":"时间范围", "fixedTimeRangesPlaceholder":"请输入时间范围", diff --git a/admin/src/app/views/class/class.vue b/admin/src/app/views/class/class.vue deleted file mode 100644 index 59b54cb0..00000000 --- a/admin/src/app/views/class/class.vue +++ /dev/null @@ -1,360 +0,0 @@ - - - - - diff --git a/admin/src/app/views/class/components/class-edit.vue b/admin/src/app/views/class/components/class-edit.vue deleted file mode 100644 index 6c103c43..00000000 --- a/admin/src/app/views/class/components/class-edit.vue +++ /dev/null @@ -1,327 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/classroom/classroom.vue b/admin/src/app/views/classroom/classroom.vue new file mode 100644 index 00000000..a1b11ddd --- /dev/null +++ b/admin/src/app/views/classroom/classroom.vue @@ -0,0 +1,280 @@ + + + + + diff --git a/admin/src/app/views/classroom/components/classroom-edit.vue b/admin/src/app/views/classroom/components/classroom-edit.vue new file mode 100644 index 00000000..569d3824 --- /dev/null +++ b/admin/src/app/views/classroom/components/classroom-edit.vue @@ -0,0 +1,287 @@ + + + + + + diff --git a/admin/src/app/views/venue/components/venue-edit.vue b/admin/src/app/views/venue/components/venue-edit.vue index 79e38621..35c47b61 100644 --- a/admin/src/app/views/venue/components/venue-edit.vue +++ b/admin/src/app/views/venue/components/venue-edit.vue @@ -56,15 +56,13 @@ v-model="formData.availability_status" :placeholder="t('availabilityStatusPlaceholder')" > - - - - - - - - 可用 - 不可用 + + {{ item.name }} + @@ -83,16 +81,81 @@ - - - + +
+
+ + + +
+
+
+ +
+
+
+ + + +
+ 新增 + 删除 +
+
@@ -112,6 +175,7 @@ + + diff --git a/admin/src/app/views/aaaaaaaaaaa/components/aaaaaaaaaaa-edit.vue b/admin/src/app/views/aaaaaaaaaaa/components/aaaaaaaaaaa-edit.vue new file mode 100644 index 00000000..c66a7e6f --- /dev/null +++ b/admin/src/app/views/aaaaaaaaaaa/components/aaaaaaaaaaa-edit.vue @@ -0,0 +1,163 @@ + + + + + + diff --git a/niucloud/app/api/controller/apiController/teachingResearch.php b/niucloud/app/api/controller/apiController/TeachingResearch.php similarity index 65% rename from niucloud/app/api/controller/apiController/teachingResearch.php rename to niucloud/app/api/controller/apiController/TeachingResearch.php index a350fa4d..dfddb9ea 100644 --- a/niucloud/app/api/controller/apiController/teachingResearch.php +++ b/niucloud/app/api/controller/apiController/TeachingResearch.php @@ -14,6 +14,7 @@ namespace app\api\controller\apiController; use app\dict\member\MemberLoginTypeDict; use app\Request; use app\service\api\apiService\PersonnelService; +use app\service\api\apiService\TeachingResearchService; use app\service\api\captcha\CaptchaService; use app\service\api\login\ConfigService; use app\service\api\login\LoginService; @@ -26,11 +27,26 @@ use think\Response; * Class Personnel * @package app\api\controller\apiController */ -class teachingResearch extends BaseApiService +class TeachingResearch extends BaseApiService { //教研管理列表 public function list(){ $id = $this->member_id; - dd($id); + $data = $this->request->params([ + ["table_type",0] + ]); + return success((new TeachingResearchService())->list($id,$data['table_type'])); } + + //教研管理文章详情 + public function info($id){ + return success((new TeachingResearchService())->info($id)); + } + + //获取能看的教研管理类型 + public function lookType(){ + $id = $this->member_id; + return success((new TeachingResearchService())->lookType($id)); + } + } diff --git a/niucloud/app/api/route/route.php b/niucloud/app/api/route/route.php index 7affb5ff..382c5de2 100644 --- a/niucloud/app/api/route/route.php +++ b/niucloud/app/api/route/route.php @@ -215,7 +215,12 @@ Route::group(function() { - + //教研管理文章列表 + Route::get('teachingResearch/list', 'apiController.teachingResearch/list'); + //教研管理文章详情 + Route::get('teachingResearch/info/:id', 'apiController.teachingResearch/info'); + //获取能看的教研管理类型 + Route::get('teachingResearch/lookType', 'apiController.teachingResearch/lookType'); })->middleware(ApiChannel::class) ->middleware(ApiPersonnelCheckToken::class, true) ->middleware(ApiLog::class); diff --git a/niucloud/app/service/api/apiService/TeachingResearchService.php b/niucloud/app/service/api/apiService/TeachingResearchService.php new file mode 100644 index 00000000..2ebfbc18 --- /dev/null +++ b/niucloud/app/service/api/apiService/TeachingResearchService.php @@ -0,0 +1,81 @@ +model = new Personnel(); + } + + //获取教研管理文章列表 + public function list($id,$table_type){ + $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,url'; + $order = 'id desc'; + $LessonCourseTeaching = new LessonCourseTeaching(); + $where = []; + if ($table_type) { + $where[] = ['table_type','=',$table_type]; + } + if ($id !== null && $id !== '') { + $where[] = [Db::raw("FIND_IN_SET($id, user_permission)"), '>', 0]; + } + $search_model = $LessonCourseTeaching->where($where)->field($field)->order($order); + $list = $this->pageQuery($search_model); + return $list; + } + + //获取教研管理文章详情 + public function info($id){ + $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,url'; + $LessonCourseTeaching = new LessonCourseTeaching(); + $info = $LessonCourseTeaching->field($field)->where([['id', "=", $id]])->findOrEmpty()->toArray(); + if (is_array($info) && isset($info['type']) && $info['type'] == 2 && !empty($info['url']) && is_string($info['url'])) { + $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? "https://" : "http://"; + $domain = $_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME'] ?? 'localhost'; + $info['url'] = $protocol . $domain . '/' . $info['url']; + } + + return $info; + } + + //获取能看的教研管理类型 + public function lookType($id){ + $LessonCourseTeaching = new LessonCourseTeaching(); + $where = []; + if ($id !== null && $id !== '') { + $where[] = [Db::raw("FIND_IN_SET($id, user_permission)"), '>', 0]; + } + $list = $LessonCourseTeaching->where($where)->distinct(true)->column('table_type'); + return $list; + } +} From 89b9e21057deec1cf6b168f30e8943bc4377a0ef Mon Sep 17 00:00:00 2001 From: wangzeyan <258785420@qq.com> Date: Sun, 18 May 2025 21:06:07 +0800 Subject: [PATCH 11/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E5=92=8C=E6=8E=92=E8=AF=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/package-lock.json | 58 + admin/package.json | 7 +- admin/src/app/views/classroom/classroom.vue | 562 +- .../classroom/components/classroom-edit.vue | 577 +- admin/src/app/views/timetables/timetables.vue | 127 + .../src/app/views/yjpz_config/yjpz_config.vue | 81 +- admin/yarn.lock | 7620 ++++++++--------- 7 files changed, 4403 insertions(+), 4629 deletions(-) create mode 100644 admin/src/app/views/timetables/timetables.vue diff --git a/admin/package-lock.json b/admin/package-lock.json index 2621871f..df8586c1 100644 --- a/admin/package-lock.json +++ b/admin/package-lock.json @@ -9,6 +9,11 @@ "version": "1.0.0", "dependencies": { "@element-plus/icons-vue": "2.0.10", + "@fullcalendar/core": "^6.1.17", + "@fullcalendar/daygrid": "^6.1.17", + "@fullcalendar/interaction": "^6.1.17", + "@fullcalendar/timegrid": "^6.1.17", + "@fullcalendar/vue3": "^6.1.17", "@highlightjs/vue-plugin": "2.1.0", "@types/lodash-es": "4.17.6", "@vueuse/core": "9.12.0", @@ -962,6 +967,50 @@ "resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.1.6.tgz", "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==" }, + "node_modules/@fullcalendar/core": { + "version": "6.1.17", + "resolved": "https://registry.npmmirror.com/@fullcalendar/core/-/core-6.1.17.tgz", + "integrity": "sha512-0W7lnIrv18ruJ5zeWBeNZXO8qCWlzxDdp9COFEsZnyNjiEhUVnrW/dPbjRKYpL0edGG0/Lhs0ghp1z/5ekt8ZA==", + "dependencies": { + "preact": "~10.12.1" + } + }, + "node_modules/@fullcalendar/daygrid": { + "version": "6.1.17", + "resolved": "https://registry.npmmirror.com/@fullcalendar/daygrid/-/daygrid-6.1.17.tgz", + "integrity": "sha512-K7m+pd7oVJ9fW4h7CLDdDGJbc9szJ1xDU1DZ2ag+7oOo1aCNLv44CehzkkknM6r8EYlOOhgaelxQpKAI4glj7A==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.17" + } + }, + "node_modules/@fullcalendar/interaction": { + "version": "6.1.17", + "resolved": "https://registry.npmmirror.com/@fullcalendar/interaction/-/interaction-6.1.17.tgz", + "integrity": "sha512-AudvQvgmJP2FU89wpSulUUjeWv24SuyCx8FzH2WIPVaYg+vDGGYarI7K6PcM3TH7B/CyaBjm5Rqw9lXgnwt5YA==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.17" + } + }, + "node_modules/@fullcalendar/timegrid": { + "version": "6.1.17", + "resolved": "https://registry.npmmirror.com/@fullcalendar/timegrid/-/timegrid-6.1.17.tgz", + "integrity": "sha512-K4PlA3L3lclLOs3IX8cvddeiJI9ZVMD7RA9IqaWwbvac771971foc9tFze9YY+Pqesf6S+vhS2dWtEVlERaGlQ==", + "dependencies": { + "@fullcalendar/daygrid": "~6.1.17" + }, + "peerDependencies": { + "@fullcalendar/core": "~6.1.17" + } + }, + "node_modules/@fullcalendar/vue3": { + "version": "6.1.17", + "resolved": "https://registry.npmmirror.com/@fullcalendar/vue3/-/vue3-6.1.17.tgz", + "integrity": "sha512-0+qi/PK/xCkTQXh2CaeN2AkP+SvQTznPhwBXuIyrtsR0Ua8UpmGEXI+my3qQ6o003r8gPUY2e785ywIyhX2zCA==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.17", + "vue": "^3.0.11" + } + }, "node_modules/@highlightjs/vue-plugin": { "version": "2.1.0", "resolved": "https://registry.npmmirror.com/@highlightjs/vue-plugin/-/vue-plugin-2.1.0.tgz", @@ -4997,6 +5046,15 @@ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true }, + "node_modules/preact": { + "version": "10.12.1", + "resolved": "https://registry.npmmirror.com/preact/-/preact-10.12.1.tgz", + "integrity": "sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz", diff --git a/admin/package.json b/admin/package.json index a113a30d..263f49ca 100644 --- a/admin/package.json +++ b/admin/package.json @@ -10,6 +10,11 @@ }, "dependencies": { "@element-plus/icons-vue": "2.0.10", + "@fullcalendar/core": "^6.1.17", + "@fullcalendar/daygrid": "^6.1.17", + "@fullcalendar/interaction": "^6.1.17", + "@fullcalendar/timegrid": "^6.1.17", + "@fullcalendar/vue3": "^6.1.17", "@highlightjs/vue-plugin": "2.1.0", "@types/lodash-es": "4.17.6", "@vueuse/core": "9.12.0", @@ -55,4 +60,4 @@ "vite": "4.1.0", "vue-tsc": "1.0.24" } -} \ No newline at end of file +} diff --git a/admin/src/app/views/classroom/classroom.vue b/admin/src/app/views/classroom/classroom.vue index a1b11ddd..802324f5 100644 --- a/admin/src/app/views/classroom/classroom.vue +++ b/admin/src/app/views/classroom/classroom.vue @@ -1,280 +1,282 @@ - - - - - + + + + + diff --git a/admin/src/app/views/classroom/components/classroom-edit.vue b/admin/src/app/views/classroom/components/classroom-edit.vue index 569d3824..f389a565 100644 --- a/admin/src/app/views/classroom/components/classroom-edit.vue +++ b/admin/src/app/views/classroom/components/classroom-edit.vue @@ -1,287 +1,290 @@ - - - - - - + + + + + + diff --git a/admin/src/app/views/timetables/timetables.vue b/admin/src/app/views/timetables/timetables.vue new file mode 100644 index 00000000..bbde3c5c --- /dev/null +++ b/admin/src/app/views/timetables/timetables.vue @@ -0,0 +1,127 @@ + + + + + \ No newline at end of file diff --git a/admin/src/app/views/yjpz_config/yjpz_config.vue b/admin/src/app/views/yjpz_config/yjpz_config.vue index b722e31e..cacfcd1d 100644 --- a/admin/src/app/views/yjpz_config/yjpz_config.vue +++ b/admin/src/app/views/yjpz_config/yjpz_config.vue @@ -1,49 +1,54 @@ - - + + + + + diff --git a/admin/src/app/views/physical_test/physical_test_edit.vue b/admin/src/app/views/physical_test/physical_test_edit.vue new file mode 100644 index 00000000..91dd7513 --- /dev/null +++ b/admin/src/app/views/physical_test/physical_test_edit.vue @@ -0,0 +1,300 @@ + + + + + diff --git a/admin/src/router/index.ts b/admin/src/router/index.ts index c19c1bbc..0e0ce1ca 100644 --- a/admin/src/router/index.ts +++ b/admin/src/router/index.ts @@ -1,4 +1,4 @@ -import { createRouter, createWebHistory, RouteLocationRaw, RouteLocationNormalizedLoaded } from 'vue-router' +import { createRouter, createWebHashHistory, RouteLocationRaw, RouteLocationNormalizedLoaded } from 'vue-router' import NProgress from 'nprogress' import 'nprogress/nprogress.css' import { STATIC_ROUTES, NO_LOGIN_ROUTES, ROOT_ROUTER, ADMIN_ROUTE, findFirstValidRoute } from './routers' @@ -8,7 +8,7 @@ import useUserStore from '@/stores/modules/user' import { setWindowTitle, getAppType, urlToRouteRaw } from '@/utils/common' const router = createRouter({ - history: createWebHistory(import.meta.env.BASE_URL), + history: createWebHashHistory(import.meta.env.BASE_URL), routes: [ADMIN_ROUTE, ...STATIC_ROUTES] }) diff --git a/admin/src/utils/common.ts b/admin/src/utils/common.ts index 7a153d9b..5e22b149 100644 --- a/admin/src/utils/common.ts +++ b/admin/src/utils/common.ts @@ -1,6 +1,6 @@ -import type { App } from 'vue' +import type {App} from 'vue' import * as ElementPlusIconsVue from '@element-plus/icons-vue' -import { useCssVar, useTitle } from '@vueuse/core' +import {useCssVar, useTitle} from '@vueuse/core' import colorFunction from 'css-color-function' import storage from './storage' @@ -40,7 +40,7 @@ export function setThemeColor(color: string, mode: string = 'light'): void { } Object.keys(colors[mode]).forEach((key) => { - useCssVar('--el-color-primary' + '-' + key, null).value = colorFunction.convert(`color(${ color } ${ colors[mode][key] })`) + useCssVar('--el-color-primary' + '-' + key, null).value = colorFunction.convert(`color(${color} ${colors[mode][key]})`) }) } @@ -82,7 +82,7 @@ export function getToken(): null | string { * @returns */ export function setToken(token: string): void { - storage.set({ key: 'token', data: token }) + storage.set({key: 'token', data: token}) } /** @@ -127,7 +127,7 @@ export function isUrl(str: string): boolean { * @returns */ export function img(path: string): string { - return isUrl(path) ? path : `${ import.meta.env.VITE_IMG_DOMAIN || location.origin }/${ path }` + return isUrl(path) ? path : `${import.meta.env.VITE_IMG_DOMAIN || location.origin}/${path}` } /** @@ -169,7 +169,7 @@ export function urlToRouteRaw(url: string) { query[name] = value }) - return { path, query } + return {path, query} } const isArray = (value: any) => { @@ -230,7 +230,7 @@ export function guid(len = 10, firstU = true, radix: any = null) { // 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class if (firstU) { uuid.shift() - return `u${ uuid.join('') }` + return `u${uuid.join('')}` } return uuid.join('') } @@ -305,7 +305,7 @@ export function filterDigit(event: any) { const decimalParts = event.target.value.split('.'); if (decimalParts.length > 1 && decimalParts[1].length > 2) { // 如果有小数部分且超过两位,则截取前两位 - event.target.value = `${ decimalParts[0] }.${ decimalParts[1].slice(0, 2) }`; + event.target.value = `${decimalParts[0]}.${decimalParts[1].slice(0, 2)}`; } } @@ -333,6 +333,7 @@ export function filterSpecial(event: any) { export function filterBlank(event: any) { event.target.value = event.target.value.replace(/\s/g, ''); } + export function importIconFontCss() { // const modulesFiles = {}; // import.meta.glob('@/styles/icon/official-iconfont.css', { eager: true }) // const modulesFiles = import.meta.glob('@/addon/**/assets/icon/*.css', { eager: true }) @@ -400,7 +401,7 @@ export function setTablePageStorage(page: any = 1, limit: any = 10, where: any = delete data[Object.keys(data)[0]]; } - storage.set({ key: 'tablePageStorage', data }); + storage.set({key: 'tablePageStorage', data}); } /** @@ -420,3 +421,16 @@ export function getTablePageStorage(where: any = {}) { } return data; } + +/** + * 从path字符串中获取?以后的参数 + */ +export function getQueryString(path: string, name: string) { + var reg = new RegExp('[?&]' + name + '=([^&]+)', 'i'); + var r = path.match(reg); + console.log('r', r); + if (r != null) { + return decodeURIComponent(r[1]); + } + return ''; +} \ No newline at end of file diff --git a/niucloud/app/adminapi/controller/physical_test/PhysicalTest.php b/niucloud/app/adminapi/controller/physical_test/PhysicalTest.php index 5a55a972..01c1cdcb 100644 --- a/niucloud/app/adminapi/controller/physical_test/PhysicalTest.php +++ b/niucloud/app/adminapi/controller/physical_test/PhysicalTest.php @@ -31,20 +31,8 @@ class PhysicalTest extends BaseAdminController ["resource_id",""], ["student_id",""], ["height",""], - ["weight",""], - ["coach_id",""], ["created_at",""], - ["updated_at",""], - ["seated_forward_bend",""], - ["sit_ups",""], - ["push_ups",""], - ["flamingo_balance",""], - ["thirty_sec_jump",""], - ["standing_long_jump",""], - ["agility_run",""], - ["balance_beam",""], - ["tennis_throw",""], - ["ten_meter_shuttle_run",""] + ["updated_at",""] ]); return success((new PhysicalTestService())->getPage($data)); } @@ -69,8 +57,8 @@ class PhysicalTest extends BaseAdminController ["height",0.00], ["weight",0.00], ["coach_id",0], - ["created_at",1747389000], - ["updated_at",1747389000], + ["created_at",1747576653], + ["updated_at",1747576653], ["seated_forward_bend",0.00], ["sit_ups",0.00], ["push_ups",0.00], @@ -99,8 +87,8 @@ class PhysicalTest extends BaseAdminController ["height",0.00], ["weight",0.00], ["coach_id",0], - ["created_at",1747389000], - ["updated_at",1747389000], + ["created_at",1747576653], + ["updated_at",1747576653], ["seated_forward_bend",0.00], ["sit_ups",0.00], ["push_ups",0.00], diff --git a/niucloud/app/adminapi/route/physical_test.php b/niucloud/app/adminapi/route/physical_test.php index 0cdc28f0..16006893 100644 --- a/niucloud/app/adminapi/route/physical_test.php +++ b/niucloud/app/adminapi/route/physical_test.php @@ -15,6 +15,7 @@ use app\adminapi\middleware\AdminCheckRole; use app\adminapi\middleware\AdminCheckToken; use app\adminapi\middleware\AdminLog; + // USER_CODE_BEGIN -- physical_test Route::group('physical_test', function () { diff --git a/niucloud/app/model/physical_test/PhysicalTest.php b/niucloud/app/model/physical_test/PhysicalTest.php index 8e4a2be0..97039146 100644 --- a/niucloud/app/model/physical_test/PhysicalTest.php +++ b/niucloud/app/model/physical_test/PhysicalTest.php @@ -43,19 +43,7 @@ class PhysicalTest extends BaseModel /** - * 搜索器:体测体测编号 - * @param $value - * @param $data - */ - public function searchIdAttr($query, $value, $data) - { - if ($value) { - $query->where("id", $value); - } - } - - /** - * 搜索器:体测资源ID + * 搜索器:体测客户姓名 * @param $value * @param $data */ @@ -67,7 +55,7 @@ class PhysicalTest extends BaseModel } /** - * 搜索器:体测学员ID + * 搜索器:体测学员姓名 * @param $value * @param $data */ @@ -90,30 +78,6 @@ class PhysicalTest extends BaseModel } } - /** - * 搜索器:体测体重 - * @param $value - * @param $data - */ - public function searchWeightAttr($query, $value, $data) - { - if ($value) { - $query->where("weight", $value); - } - } - - /** - * 搜索器:体测教练ID - * @param $value - * @param $data - */ - public function searchCoachIdAttr($query, $value, $data) - { - if ($value) { - $query->where("coach_id", $value); - } - } - /** * 搜索器:体测创建时间 * @param $value @@ -138,126 +102,6 @@ class PhysicalTest extends BaseModel } } - /** - * 搜索器:体测坐位体前屈 - * @param $value - * @param $data - */ - public function searchSeatedForwardBendAttr($query, $value, $data) - { - if ($value) { - $query->where("seated_forward_bend", $value); - } - } - - /** - * 搜索器:体测仰卧卷腹 - * @param $value - * @param $data - */ - public function searchSitUpsAttr($query, $value, $data) - { - if ($value) { - $query->where("sit_ups", $value); - } - } - - /** - * 搜索器:体测九十度仰卧撑 - * @param $value - * @param $data - */ - public function searchPushUpsAttr($query, $value, $data) - { - if ($value) { - $query->where("push_ups", $value); - } - } - - /** - * 搜索器:体测火烈鸟平衡测试 - * @param $value - * @param $data - */ - public function searchFlamingoBalanceAttr($query, $value, $data) - { - if ($value) { - $query->where("flamingo_balance", $value); - } - } - - /** - * 搜索器:体测三十秒双脚连续跳 - * @param $value - * @param $data - */ - public function searchThirtySecJumpAttr($query, $value, $data) - { - if ($value) { - $query->where("thirty_sec_jump", $value); - } - } - - /** - * 搜索器:体测立定跳远 - * @param $value - * @param $data - */ - public function searchStandingLongJumpAttr($query, $value, $data) - { - if ($value) { - $query->where("standing_long_jump", $value); - } - } - - /** - * 搜索器:体测4乘10m灵敏折返跑 - * @param $value - * @param $data - */ - public function searchAgilityRunAttr($query, $value, $data) - { - if ($value) { - $query->where("agility_run", $value); - } - } - - /** - * 搜索器:体测走平衡木 - * @param $value - * @param $data - */ - public function searchBalanceBeamAttr($query, $value, $data) - { - if ($value) { - $query->where("balance_beam", $value); - } - } - - /** - * 搜索器:体测网球掷远 - * @param $value - * @param $data - */ - public function searchTennisThrowAttr($query, $value, $data) - { - if ($value) { - $query->where("tennis_throw", $value); - } - } - - /** - * 搜索器:体测十米往返跑 - * @param $value - * @param $data - */ - public function searchTenMeterShuttleRunAttr($query, $value, $data) - { - if ($value) { - $query->where("ten_meter_shuttle_run", $value); - } - } - diff --git a/niucloud/app/service/admin/physical_test/PhysicalTestService.php b/niucloud/app/service/admin/physical_test/PhysicalTestService.php index c01e49d8..12ad6f23 100644 --- a/niucloud/app/service/admin/physical_test/PhysicalTestService.php +++ b/niucloud/app/service/admin/physical_test/PhysicalTestService.php @@ -39,7 +39,7 @@ class PhysicalTestService extends BaseAdminService $field = 'id,resource_id,student_id,height,weight,coach_id,created_at,updated_at,seated_forward_bend,sit_ups,push_ups,flamingo_balance,thirty_sec_jump,standing_long_jump,agility_run,balance_beam,tennis_throw,ten_meter_shuttle_run'; $order = 'id desc'; - $search_model = $this->model->withSearch(["id","resource_id","student_id","height","weight","coach_id","created_at","updated_at","seated_forward_bend","sit_ups","push_ups","flamingo_balance","thirty_sec_jump","standing_long_jump","agility_run","balance_beam","tennis_throw","ten_meter_shuttle_run"], $where)->field($field)->order($order); + $search_model = $this->model->withSearch(["resource_id","student_id","height","created_at","updated_at"], $where)->field($field)->order($order); $list = $this->pageQuery($search_model); return $list; } From 6fd8bd8c771248d51ca1ad13b112b975386c10ad Mon Sep 17 00:00:00 2001 From: wangzeyan <258785420@qq.com> Date: Sun, 18 May 2025 22:55:50 +0800 Subject: [PATCH 16/29] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/package.json | 5 +- admin/src/App.vue | 24 +- admin/src/addon/shop/api/delivery.ts | 106 +- admin/src/addon/shop/api/electronic_sheet.ts | 60 +- admin/src/addon/shop/api/goods.ts | 325 +- admin/src/addon/shop/api/marketing.ts | 231 +- admin/src/addon/shop/api/order.ts | 77 +- admin/src/addon/shop/api/shop.ts | 12 +- admin/src/addon/shop/api/shop_address.ts | 25 +- admin/src/addon/shop/api/stat.ts | 8 +- .../addon/shop/lang/zh-cn/address.edit.json | 68 +- .../addon/shop/lang/zh-cn/address.list.json | 2 +- admin/src/addon/shop/lang/zh-cn/common.json | 58 +- .../shop/lang/zh-cn/delivery.company.json | 38 +- .../lang/zh-cn/delivery.company_edit.json | 85 +- .../shop/lang/zh-cn/delivery.config.json | 20 +- .../lang/zh-cn/delivery.electronic_sheet.json | 2 +- .../delivery.electronic_sheet_config.json | 2 +- .../zh-cn/delivery.electronic_sheet_edit.json | 2 +- .../addon/shop/lang/zh-cn/delivery.local.json | 108 +- .../shop/lang/zh-cn/delivery.search.json | 38 +- .../addon/shop/lang/zh-cn/delivery.staff.json | 16 +- .../addon/shop/lang/zh-cn/delivery.store.json | 34 +- .../shop/lang/zh-cn/delivery.store_edit.json | 74 +- .../shop/lang/zh-cn/delivery.template.json | 22 +- .../lang/zh-cn/delivery.template_edit.json | 76 +- .../src/addon/shop/lang/zh-cn/goods.attr.json | 4 +- .../shop/lang/zh-cn/goods.attr_edit.json | 2 +- .../shop/lang/zh-cn/goods.brand_list.json | 28 +- .../addon/shop/lang/zh-cn/goods.category.json | 50 +- .../lang/zh-cn/goods.category_config.json | 52 +- .../addon/shop/lang/zh-cn/goods.evaluate.json | 96 +- .../shop/lang/zh-cn/goods.evaluate_edit.json | 72 +- .../lang/zh-cn/goods.label_group_list.json | 2 +- .../shop/lang/zh-cn/goods.label_list.json | 2 +- .../src/addon/shop/lang/zh-cn/goods.list.json | 13 +- .../shop/lang/zh-cn/goods.real_edit.json | 30 +- .../addon/shop/lang/zh-cn/goods.service.json | 18 +- .../shop/lang/zh-cn/goods.virtual_edit.json | 30 +- .../addon/shop/lang/zh-cn/index.index.json | 38 +- .../shop/lang/zh-cn/marketing.coupon.add.json | 82 +- .../lang/zh-cn/marketing.coupon.edit.json | 82 +- .../lang/zh-cn/marketing.coupon.list.json | 90 +- .../lang/zh-cn/marketing.discount.add.json | 72 +- .../lang/zh-cn/marketing.discount.config.json | 14 +- .../lang/zh-cn/marketing.discount.detail.json | 2 +- .../lang/zh-cn/marketing.discount.edit.json | 72 +- .../lang/zh-cn/marketing.discount.list.json | 98 +- .../zh-cn/marketing.exchange.goods_add.json | 124 +- .../zh-cn/marketing.exchange.goods_edit.json | 123 +- .../zh-cn/marketing.exchange.goods_list.json | 52 +- .../zh-cn/marketing.exchange.order_list.json | 106 +- .../lang/zh-cn/marketing.manjian.detail.json | 72 +- .../lang/zh-cn/marketing.manjian.edit.json | 2 +- .../lang/zh-cn/marketing.newcomer.config.json | 88 +- .../zh-cn/marketing.newcomer.order_list.json | 110 +- .../shop/lang/zh-cn/order.batch_delivery.json | 48 +- .../addon/shop/lang/zh-cn/order.config.json | 76 +- .../addon/shop/lang/zh-cn/order.detail.json | 2 +- .../addon/shop/lang/zh-cn/order.invoice.json | 78 +- .../addon/shop/lang/zh-cn/order.refund.json | 210 +- .../shop/lang/zh-cn/order.refund_detail.json | 2 +- .../src/addon/shop/lang/zh-cn/stat.goods.json | 72 +- admin/src/addon/shop/views/address/edit.vue | 726 +- admin/src/addon/shop/views/address/list.vue | 275 +- .../src/addon/shop/views/delivery/company.vue | 281 +- .../shop/views/delivery/company_edit.vue | 626 +- .../components/delivery-personnel-edit.vue | 171 +- .../src/addon/shop/views/delivery/config.vue | 248 +- .../shop/views/delivery/electronic_sheet.vue | 350 +- .../delivery/electronic_sheet_config.vue | 341 +- .../views/delivery/electronic_sheet_edit.vue | 626 +- admin/src/addon/shop/views/delivery/local.vue | 773 +- .../src/addon/shop/views/delivery/search.vue | 260 +- admin/src/addon/shop/views/delivery/staff.vue | 228 +- admin/src/addon/shop/views/delivery/store.vue | 288 +- .../addon/shop/views/delivery/store_edit.vue | 688 +- .../addon/shop/views/delivery/template.vue | 256 +- .../shop/views/delivery/template_edit.vue | 937 +- .../diy/components/edit-goods-coupon.vue | 494 +- .../views/diy/components/edit-goods-list.vue | 742 +- .../diy/components/edit-many-goods-list.vue | 1054 +- .../components/edit-shop-exchange-goods.vue | 211 +- .../components/edit-shop-exchange-info.vue | 41 +- .../components/edit-shop-goods-ranking.vue | 281 +- .../components/edit-shop-goods-recommend.vue | 388 +- .../diy/components/edit-shop-member-info.vue | 71 +- .../diy/components/edit-shop-newcomer.vue | 609 +- .../diy/components/edit-shop-order-info.vue | 205 +- .../views/diy/components/edit-shop-search.vue | 43 +- .../diy/components/edit-single-recommend.vue | 639 +- admin/src/addon/shop/views/goods/attr.vue | 444 +- .../src/addon/shop/views/goods/attr_edit.vue | 862 +- .../src/addon/shop/views/goods/brand_list.vue | 328 +- admin/src/addon/shop/views/goods/category.vue | 399 +- .../shop/views/goods/category_config.vue | 439 +- .../views/goods/components/brand-edit.vue | 197 +- .../views/goods/components/category-edit.vue | 232 +- .../goods/components/coupon-select-popup.vue | 487 +- .../views/goods/components/evaluate-add.vue | 254 +- .../components/goods-batch-settings-popup.vue | 1136 +- .../goods-category-spread-popup.vue | 124 +- .../components/goods-member-price-popup.vue | 535 +- .../components/goods-price-edit-popup.vue | 522 +- .../goods/components/goods-select-popup.vue | 1302 +- .../goods/components/goods-spread-popup.vue | 140 +- .../components/goods-stock-edit-popup.vue | 388 +- .../views/goods/components/label-edit.vue | 336 +- .../goods/components/label-group-edit.vue | 153 +- .../newcomer-goods-select-popup.vue | 1302 +- .../views/goods/components/service-edit.vue | 156 +- admin/src/addon/shop/views/goods/evaluate.vue | 555 +- .../shop/views/goods/label_group_list.vue | 317 +- .../src/addon/shop/views/goods/label_list.vue | 459 +- admin/src/addon/shop/views/goods/list.vue | 1330 +- .../views/goods/public/js/useGoodsEdit.ts | 3027 ++- .../src/addon/shop/views/goods/real_edit.vue | 2279 +- admin/src/addon/shop/views/goods/recycle.vue | 599 +- admin/src/addon/shop/views/goods/service.vue | 243 +- .../addon/shop/views/goods/virtual_edit.vue | 1964 +- admin/src/addon/shop/views/index/index.vue | 709 +- .../addon/shop/views/marketing/coupon/add.vue | 695 +- .../coupon/components/coupon-collection.vue | 331 +- .../coupon/components/coupon-spread-popup.vue | 128 +- .../shop/views/marketing/coupon/edit.vue | 746 +- .../shop/views/marketing/coupon/list.vue | 431 +- .../shop/views/marketing/discount/add.vue | 1567 +- .../discount/components/discount-detail.vue | 871 +- .../discount/components/goods-sku-popup.vue | 1146 +- .../shop/views/marketing/discount/config.vue | 248 +- .../shop/views/marketing/discount/detail.vue | 826 +- .../shop/views/marketing/discount/edit.vue | 1558 +- .../shop/views/marketing/discount/list.vue | 354 +- .../components/goods-select-popup.vue | 381 +- .../exchange/components/goods-sku-select.vue | 219 +- .../views/marketing/exchange/goods_add.vue | 1839 +- .../views/marketing/exchange/goods_edit.vue | 1736 +- .../views/marketing/exchange/goods_list.vue | 403 +- .../views/marketing/exchange/order_list.vue | 430 +- .../components/rank-select-popup.vue | 464 +- .../views/marketing/goods_rank/config.vue | 206 +- .../shop/views/marketing/goods_rank/edit.vue | 822 +- .../shop/views/marketing/goods_rank/list.vue | 469 +- .../src/addon/shop/views/marketing/index.vue | 122 +- .../shop/views/marketing/manjian/detail.vue | 572 +- .../shop/views/marketing/manjian/edit.vue | 2065 +- .../shop/views/marketing/manjian/list.vue | 565 +- .../shop/views/marketing/newcomer/config.vue | 948 +- .../views/marketing/newcomer/order_list.vue | 566 +- .../components/benefits-free-shipping.vue | 76 +- .../views/member/components/gift-coupon.vue | 268 +- .../components/growth-rule-buygoods.vue | 165 +- .../components/growth-rule-buyorder.vue | 137 +- .../member/components/point-rule-buygoods.vue | 169 +- .../components/point-rule-orderdeduction.vue | 167 +- .../components/recharge-detail-coupon.vue | 242 +- .../components/recharge-gift-coupon.vue | 328 +- .../addon/shop/views/order/batch_delivery.vue | 377 +- .../views/order/components/adjust-money.vue | 333 +- .../order/components/delivery-action.vue | 608 +- .../order/components/delivery-package.vue | 225 +- .../components/electronic-sheet-print.vue | 819 +- .../views/order/components/form-detail.vue | 102 +- .../views/order/components/import-data.vue | 143 +- .../views/order/components/invoice-detail.vue | 181 +- .../views/order/components/invoice-dialog.vue | 122 +- .../views/order/components/order-detail.vue | 808 +- .../order/components/order-edit-address.vue | 914 +- .../order/components/order-export-select.vue | 70 +- .../views/order/components/order-notes.vue | 110 +- .../views/order/components/refund-detail.vue | 1105 +- .../order/components/shop-active-refund.vue | 402 +- admin/src/addon/shop/views/order/config.vue | 601 +- admin/src/addon/shop/views/order/detail.vue | 912 +- admin/src/addon/shop/views/order/invoice.vue | 331 +- admin/src/addon/shop/views/order/list.vue | 1102 +- admin/src/addon/shop/views/order/refund.vue | 542 +- .../poster/components/edit-goods-image.vue | 13 +- .../components/edit-goods-market-price.vue | 13 +- .../poster/components/edit-goods-name.vue | 13 +- .../poster/components/edit-goods-price.vue | 13 +- .../poster/components/preview-goods-image.vue | 29 +- .../components/preview-goods-market-price.vue | 62 +- .../poster/components/preview-goods-name.vue | 62 +- .../poster/components/preview-goods-price.vue | 64 +- .../components/preview-goods-order.vue | 456 +- admin/src/addon/shop/views/stat/goods.vue | 1196 +- admin/src/addon/shop/views/stat/index.vue | 557 +- admin/src/addon/shop/views/stat/member.vue | 366 +- admin/src/addon/shop/views/stat/order.vue | 707 +- admin/src/addon/shop/views/stat/visit.vue | 479 +- admin/src/app/api/aaaaaaaaaaa.ts | 21 +- admin/src/app/api/addon.ts | 30 +- admin/src/app/api/aliapp.ts | 6 +- admin/src/app/api/auth.ts | 13 +- admin/src/app/api/cloud.ts | 10 +- admin/src/app/api/customer_resources.ts | 38 +- admin/src/app/api/departments.ts | 23 +- admin/src/app/api/dict.ts | 36 +- admin/src/app/api/diy.ts | 65 +- admin/src/app/api/diy_form.ts | 64 +- admin/src/app/api/future_ontent.ts | 26 +- admin/src/app/api/h5.ts | 4 +- admin/src/app/api/instructional_material.ts | 66 +- admin/src/app/api/lesson_course_teaching.ts | 136 +- admin/src/app/api/member.ts | 180 +- admin/src/app/api/module.ts | 18 +- admin/src/app/api/notice.ts | 24 +- admin/src/app/api/pay.ts | 34 +- admin/src/app/api/pc.ts | 4 +- admin/src/app/api/personal.ts | 5 +- admin/src/app/api/physical_test.ts | 23 +- admin/src/app/api/poster.ts | 40 +- admin/src/app/api/printer.ts | 94 +- admin/src/app/api/six_speed.ts | 30 +- admin/src/app/api/sys.ts | 216 +- admin/src/app/api/tools.ts | 52 +- admin/src/app/api/upgrade.ts | 13 +- admin/src/app/api/user.ts | 18 +- admin/src/app/api/venue.ts | 29 +- admin/src/app/api/verify.ts | 18 +- admin/src/app/api/weapp.ts | 40 +- admin/src/app/api/web.ts | 73 +- admin/src/app/api/wechat.ts | 48 +- .../src/app/components/cloud-build/index.vue | 433 +- admin/src/app/components/upgrade/index.vue | 593 +- .../app/components/user-info-edit/index.vue | 119 +- admin/src/app/lang/en/403.json | 4 +- admin/src/app/lang/en/auth.menu.json | 40 +- admin/src/app/lang/en/index.json | 48 +- admin/src/app/lang/en/login.json | 12 +- admin/src/app/lang/en/member.member.json | 49 +- admin/src/app/lang/en/user.center.json | 26 +- admin/src/app/lang/zh-cn/403.json | 4 +- admin/src/app/lang/zh-cn/app.authorize.json | 34 +- admin/src/app/lang/zh-cn/app.index.json | 8 +- admin/src/app/lang/zh-cn/app.store.json | 130 +- admin/src/app/lang/zh-cn/auth.log.json | 36 +- admin/src/app/lang/zh-cn/auth.menu.json | 62 +- admin/src/app/lang/zh-cn/auth.role.json | 20 +- admin/src/app/lang/zh-cn/auth.user.json | 62 +- .../app/lang/zh-cn/channel.aliapp.access.json | 44 +- .../app/lang/zh-cn/channel.aliapp.config.json | 65 +- .../app/lang/zh-cn/channel.aliapp.course.json | 18 +- .../src/app/lang/zh-cn/channel.h5.config.json | 11 +- .../src/app/lang/zh-cn/channel.pc.config.json | 14 +- .../app/lang/zh-cn/channel.weapp.access.json | 50 +- .../app/lang/zh-cn/channel.weapp.code.json | 88 +- .../app/lang/zh-cn/channel.weapp.config.json | 74 +- .../app/lang/zh-cn/channel.weapp.course.json | 18 +- .../lang/zh-cn/channel.weapp.template.json | 40 +- .../app/lang/zh-cn/channel.wechat.access.json | 44 +- .../app/lang/zh-cn/channel.wechat.config.json | 64 +- .../app/lang/zh-cn/channel.wechat.course.json | 18 +- .../channel.wechat.keyword_reply_edit.json | 26 +- .../app/lang/zh-cn/channel.wechat.menu.json | 46 +- .../app/lang/zh-cn/channel.wechat.reply.json | 20 +- .../zh-cn/children_like.children_like.json | 70 +- admin/src/app/lang/zh-cn/class.class.json | 52 +- .../app/lang/zh-cn/classroom.classroom.json | 52 +- ...customer_resources.customer_resources.json | 74 +- .../src/app/lang/zh-cn/decorate.preview.json | 2 +- .../lang/zh-cn/departments.departments.json | 28 +- admin/src/app/lang/zh-cn/dict.list.json | 44 +- admin/src/app/lang/zh-cn/diy.list.json | 2 +- admin/src/app/lang/zh-cn/diy.preview.json | 2 +- admin/src/app/lang/zh-cn/diy.route.json | 2 +- admin/src/app/lang/zh-cn/diy.tabbar.json | 2 +- admin/src/app/lang/zh-cn/diy.tabbar_edit.json | 2 +- admin/src/app/lang/zh-cn/diy_form.edit.json | 76 +- admin/src/app/lang/zh-cn/diy_form.list.json | 139 +- .../zh-cn/exam_questions.exam_questions.json | 64 +- admin/src/app/lang/zh-cn/finance.account.json | 50 +- .../src/app/lang/zh-cn/finance.cash_out.json | 124 +- .../app/lang/zh-cn/finance.offlinepay.json | 32 +- .../app/lang/zh-cn/finance.pay_detail.json | 32 +- .../app/lang/zh-cn/finance.pay_refund.json | 30 +- .../app/lang/zh-cn/finance.refund_detail.json | 30 +- .../zh-cn/future_ontent.future_ontent.json | 70 +- .../src/app/lang/zh-cn/index.app_manage.json | 6 +- admin/src/app/lang/zh-cn/index.index.json | 102 +- admin/src/app/lang/zh-cn/index.preview.json | 2 +- .../src/app/lang/zh-cn/index.site_index.json | 132 +- admin/src/app/lang/zh-cn/index.store.json | 148 +- ...ional_material.instructional_material.json | 75 +- ...ourse_teaching.lesson_course_teaching.json | 90 +- admin/src/app/lang/zh-cn/login.json | 20 +- .../app/lang/zh-cn/marketing.sign_config.json | 80 +- .../app/lang/zh-cn/marketing.sign_list.json | 28 +- .../app/lang/zh-cn/marketing.verifier.json | 60 +- .../src/app/lang/zh-cn/marketing.verify.json | 62 +- admin/src/app/lang/zh-cn/member.balance.json | 66 +- .../src/app/lang/zh-cn/member.commission.json | 63 +- admin/src/app/lang/zh-cn/member.growth.json | 58 +- .../src/app/lang/zh-cn/member.label.edit.json | 20 +- admin/src/app/lang/zh-cn/member.label.json | 31 +- admin/src/app/lang/zh-cn/member.level.json | 24 +- .../src/app/lang/zh-cn/member.level_edit.json | 46 +- admin/src/app/lang/zh-cn/member.member.json | 159 +- .../app/lang/zh-cn/member.member_detail.json | 106 +- admin/src/app/lang/zh-cn/member.point.json | 58 +- .../app/lang/zh-cn/order.recharge.detail.json | 36 +- .../app/lang/zh-cn/order.recharge.list.json | 44 +- .../app/lang/zh-cn/order.recharge.refund.json | 44 +- .../zh-cn/physical_test.physical_test.json | 32 +- .../physical_test.physical_test_edit.json | 76 +- .../physical_testing.physical_testing.json | 74 +- admin/src/app/lang/zh-cn/poster.edit.json | 4 +- admin/src/app/lang/zh-cn/poster.list.json | 2 +- admin/src/app/lang/zh-cn/printer.edit.json | 2 +- admin/src/app/lang/zh-cn/printer.list.json | 2 +- .../app/lang/zh-cn/printer.template_edit.json | 2 +- .../app/lang/zh-cn/printer.template_list.json | 2 +- ...ofessional_skills.professional_skills.json | 86 +- .../app/lang/zh-cn/setting.adminlogin.json | 10 +- .../src/app/lang/zh-cn/setting.agreement.json | 10 +- .../lang/zh-cn/setting.agreement_edit.json | 12 +- .../src/app/lang/zh-cn/setting.cash_out.json | 40 +- .../src/app/lang/zh-cn/setting.copyright.json | 35 +- .../lang/zh-cn/setting.developer_token.json | 6 +- admin/src/app/lang/zh-cn/setting.export.json | 28 +- .../app/lang/zh-cn/setting.growth_rule.json | 6 +- admin/src/app/lang/zh-cn/setting.layout.json | 14 +- admin/src/app/lang/zh-cn/setting.login.json | 2 +- admin/src/app/lang/zh-cn/setting.map.json | 20 +- admin/src/app/lang/zh-cn/setting.member.json | 20 +- admin/src/app/lang/zh-cn/setting.notice.json | 42 +- .../lang/zh-cn/setting.notice_records.json | 68 +- admin/src/app/lang/zh-cn/setting.pay.json | 170 +- admin/src/app/lang/zh-cn/setting.sms.json | 40 +- .../app/lang/zh-cn/setting.sms_records.json | 68 +- admin/src/app/lang/zh-cn/setting.storage.json | 80 +- admin/src/app/lang/zh-cn/setting.system.json | 66 +- .../src/app/lang/zh-cn/setting.transfer.json | 61 +- admin/src/app/lang/zh-cn/setting.weapp.json | 22 +- .../app/lang/zh-cn/setting.wxoplatform.json | 36 +- .../app/lang/zh-cn/six_speed.six_speed.json | 56 +- .../src/app/lang/zh-cn/tools.addon.edit.json | 64 +- .../src/app/lang/zh-cn/tools.addon.index.json | 58 +- admin/src/app/lang/zh-cn/tools.code.edit.json | 284 +- .../src/app/lang/zh-cn/tools.code.index.json | 96 +- admin/src/app/lang/zh-cn/tools.detection.json | 30 +- admin/src/app/lang/zh-cn/tools.schedule.json | 66 +- .../app/lang/zh-cn/tools.schedule_log.json | 34 +- .../src/app/lang/zh-cn/tools.updatecache.json | 12 +- admin/src/app/lang/zh-cn/user.center.json | 10 +- .../src/app/lang/zh-cn/user.edit_center.json | 34 +- admin/src/app/lang/zh-cn/venue.venue.json | 44 +- .../src/app/views/aaaaaaaaaaa/aaaaaaaaaaa.vue | 241 +- .../components/aaaaaaaaaaa-edit.vue | 213 +- admin/src/app/views/app/authorize.vue | 486 +- admin/src/app/views/app/index.vue | 150 +- .../app/views/auth/components/edit-menu.vue | 473 +- .../app/views/auth/components/edit-role.vue | 302 +- .../app/views/auth/components/edit-user.vue | 344 +- .../auth/components/select-menu-item.vue | 44 +- .../views/auth/components/user-log-detail.vue | 89 +- admin/src/app/views/auth/log.vue | 215 +- admin/src/app/views/auth/menu.vue | 351 +- admin/src/app/views/auth/role.vue | 217 +- admin/src/app/views/auth/user.vue | 364 +- .../binding_personnel/binding_personnel.vue | 289 +- .../campus_person_role/campus_person_role.vue | 181 +- .../components/campus-person-role-edit.vue | 136 +- admin/src/app/views/channel/aliapp/access.vue | 185 +- admin/src/app/views/channel/aliapp/config.vue | 305 +- admin/src/app/views/channel/aliapp/course.vue | 259 +- admin/src/app/views/channel/h5/config.vue | 156 +- admin/src/app/views/channel/pc/config.vue | 163 +- admin/src/app/views/channel/weapp/access.vue | 229 +- admin/src/app/views/channel/weapp/code.vue | 493 +- admin/src/app/views/channel/weapp/config.vue | 505 +- admin/src/app/views/channel/weapp/course.vue | 149 +- .../src/app/views/channel/weapp/template.vue | 286 +- admin/src/app/views/channel/wechat/access.vue | 199 +- .../channel/wechat/components/menu-form.vue | 252 +- .../channel/wechat/components/news-card.vue | 100 +- .../channel/wechat/components/reply-form.vue | 574 +- .../wechat/components/select-wechat-media.vue | 467 +- .../wechat/components/upload-media.vue | 56 +- admin/src/app/views/channel/wechat/config.vue | 467 +- admin/src/app/views/channel/wechat/course.vue | 157 +- .../channel/wechat/keyword_reply_edit.vue | 322 +- admin/src/app/views/channel/wechat/menu.vue | 455 +- admin/src/app/views/channel/wechat/reply.vue | 318 +- .../src/app/views/channel/wechat/template.vue | 329 +- .../app/views/children_like/children_like.vue | 560 +- .../components/Jump-lesson-library-edit.vue | 401 +- .../basketball-course-teaching-edit.vue | 363 +- .../components/en-course-teaching-edit.vue | 388 +- .../lesson-course-teaching-edit.vue | 392 +- .../components/ninja-teaching-edit.vue | 363 +- .../components/physical-teaching-edit.vue | 360 +- .../components/security-teaching-edit.vue | 365 +- .../strengthen-course-teaching-edit.vue | 364 +- .../views/children_like/physical_testing.vue | 748 +- admin/src/app/views/classroom/classroom.vue | 544 +- .../classroom/components/classroom-edit.vue | 494 +- .../customer_resource_changes.vue | 47 +- .../components/customer-resources-edit.vue | 1370 +- .../customer_resources/components/fp.vue | 218 +- .../customer_resources/customer_resources.vue | 638 +- .../components/departments-edit.vue | 242 +- .../src/app/views/departments/departments.vue | 306 +- admin/src/app/views/dict/components/dict.vue | 270 +- admin/src/app/views/dict/components/edit.vue | 257 +- admin/src/app/views/dict/list.vue | 237 +- .../app/views/diy/components/add-theme.vue | 176 +- .../views/diy/components/edit-active-cube.vue | 1225 +- .../diy/components/edit-carousel-search.vue | 1318 +- .../views/diy/components/edit-float-btn.vue | 315 +- .../views/diy/components/edit-graphic-nav.vue | 548 +- .../views/diy/components/edit-horz-blank.vue | 43 +- .../views/diy/components/edit-horz-line.vue | 74 +- .../views/diy/components/edit-hot-area.vue | 92 +- .../views/diy/components/edit-image-ads.vue | 283 +- .../views/diy/components/edit-member-info.vue | 49 +- .../diy/components/edit-member-level.vue | 201 +- .../app/views/diy/components/edit-notice.vue | 404 +- .../app/views/diy/components/edit-page.vue | 477 +- .../diy/components/edit-picture-show.vue | 352 +- .../views/diy/components/edit-rich-text.vue | 45 +- .../views/diy/components/edit-rubik-cube.vue | 1252 +- .../app/views/diy/components/edit-text.vue | 306 +- .../app/views/diy/components/edit-theme.vue | 430 +- .../app/views/diy/components/theme-list.vue | 295 +- admin/src/app/views/diy/edit.vue | 1599 +- admin/src/app/views/diy/index.vue | 594 +- admin/src/app/views/diy/list.vue | 708 +- admin/src/app/views/diy/member.vue | 663 +- admin/src/app/views/diy/route.vue | 543 +- admin/src/app/views/diy/tabbar.vue | 187 +- admin/src/app/views/diy/tabbar_edit.vue | 496 +- admin/src/app/views/diy/theme_style.vue | 142 +- .../diy_form/components/detail-form-image.vue | 43 +- .../components/detail-form-render.vue | 22 +- .../diy_form/components/edit-form-address.vue | 112 +- .../components/edit-form-checkbox.vue | 339 +- .../components/edit-form-date-scope.vue | 391 +- .../diy_form/components/edit-form-date.vue | 189 +- .../diy_form/components/edit-form-email.vue | 61 +- .../diy_form/components/edit-form-file.vue | 55 +- .../components/edit-form-identity.vue | 131 +- .../diy_form/components/edit-form-image.vue | 125 +- .../diy_form/components/edit-form-input.vue | 165 +- .../components/edit-form-location.vue | 101 +- .../diy_form/components/edit-form-mobile.vue | 131 +- .../diy_form/components/edit-form-number.vue | 205 +- .../diy_form/components/edit-form-radio.vue | 343 +- .../diy_form/components/edit-form-submit.vue | 218 +- .../diy_form/components/edit-form-table.vue | 47 +- .../components/edit-form-textarea.vue | 105 +- .../components/edit-form-time-scope.vue | 370 +- .../diy_form/components/edit-form-time.vue | 142 +- .../diy_form/components/edit-form-video.vue | 49 +- .../components/edit-form-wechat-name.vue | 61 +- .../diy_form/components/form-spread-popup.vue | 212 +- .../diy_form/components/form-submit-popup.vue | 858 +- .../diy_form/components/form-write-popup.vue | 686 +- admin/src/app/views/diy_form/edit.vue | 2050 +- admin/src/app/views/diy_form/list.vue | 987 +- admin/src/app/views/diy_form/records.vue | 542 +- admin/src/app/views/error/404.vue | 85 +- admin/src/app/views/finance/account.vue | 516 +- admin/src/app/views/finance/cash_out.vue | 1672 +- .../finance/components/refund-detail.vue | 272 +- admin/src/app/views/finance/offlinepay.vue | 325 +- admin/src/app/views/finance/pay_detail.vue | 197 +- admin/src/app/views/finance/pay_refund.vue | 207 +- admin/src/app/views/finance/refund_detail.vue | 260 +- .../components/Jump-lesson-library-edit.vue | 401 +- .../basketball-course-teaching-edit.vue | 360 +- .../components/en-course-teaching-edit.vue | 388 +- .../lesson-course-teaching-edit.vue | 392 +- .../components/ninja-teaching-edit.vue | 356 +- .../components/physical-teaching-edit.vue | 360 +- .../components/security-teaching-edit.vue | 360 +- .../strengthen-course-teaching-edit.vue | 357 +- .../app/views/future_ontent/future_ontent.vue | 1039 +- .../future_ontent/lesson_course_teaching.vue | 2603 +- admin/src/app/views/index/app_manage.vue | 228 +- admin/src/app/views/index/edit_personal.vue | 143 +- admin/src/app/views/index/personal.vue | 139 +- admin/src/app/views/index/preview.vue | 350 +- admin/src/app/views/index/store.vue | 1879 +- .../components/Jump-lesson-library-edit.vue | 395 +- .../basketball-course-teaching-edit.vue | 389 +- .../components/en-course-teaching-edit.vue | 384 +- .../lesson-course-teaching-edit.vue | 384 +- .../components/ninja-teaching-edit.vue | 356 +- .../components/physical-teaching-edit.vue | 360 +- .../components/security-teaching-edit.vue | 360 +- .../strengthen-course-teaching-edit.vue | 357 +- .../instructional_material.vue | 1337 +- .../lesson_course_teaching.vue | 2603 +- .../components/Jump-lesson-library-edit.vue | 392 +- .../basketball-course-teaching-edit.vue | 388 +- .../components/en-course-teaching-edit.vue | 381 +- .../lesson-course-teaching-edit.vue | 385 +- .../components/ninja-teaching-edit.vue | 382 +- .../components/physical-teaching-edit.vue | 388 +- .../components/security-teaching-edit.vue | 388 +- .../strengthen-course-teaching-edit.vue | 383 +- .../lesson_course_teaching.vue | 2568 +- admin/src/app/views/login/index.vue | 195 +- .../marketing/components/sign-continue.vue | 234 +- .../views/marketing/components/sign-day.vue | 80 +- .../marketing/components/verify-detail.vue | 280 +- admin/src/app/views/marketing/sign_config.vue | 654 +- admin/src/app/views/marketing/sign_list.vue | 273 +- admin/src/app/views/marketing/verifier.vue | 377 +- admin/src/app/views/marketing/verify.vue | 296 +- .../src/app/views/marketing/verify_detail.vue | 235 +- admin/src/app/views/member/balance.vue | 516 +- admin/src/app/views/member/commission.vue | 458 +- .../views/member/components/add-member.vue | 289 +- .../member/components/benefits-discount.vue | 148 +- .../views/member/components/detail-member.vue | 750 +- .../views/member/components/edit-label.vue | 202 +- .../views/member/components/edit-member.vue | 324 +- .../views/member/components/gift-balance.vue | 135 +- .../views/member/components/gift-point.vue | 133 +- .../components/growth-rule-register.vue | 137 +- .../member/components/member-balance-edit.vue | 223 +- .../member/components/member-balance-info.vue | 168 +- .../member/components/member-benefits.vue | 79 +- .../components/member-commission-info.vue | 168 +- .../views/member/components/member-gift.vue | 79 +- .../member/components/member-money-info.vue | 154 +- .../member/components/member-point-edit.vue | 223 +- .../member/components/member-point-info.vue | 170 +- .../member/components/point-rule-register.vue | 137 +- admin/src/app/views/member/growth.vue | 304 +- admin/src/app/views/member/label.vue | 230 +- admin/src/app/views/member/level.vue | 267 +- admin/src/app/views/member/level_edit.vue | 263 +- admin/src/app/views/member/member.vue | 535 +- admin/src/app/views/member/member_detail.vue | 754 +- admin/src/app/views/member/point.vue | 391 +- .../app/views/physical_test/physical_test.vue | 428 +- .../physical_test/physical_test_edit.vue | 683 +- .../components/Jump-lesson-library-edit.vue | 401 +- .../basketball-course-teaching-edit.vue | 391 +- .../components/en-course-teaching-edit.vue | 388 +- .../lesson-course-teaching-edit.vue | 392 +- .../components/ninja-teaching-edit.vue | 363 +- .../components/physical-teaching-edit.vue | 360 +- .../components/security-teaching-edit.vue | 365 +- .../strengthen-course-teaching-edit.vue | 364 +- .../physical_testing/physical_testing.vue | 733 +- .../physical_testing/professional_skills.vue | 1268 +- .../app/views/poster/components/edit-draw.vue | 13 +- .../components/edit-friendspay-message.vue | 13 +- .../components/edit-friendspay-money.vue | 13 +- .../views/poster/components/edit-headimg.vue | 54 +- .../views/poster/components/edit-image.vue | 59 +- .../views/poster/components/edit-nickname.vue | 21 +- .../app/views/poster/components/edit-page.vue | 79 +- .../views/poster/components/edit-qrcode.vue | 13 +- .../app/views/poster/components/edit-text.vue | 50 +- .../views/poster/components/preview-draw.vue | 35 +- .../components/preview-friendspay-message.vue | 62 +- .../components/preview-friendspay-money.vue | 62 +- .../poster/components/preview-headimg.vue | 38 +- .../views/poster/components/preview-image.vue | 35 +- .../poster/components/preview-nickname.vue | 62 +- .../poster/components/preview-qrcode.vue | 32 +- .../views/poster/components/preview-text.vue | 62 +- admin/src/app/views/poster/edit.vue | 1360 +- admin/src/app/views/poster/list.vue | 552 +- admin/src/app/views/printer/edit.vue | 796 +- admin/src/app/views/printer/list.vue | 398 +- admin/src/app/views/printer/template_edit.vue | 759 +- admin/src/app/views/printer/template_list.vue | 282 +- .../components/Jump-lesson-library-edit.vue | 401 +- .../basketball-course-teaching-edit.vue | 391 +- .../components/en-course-teaching-edit.vue | 388 +- .../lesson-course-teaching-edit.vue | 392 +- .../components/ninja-teaching-edit.vue | 391 +- .../components/physical-teaching-edit.vue | 360 +- .../components/security-teaching-edit.vue | 393 +- .../strengthen-course-teaching-edit.vue | 390 +- .../professional_skills/future_ontent.vue | 1052 +- .../professional_skills.vue | 1238 +- admin/src/app/views/setting/adminlogin.vue | 88 +- admin/src/app/views/setting/agreement.vue | 118 +- .../src/app/views/setting/agreement_edit.vue | 171 +- admin/src/app/views/setting/cash_out.vue | 256 +- .../views/setting/components/cron-info.vue | 170 +- .../components/notice-records-info.vue | 124 +- .../views/setting/components/notice-sms.vue | 178 +- .../views/setting/components/notice-weapp.vue | 167 +- .../setting/components/notice-wechat.vue | 205 +- .../views/setting/components/pay-alipay.vue | 270 +- .../setting/components/pay-friendspay.vue | 385 +- .../setting/components/pay-offlinepay.vue | 190 +- .../setting/components/pay-wechatpay.vue | 414 +- .../app/views/setting/components/sms-ali.vue | 190 +- .../setting/components/sms-records-info.vue | 110 +- .../views/setting/components/sms-tencent.vue | 222 +- .../views/setting/components/storage-ali.vue | 240 +- .../setting/components/storage-local.vue | 115 +- .../setting/components/storage-qiniu.vue | 223 +- .../setting/components/storage-tencent.vue | 242 +- admin/src/app/views/setting/copyright.vue | 195 +- admin/src/app/views/setting/cron.vue | 246 +- .../src/app/views/setting/developer_token.vue | 83 +- admin/src/app/views/setting/export.vue | 342 +- admin/src/app/views/setting/growth_rule.vue | 157 +- admin/src/app/views/setting/login.vue | 251 +- admin/src/app/views/setting/map.vue | 171 +- admin/src/app/views/setting/member.vue | 168 +- admin/src/app/views/setting/notice.vue | 348 +- .../src/app/views/setting/notice_records.vue | 343 +- admin/src/app/views/setting/pay.vue | 329 +- admin/src/app/views/setting/point_rule.vue | 221 +- admin/src/app/views/setting/sms.vue | 120 +- admin/src/app/views/setting/sms_records.vue | 319 +- admin/src/app/views/setting/storage.vue | 124 +- admin/src/app/views/setting/system.vue | 288 +- admin/src/app/views/setting/transfer.vue | 267 +- admin/src/app/views/setting/weapp.vue | 329 +- .../six_speed/components/six-speed-edit.vue | 774 +- admin/src/app/views/six_speed/six_speed.vue | 509 +- .../six_speed_modification_log.vue | 50 +- admin/src/app/views/timetables/timetables.vue | 70 +- admin/src/app/views/tools/addon/edit.vue | 443 +- admin/src/app/views/tools/addon/index.vue | 482 +- admin/src/app/views/tools/attachment.vue | 99 +- .../views/tools/code/components/add-table.vue | 126 +- .../tools/code/components/edit-associated.vue | 273 +- .../tools/code/components/edit-verify.vue | 242 +- .../tools/code/components/edit-view-type.vue | 410 +- admin/src/app/views/tools/code/edit.vue | 1231 +- admin/src/app/views/tools/code/index.vue | 695 +- admin/src/app/views/tools/detection.vue | 188 +- admin/src/app/views/tools/schedule.vue | 636 +- admin/src/app/views/tools/schedule_log.vue | 606 +- admin/src/app/views/tools/updatecache.vue | 83 +- admin/src/app/views/venue/venue.vue | 600 +- admin/src/app/views/web/adv.vue | 254 +- admin/src/app/views/web/adv_position.vue | 75 +- .../src/app/views/web/components/adv-edit.vue | 220 +- .../web/components/friendly-link-edit.vue | 234 +- .../src/app/views/web/components/nav-edit.vue | 233 +- admin/src/app/views/web/friendly_link.vue | 283 +- admin/src/app/views/web/nav.vue | 304 +- admin/src/app/views/yjfp/yjfp.vue | 2 +- admin/src/components/diy-link/index.vue | 543 +- admin/src/components/editor/index.vue | 108 +- admin/src/components/export-sure/index.vue | 108 +- admin/src/components/heat-map/index.vue | 1154 +- admin/src/components/icon/index.vue | 61 +- admin/src/components/popover-input/index.vue | 98 +- admin/src/components/range-input/index.vue | 56 +- admin/src/components/select-area/index.vue | 210 +- admin/src/components/select-icon/index.vue | 245 +- .../upload-attachment/attachment.vue | 1159 +- .../components/upload-attachment/index.vue | 105 +- admin/src/components/upload-file/index.vue | 67 +- admin/src/components/upload-image/index.vue | 348 +- admin/src/components/upload-video/index.vue | 280 +- admin/src/components/verifition/Verify.vue | 883 +- .../verifition/Verify/VerifyPoints.vue | 536 +- .../verifition/Verify/VerifySlide.vue | 808 +- admin/src/components/verifition/api/index.js | 28 +- admin/src/components/verifition/utils/ase.js | 13 +- .../src/components/verifition/utils/axios.js | 17 +- admin/src/components/verifition/utils/util.js | 126 +- admin/src/components/video-player/index.vue | 2 +- admin/src/components/web-link/web-link.vue | 334 +- admin/src/lang/en/common.json | 74 +- admin/src/lang/i18n.ts | 42 +- admin/src/lang/index.ts | 27 +- admin/src/lang/language.ts | 107 +- admin/src/lang/zh-cn/common.json | 2 +- admin/src/layout/decorate/index.vue | 9 +- .../layout/default/components/aside/index.vue | 78 +- .../default/components/aside/menu-item.vue | 181 +- .../layout/default/components/aside/side.vue | 150 +- .../default/components/header/index.vue | 247 +- .../components/header/layout-setting.vue | 130 +- .../default/components/header/switch-lang.vue | 36 +- .../default/components/header/user-info.vue | 255 +- admin/src/layout/default/components/tabs.vue | 164 +- admin/src/layout/default/index.vue | 55 +- admin/src/layout/index.vue | 21 +- .../layout/major/components/aside/index.vue | 60 +- .../major/components/aside/menu-item.vue | 119 +- .../layout/major/components/aside/side.vue | 414 +- .../layout/major/components/header/index.vue | 225 +- .../components/header/layout-setting.vue | 130 +- .../major/components/header/switch-lang.vue | 36 +- .../major/components/header/user-info.vue | 248 +- admin/src/layout/major/components/tabs.vue | 165 +- admin/src/layout/major/index.vue | 48 +- admin/src/main.ts | 20 +- admin/src/router/index.ts | 189 +- admin/src/router/routers.ts | 196 +- admin/src/stores/index.ts | 2 +- admin/src/stores/modules/app.ts | 40 +- admin/src/stores/modules/diy.ts | 1010 +- admin/src/stores/modules/poster.ts | 1564 +- admin/src/stores/modules/style.ts | 26 +- admin/src/stores/modules/system.ts | 88 +- admin/src/stores/modules/tabbar.ts | 80 +- admin/src/stores/modules/user.ts | 140 +- admin/src/styles/icon/official-iconfont.json | 2 +- admin/src/types/global.d.ts | 22 +- admin/src/utils/common.ts | 485 +- admin/src/utils/lodop.ts | 414 +- admin/src/utils/qqmap.ts | 269 +- admin/src/utils/request.ts | 375 +- admin/src/utils/storage.ts | 97 +- admin/src/utils/test.ts | 483 +- node_modules/.bin/prettier | 16 + node_modules/.bin/prettier.cmd | 17 + node_modules/.bin/prettier.ps1 | 28 + node_modules/.package-lock.json | 23 + node_modules/prettier/LICENSE | 7 + node_modules/prettier/README.md | 108 + node_modules/prettier/THIRD-PARTY-NOTICES.md | 4416 +++ node_modules/prettier/bin/prettier.cjs | 68 + node_modules/prettier/doc.d.ts | 254 + node_modules/prettier/doc.js | 1261 + node_modules/prettier/doc.mjs | 1233 + node_modules/prettier/index.cjs | 682 + node_modules/prettier/index.d.ts | 956 + node_modules/prettier/index.mjs | 22242 ++++++++++++++++ node_modules/prettier/internal/cli.mjs | 4873 ++++ node_modules/prettier/package.json | 200 + node_modules/prettier/plugins/acorn.d.ts | 6 + node_modules/prettier/plugins/acorn.js | 15 + node_modules/prettier/plugins/acorn.mjs | 15 + node_modules/prettier/plugins/angular.d.ts | 8 + node_modules/prettier/plugins/angular.js | 2 + node_modules/prettier/plugins/angular.mjs | 2 + node_modules/prettier/plugins/babel.d.ts | 18 + node_modules/prettier/plugins/babel.js | 15 + node_modules/prettier/plugins/babel.mjs | 15 + node_modules/prettier/plugins/estree.d.ts | 1 + node_modules/prettier/plugins/estree.js | 36 + node_modules/prettier/plugins/estree.mjs | 36 + node_modules/prettier/plugins/flow.d.ts | 5 + node_modules/prettier/plugins/flow.js | 19 + node_modules/prettier/plugins/flow.mjs | 19 + node_modules/prettier/plugins/glimmer.d.ts | 5 + node_modules/prettier/plugins/glimmer.js | 30 + node_modules/prettier/plugins/glimmer.mjs | 30 + node_modules/prettier/plugins/graphql.d.ts | 5 + node_modules/prettier/plugins/graphql.js | 29 + node_modules/prettier/plugins/graphql.mjs | 29 + node_modules/prettier/plugins/html.d.ts | 8 + node_modules/prettier/plugins/html.js | 22 + node_modules/prettier/plugins/html.mjs | 22 + node_modules/prettier/plugins/markdown.d.ts | 7 + node_modules/prettier/plugins/markdown.js | 63 + node_modules/prettier/plugins/markdown.mjs | 63 + node_modules/prettier/plugins/meriyah.d.ts | 5 + node_modules/prettier/plugins/meriyah.js | 4 + node_modules/prettier/plugins/meriyah.mjs | 4 + node_modules/prettier/plugins/postcss.d.ts | 7 + node_modules/prettier/plugins/postcss.js | 54 + node_modules/prettier/plugins/postcss.mjs | 54 + node_modules/prettier/plugins/typescript.d.ts | 5 + node_modules/prettier/plugins/typescript.js | 20 + node_modules/prettier/plugins/typescript.mjs | 20 + node_modules/prettier/plugins/yaml.d.ts | 5 + node_modules/prettier/plugins/yaml.js | 161 + node_modules/prettier/plugins/yaml.mjs | 161 + node_modules/prettier/standalone.d.ts | 33 + node_modules/prettier/standalone.js | 39 + node_modules/prettier/standalone.mjs | 39 + package-lock.json | 28 + package.json | 5 + 775 files changed, 159635 insertions(+), 85031 deletions(-) create mode 100644 node_modules/.bin/prettier create mode 100644 node_modules/.bin/prettier.cmd create mode 100644 node_modules/.bin/prettier.ps1 create mode 100644 node_modules/.package-lock.json create mode 100644 node_modules/prettier/LICENSE create mode 100644 node_modules/prettier/README.md create mode 100644 node_modules/prettier/THIRD-PARTY-NOTICES.md create mode 100644 node_modules/prettier/bin/prettier.cjs create mode 100644 node_modules/prettier/doc.d.ts create mode 100644 node_modules/prettier/doc.js create mode 100644 node_modules/prettier/doc.mjs create mode 100644 node_modules/prettier/index.cjs create mode 100644 node_modules/prettier/index.d.ts create mode 100644 node_modules/prettier/index.mjs create mode 100644 node_modules/prettier/internal/cli.mjs create mode 100644 node_modules/prettier/package.json create mode 100644 node_modules/prettier/plugins/acorn.d.ts create mode 100644 node_modules/prettier/plugins/acorn.js create mode 100644 node_modules/prettier/plugins/acorn.mjs create mode 100644 node_modules/prettier/plugins/angular.d.ts create mode 100644 node_modules/prettier/plugins/angular.js create mode 100644 node_modules/prettier/plugins/angular.mjs create mode 100644 node_modules/prettier/plugins/babel.d.ts create mode 100644 node_modules/prettier/plugins/babel.js create mode 100644 node_modules/prettier/plugins/babel.mjs create mode 100644 node_modules/prettier/plugins/estree.d.ts create mode 100644 node_modules/prettier/plugins/estree.js create mode 100644 node_modules/prettier/plugins/estree.mjs create mode 100644 node_modules/prettier/plugins/flow.d.ts create mode 100644 node_modules/prettier/plugins/flow.js create mode 100644 node_modules/prettier/plugins/flow.mjs create mode 100644 node_modules/prettier/plugins/glimmer.d.ts create mode 100644 node_modules/prettier/plugins/glimmer.js create mode 100644 node_modules/prettier/plugins/glimmer.mjs create mode 100644 node_modules/prettier/plugins/graphql.d.ts create mode 100644 node_modules/prettier/plugins/graphql.js create mode 100644 node_modules/prettier/plugins/graphql.mjs create mode 100644 node_modules/prettier/plugins/html.d.ts create mode 100644 node_modules/prettier/plugins/html.js create mode 100644 node_modules/prettier/plugins/html.mjs create mode 100644 node_modules/prettier/plugins/markdown.d.ts create mode 100644 node_modules/prettier/plugins/markdown.js create mode 100644 node_modules/prettier/plugins/markdown.mjs create mode 100644 node_modules/prettier/plugins/meriyah.d.ts create mode 100644 node_modules/prettier/plugins/meriyah.js create mode 100644 node_modules/prettier/plugins/meriyah.mjs create mode 100644 node_modules/prettier/plugins/postcss.d.ts create mode 100644 node_modules/prettier/plugins/postcss.js create mode 100644 node_modules/prettier/plugins/postcss.mjs create mode 100644 node_modules/prettier/plugins/typescript.d.ts create mode 100644 node_modules/prettier/plugins/typescript.js create mode 100644 node_modules/prettier/plugins/typescript.mjs create mode 100644 node_modules/prettier/plugins/yaml.d.ts create mode 100644 node_modules/prettier/plugins/yaml.js create mode 100644 node_modules/prettier/plugins/yaml.mjs create mode 100644 node_modules/prettier/standalone.d.ts create mode 100644 node_modules/prettier/standalone.js create mode 100644 node_modules/prettier/standalone.mjs create mode 100644 package-lock.json create mode 100644 package.json diff --git a/admin/package.json b/admin/package.json index 263f49ca..4e61ae3e 100644 --- a/admin/package.json +++ b/admin/package.json @@ -6,7 +6,10 @@ "scripts": { "dev": "vite", "build": "vite build && node publish.cjs", - "preview": "vite preview" + "preview": "vite preview", + "lint": "eslint .", + "lint:fix": "eslint . --ext .ts --ext .vue --ext .js --fix", + "format": "prettier --write src/**/*.{ts,vue,js,json}" }, "dependencies": { "@element-plus/icons-vue": "2.0.10", diff --git a/admin/src/App.vue b/admin/src/App.vue index b3376ded..5ecb1cdd 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -1,7 +1,7 @@ diff --git a/admin/src/addon/shop/api/delivery.ts b/admin/src/addon/shop/api/delivery.ts index 370404aa..bed958fc 100644 --- a/admin/src/addon/shop/api/delivery.ts +++ b/admin/src/addon/shop/api/delivery.ts @@ -7,7 +7,7 @@ import request from '@/utils/request' * @returns */ export function getCompanyPageList(params: Record) { - return request.get(`shop/delivery/company`, { params }) + return request.get(`shop/delivery/company`, { params }) } /** @@ -16,7 +16,7 @@ export function getCompanyPageList(params: Record) { * @returns */ export function getCompanyList(params: Record) { - return request.get(`shop/delivery/company/list`, { params }) + return request.get(`shop/delivery/company/list`, { params }) } /** @@ -25,7 +25,7 @@ export function getCompanyList(params: Record) { * @returns */ export function getCompanyInfo(company_id: number) { - return request.get(`shop/delivery/company/${ company_id }`); + return request.get(`shop/delivery/company/${company_id}`) } /** @@ -34,7 +34,10 @@ export function getCompanyInfo(company_id: number) { * @returns */ export function addCompany(params: Record) { - return request.post('shop/delivery/company', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/delivery/company', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -43,10 +46,10 @@ export function addCompany(params: Record) { * @returns */ export function editCompany(params: Record) { - return request.put(`shop/delivery/company/${ params.company_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/delivery/company/${params.company_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -55,10 +58,12 @@ export function editCompany(params: Record) { * @returns */ export function deleteCompany(company_id: number) { - return request.delete(`shop/delivery/company/${ company_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/delivery/company/${company_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } - /********************************* 运费模版 ***************************************/ /** * 获取运费模版分页列表 @@ -66,7 +71,7 @@ export function deleteCompany(company_id: number) { * @returns */ export function getShippingTemplatePageList(params: Record) { - return request.get(`shop/shipping/template`, { params }) + return request.get(`shop/shipping/template`, { params }) } /** @@ -75,7 +80,7 @@ export function getShippingTemplatePageList(params: Record) { * @returns */ export function getShippingTemplateList(params: Record) { - return request.get(`shop/shipping/template/list`, { params }) + return request.get(`shop/shipping/template/list`, { params }) } /** @@ -84,7 +89,7 @@ export function getShippingTemplateList(params: Record) { * @returns */ export function getShippingTemplateInfo(template_id: number) { - return request.get(`shop/shipping/template/${ template_id }`); + return request.get(`shop/shipping/template/${template_id}`) } /** @@ -93,7 +98,10 @@ export function getShippingTemplateInfo(template_id: number) { * @returns */ export function addShippingTemplate(params: Record) { - return request.post('shop/shipping/template', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/shipping/template', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -102,10 +110,10 @@ export function addShippingTemplate(params: Record) { * @returns */ export function editShippingTemplate(params: Record) { - return request.put(`shop/shipping/template/${ params.template_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/shipping/template/${params.template_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -114,13 +122,12 @@ export function editShippingTemplate(params: Record) { * @returns */ export function deleteShippingTemplate(template_id: number) { - return request.delete(`shop/shipping/template/${ template_id }`, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.delete(`shop/shipping/template/${template_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } - /********************************* 自提门店 ***************************************/ /** * 获取自提门店列表 @@ -128,7 +135,7 @@ export function deleteShippingTemplate(template_id: number) { * @returns */ export function getStoreList(params: Record) { - return request.get(`shop/delivery/store`, { params }) + return request.get(`shop/delivery/store`, { params }) } /** @@ -137,7 +144,7 @@ export function getStoreList(params: Record) { * @returns */ export function getStoreInfo(store_id: number) { - return request.get(`shop/delivery/store/${ store_id }`); + return request.get(`shop/delivery/store/${store_id}`) } /** @@ -146,7 +153,10 @@ export function getStoreInfo(store_id: number) { * @returns */ export function addStore(params: Record) { - return request.post('shop/delivery/store', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/delivery/store', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -155,10 +165,10 @@ export function addStore(params: Record) { * @returns */ export function editStore(params: Record) { - return request.put(`shop/delivery/store/${ params.store_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/delivery/store/${params.store_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -167,7 +177,10 @@ export function editStore(params: Record) { * @returns */ export function deleteStore(store_id: number) { - return request.delete(`shop/delivery/store/${ store_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/delivery/store/${store_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /********************************* 物流查询 ***************************************/ @@ -177,7 +190,10 @@ export function deleteStore(store_id: number) { * @returns */ export function setDeliverySearch(params: Record) { - return request.post('shop/delivery/search', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/delivery/search', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -185,7 +201,7 @@ export function setDeliverySearch(params: Record) { * @returns */ export function getDeliverySearch() { - return request.get('shop/delivery/search') + return request.get('shop/delivery/search') } /** @@ -193,7 +209,7 @@ export function getDeliverySearch() { * @returns */ export function getShopDeliveryList() { - return request.get('shop/delivery/deliveryList') + return request.get('shop/delivery/deliveryList') } /** @@ -202,7 +218,7 @@ export function getShopDeliveryList() { * @returns */ export function setShopDeliveryConfig(params: Record) { - return request.put(`shop/delivery/setConfig`, params) + return request.put(`shop/delivery/setConfig`, params) } /** @@ -211,7 +227,7 @@ export function setShopDeliveryConfig(params: Record) { * @returns */ export function getShopDelivery(params: Record) { - return request.get('shop/delivery/staff', { params }) + return request.get('shop/delivery/staff', { params }) } /** @@ -220,7 +236,7 @@ export function getShopDelivery(params: Record) { * @returns */ export function getShopDeliverInfo(staff_id: number) { - return request.get(`shop/delivery/staff/${ staff_id }`); + return request.get(`shop/delivery/staff/${staff_id}`) } /** @@ -229,7 +245,9 @@ export function getShopDeliverInfo(staff_id: number) { * @returns */ export function addShopDeliver(params: Record) { - return request.post('shop/delivery/staff', params, { showSuccessMessage: true }) + return request.post('shop/delivery/staff', params, { + showSuccessMessage: true, + }) } /** @@ -238,7 +256,9 @@ export function addShopDeliver(params: Record) { * @returns */ export function editShopDeliver(params: Record) { - return request.put(`shop/delivery/staff/${ params.deliver_id }`, params, { showSuccessMessage: true }) + return request.put(`shop/delivery/staff/${params.deliver_id}`, params, { + showSuccessMessage: true, + }) } /** @@ -247,7 +267,7 @@ export function editShopDeliver(params: Record) { * @returns */ export function deleteShopDeliver(staff_id: number) { - return request.delete(`shop/delivery/staff/${ staff_id }`) + return request.delete(`shop/delivery/staff/${staff_id}`) } /** @@ -255,7 +275,7 @@ export function deleteShopDeliver(staff_id: number) { * @returns */ export function getLocal() { - return request.get('shop/local'); + return request.get('shop/local') } /** @@ -264,5 +284,5 @@ export function getLocal() { * @returns */ export function setLocal(params: Record) { - return request.put('shop/local', params, { showSuccessMessage: true }) -} \ No newline at end of file + return request.put('shop/local', params, { showSuccessMessage: true }) +} diff --git a/admin/src/addon/shop/api/electronic_sheet.ts b/admin/src/addon/shop/api/electronic_sheet.ts index 7f75c124..ec23bc81 100644 --- a/admin/src/addon/shop/api/electronic_sheet.ts +++ b/admin/src/addon/shop/api/electronic_sheet.ts @@ -6,7 +6,7 @@ import request from '@/utils/request' * @returns */ export function getElectronicSheetPageList(params: Record) { - return request.get(`shop/electronic_sheet`, { params }) + return request.get(`shop/electronic_sheet`, { params }) } /** @@ -15,7 +15,7 @@ export function getElectronicSheetPageList(params: Record) { * @returns */ export function getElectronicSheetList(params: Record) { - return request.get(`shop/electronic_sheet/list`, { params }) + return request.get(`shop/electronic_sheet/list`, { params }) } /** @@ -24,7 +24,7 @@ export function getElectronicSheetList(params: Record) { * @returns */ export function getElectronicSheetInfo(id: number) { - return request.get(`shop/electronic_sheet/${ id }`); + return request.get(`shop/electronic_sheet/${id}`) } /** @@ -33,10 +33,10 @@ export function getElectronicSheetInfo(id: number) { * @returns */ export function addElectronicSheet(params: Record) { - return request.post('shop/electronic_sheet', params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.post('shop/electronic_sheet', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -45,10 +45,10 @@ export function addElectronicSheet(params: Record) { * @returns */ export function editElectronicSheet(params: Record) { - return request.put(`shop/electronic_sheet/${ params.id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/electronic_sheet/${params.id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -57,10 +57,10 @@ export function editElectronicSheet(params: Record) { * @returns */ export function deleteElectronicSheet(id: number) { - return request.delete(`shop/electronic_sheet/${ id }`, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.delete(`shop/electronic_sheet/${id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -69,10 +69,10 @@ export function deleteElectronicSheet(id: number) { * @returns */ export function setDefaultElectronicSheet(params: Record) { - return request.put(`shop/electronic_sheet/setDefault/${ params.id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/electronic_sheet/setDefault/${params.id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -81,10 +81,10 @@ export function setDefaultElectronicSheet(params: Record) { * @returns */ export function setElectronicSheetConfig(params: Record) { - return request.post('shop/electronic_sheet/config', params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.post('shop/electronic_sheet/config', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -92,7 +92,7 @@ export function setElectronicSheetConfig(params: Record) { * @returns */ export function getElectronicSheetConfig() { - return request.get(`shop/electronic_sheet/config`) + return request.get(`shop/electronic_sheet/config`) } /** @@ -100,7 +100,7 @@ export function getElectronicSheetConfig() { * @returns */ export function getElectronicSheetPayType() { - return request.get(`shop/electronic_sheet/paytype`) + return request.get(`shop/electronic_sheet/paytype`) } /** @@ -109,8 +109,8 @@ export function getElectronicSheetPayType() { * @returns */ export function printElectronicSheet(params: Record) { - return request.post('shop/electronic_sheet/print', params, { - showErrorMessage: true, - showSuccessMessage: true - }) -} \ No newline at end of file + return request.post('shop/electronic_sheet/print', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) +} diff --git a/admin/src/addon/shop/api/goods.ts b/admin/src/addon/shop/api/goods.ts index ff78ff46..c9a0f091 100644 --- a/admin/src/addon/shop/api/goods.ts +++ b/admin/src/addon/shop/api/goods.ts @@ -6,7 +6,7 @@ import request from '@/utils/request' * @returns */ export function getGoodsPageList(params: Record) { - return request.get(`shop/goods`, { params }) + return request.get(`shop/goods`, { params }) } /** @@ -15,7 +15,7 @@ export function getGoodsPageList(params: Record) { * @returns */ export function getGoodsInfo(goods_id: number) { - return request.get(`shop/goods/${ goods_id }`); + return request.get(`shop/goods/${goods_id}`) } /** @@ -24,7 +24,10 @@ export function getGoodsInfo(goods_id: number) { * @returns */ export function addGoods(params: Record) { - return request.post('shop/goods', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -32,7 +35,10 @@ export function addGoods(params: Record) { * @param params */ export function editGoods(params: Record) { - return request.put(`shop/goods/${ params.goods_id }`, params, { showErrorMessage: true, showSuccessMessage: true }) + return request.put(`shop/goods/${params.goods_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -40,7 +46,7 @@ export function editGoods(params: Record) { * @param params */ export function getGoodsInit(params: Record) { - return request.get(`shop/goods/init`, { params }); + return request.get(`shop/goods/init`, { params }) } /** @@ -49,7 +55,10 @@ export function getGoodsInit(params: Record) { * @returns */ export function addVirtualGoods(params: Record) { - return request.post('shop/goods/virtual', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/virtual', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -57,10 +66,10 @@ export function addVirtualGoods(params: Record) { * @param params */ export function editVirtualGoods(params: Record) { - return request.put(`shop/goods/virtual/${ params.goods_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/virtual/${params.goods_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -68,7 +77,7 @@ export function editVirtualGoods(params: Record) { * @param params */ export function getVirtualGoodsInit(params: Record) { - return request.get(`shop/goods/virtual/init`, { params }); + return request.get(`shop/goods/virtual/init`, { params }) } /** @@ -77,7 +86,10 @@ export function getVirtualGoodsInit(params: Record) { * @returns */ export function deleteGoods(params: Record) { - return request.put(`shop/goods/delete`, params, { showErrorMessage: true, showSuccessMessage: true }) + return request.put(`shop/goods/delete`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -86,7 +98,7 @@ export function deleteGoods(params: Record) { * @returns */ export function getRecycleGoodsPageList(params: Record) { - return request.get(`shop/goods/recycle`, { params }) + return request.get(`shop/goods/recycle`, { params }) } /** @@ -95,7 +107,10 @@ export function getRecycleGoodsPageList(params: Record) { * @returns */ export function recycleGoods(params: Record) { - return request.put(`shop/goods/recycle`, params, { showErrorMessage: true, showSuccessMessage: true }) + return request.put(`shop/goods/recycle`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -103,7 +118,7 @@ export function recycleGoods(params: Record) { * @param params */ export function editGoodsSort(params: Record) { - return request.put(`shop/goods/sort`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/sort`, params, { showSuccessMessage: true }) } /** @@ -111,7 +126,7 @@ export function editGoodsSort(params: Record) { * @param params */ export function editGoodsStatus(params: Record) { - return request.put(`shop/goods/status`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/status`, params, { showSuccessMessage: true }) } /** @@ -119,7 +134,9 @@ export function editGoodsStatus(params: Record) { * @param params */ export function copyGoods(params: Record) { - return request.put(`shop/goods/copy/${ params.goods_id }`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/copy/${params.goods_id}`, params, { + showSuccessMessage: true, + }) } /** @@ -128,7 +145,7 @@ export function copyGoods(params: Record) { * @returns */ export function getGoodsSelectPageList(params: Record) { - return request.get(`shop/goods/select`, { params }) + return request.get(`shop/goods/select`, { params }) } /** @@ -137,7 +154,7 @@ export function getGoodsSelectPageList(params: Record) { * @returns */ export function getGoodsSkuList(params: Record) { - return request.get(`shop/goods/sku`, { params }) + return request.get(`shop/goods/sku`, { params }) } /** @@ -146,7 +163,7 @@ export function getGoodsSkuList(params: Record) { * @returns */ export function getGoodsSkuNoPageList(params: Record) { - return request.get(`shop/goods/selectgoodssku`, { params }) + return request.get(`shop/goods/selectgoodssku`, { params }) } /** 查询商品参与营销活动的数量 @@ -154,7 +171,7 @@ export function getGoodsSkuNoPageList(params: Record) { * @returns */ export function getActiveGoodsCount(params: Record) { - return request.get(`shop/goods/active/count`, { params }) + return request.get(`shop/goods/active/count`, { params }) } /** @@ -163,7 +180,9 @@ export function getActiveGoodsCount(params: Record) { * @returns */ export function editGoodsListStock(params: Record) { - return request.put(`shop/goods/sku/stock`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/sku/stock`, params, { + showSuccessMessage: true, + }) } /** @@ -172,7 +191,9 @@ export function editGoodsListStock(params: Record) { * @returns */ export function editGoodsListPrice(params: Record) { - return request.put(`shop/goods/sku/price`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/sku/price`, params, { + showSuccessMessage: true, + }) } /** @@ -181,7 +202,9 @@ export function editGoodsListPrice(params: Record) { * @returns */ export function editGoodsListMemberPrice(params: Record) { - return request.put(`shop/goods/sku/member_price`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/sku/member_price`, params, { + showSuccessMessage: true, + }) } /** @@ -189,7 +212,7 @@ export function editGoodsListMemberPrice(params: Record) { * @returns */ export function getGoodsType() { - return request.get(`shop/goods/type`); + return request.get(`shop/goods/type`) } /** @@ -198,7 +221,7 @@ export function getGoodsType() { * @returns */ export function getLabelPageList(params: Record) { - return request.get(`shop/goods/label`, { params }) + return request.get(`shop/goods/label`, { params }) } /** @@ -207,7 +230,7 @@ export function getLabelPageList(params: Record) { * @returns */ export function getLabelList(params: Record) { - return request.get(`shop/goods/label/list`, { params }) + return request.get(`shop/goods/label/list`, { params }) } /** @@ -216,7 +239,7 @@ export function getLabelList(params: Record) { * @returns */ export function getLabelInfo(label_id: number) { - return request.get(`shop/goods/label/${ label_id }`); + return request.get(`shop/goods/label/${label_id}`) } /** @@ -225,7 +248,10 @@ export function getLabelInfo(label_id: number) { * @returns */ export function addLabel(params: Record) { - return request.post('shop/goods/label', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/label', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -234,10 +260,10 @@ export function addLabel(params: Record) { * @returns */ export function editLabel(params: Record) { - return request.put(`shop/goods/label/${ params.label_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/label/${params.label_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -245,7 +271,9 @@ export function editLabel(params: Record) { * @param params */ export function modifyLabelStatus(params: Record) { - return request.put(`shop/goods/label/status`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/label/status`, params, { + showSuccessMessage: true, + }) } /** @@ -254,7 +282,10 @@ export function modifyLabelStatus(params: Record) { * @returns */ export function deleteLabel(label_id: number) { - return request.delete(`shop/goods/label/${ label_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/goods/label/${label_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -262,7 +293,9 @@ export function deleteLabel(label_id: number) { * @param params */ export function modifyLabelSort(params: Record) { - return request.put(`shop/goods/label/sort`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/label/sort`, params, { + showSuccessMessage: true, + }) } /** @@ -271,7 +304,7 @@ export function modifyLabelSort(params: Record) { * @returns */ export function getLabelGroupPageList(params: Record) { - return request.get(`shop/goods/label/group`, { params }) + return request.get(`shop/goods/label/group`, { params }) } /** @@ -280,7 +313,7 @@ export function getLabelGroupPageList(params: Record) { * @returns */ export function getLabelGroupList(params: Record) { - return request.get(`shop/goods/label/group/list`, { params }) + return request.get(`shop/goods/label/group/list`, { params }) } /** @@ -289,7 +322,7 @@ export function getLabelGroupList(params: Record) { * @returns */ export function getLabelGroupInfo(label_id: number) { - return request.get(`shop/goods/label/group/${ label_id }`); + return request.get(`shop/goods/label/group/${label_id}`) } /** @@ -298,7 +331,10 @@ export function getLabelGroupInfo(label_id: number) { * @returns */ export function addLabelGroup(params: Record) { - return request.post('shop/goods/label/group', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/label/group', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -307,10 +343,10 @@ export function addLabelGroup(params: Record) { * @returns */ export function editLabelGroup(params: Record) { - return request.put(`shop/goods/label/group/${ params.group_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/label/group/${params.group_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -319,7 +355,10 @@ export function editLabelGroup(params: Record) { * @returns */ export function deleteLabelGroup(group_id: number) { - return request.delete(`shop/goods/label/group/${ group_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/goods/label/group/${group_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -327,7 +366,9 @@ export function deleteLabelGroup(group_id: number) { * @param params */ export function modifyLabelGroupSort(params: Record) { - return request.put(`shop/goods/label/group/sort`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/label/group/sort`, params, { + showSuccessMessage: true, + }) } /** @@ -336,7 +377,7 @@ export function modifyLabelGroupSort(params: Record) { * @returns */ export function getBrandPageList(params: Record) { - return request.get(`shop/goods/brand`, { params }) + return request.get(`shop/goods/brand`, { params }) } /** @@ -345,7 +386,7 @@ export function getBrandPageList(params: Record) { * @returns */ export function getBrandList(params: Record) { - return request.get(`shop/goods/brand/list`, { params }) + return request.get(`shop/goods/brand/list`, { params }) } /** @@ -354,7 +395,7 @@ export function getBrandList(params: Record) { * @returns */ export function getBrandInfo(brand_id: number) { - return request.get(`shop/goods/brand/${ brand_id }`); + return request.get(`shop/goods/brand/${brand_id}`) } /** @@ -363,7 +404,10 @@ export function getBrandInfo(brand_id: number) { * @returns */ export function addBrand(params: Record) { - return request.post('shop/goods/brand', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/brand', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -372,10 +416,10 @@ export function addBrand(params: Record) { * @returns */ export function editBrand(params: Record) { - return request.put(`shop/goods/brand/${ params.brand_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/brand/${params.brand_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -383,7 +427,9 @@ export function editBrand(params: Record) { * @param params */ export function modifyBrandSort(params: Record) { - return request.put(`shop/goods/brand/sort`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/brand/sort`, params, { + showSuccessMessage: true, + }) } /** @@ -392,7 +438,10 @@ export function modifyBrandSort(params: Record) { * @returns */ export function deleteBrand(brand_id: number) { - return request.delete(`shop/goods/brand/${ brand_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/goods/brand/${brand_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -401,7 +450,7 @@ export function deleteBrand(brand_id: number) { * @returns */ export function getServePageList(params: Record) { - return request.get(`shop/goods/service`, { params }) + return request.get(`shop/goods/service`, { params }) } /** @@ -410,7 +459,7 @@ export function getServePageList(params: Record) { * @returns */ export function getServeList(params: Record) { - return request.get(`shop/goods/service/list`, { params }) + return request.get(`shop/goods/service/list`, { params }) } /** @@ -419,7 +468,7 @@ export function getServeList(params: Record) { * @returns */ export function getServeInfo(service_id: number) { - return request.get(`shop/goods/service/${ service_id }`); + return request.get(`shop/goods/service/${service_id}`) } /** @@ -428,7 +477,10 @@ export function getServeInfo(service_id: number) { * @returns */ export function addServe(params: Record) { - return request.post('shop/goods/service', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/service', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -437,10 +489,10 @@ export function addServe(params: Record) { * @returns */ export function editServe(params: Record) { - return request.put(`shop/goods/service/${ params.service_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/service/${params.service_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -449,7 +501,10 @@ export function editServe(params: Record) { * @returns */ export function deleteServe(service_id: number) { - return request.delete(`shop/goods/service/${ service_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/goods/service/${service_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -457,7 +512,7 @@ export function deleteServe(service_id: number) { * @returns */ export function getCategoryTree() { - return request.get(`shop/goods/tree`) + return request.get(`shop/goods/tree`) } /** @@ -466,7 +521,7 @@ export function getCategoryTree() { * @returns */ export function getCategoryList(params: Record) { - return request.get(`shop/goods/category`, { params }) + return request.get(`shop/goods/category`, { params }) } /** @@ -475,7 +530,7 @@ export function getCategoryList(params: Record) { * @returns */ export function getCategoryInfo(category_id: number) { - return request.get(`shop/goods/category/${ category_id }`); + return request.get(`shop/goods/category/${category_id}`) } /** @@ -484,7 +539,10 @@ export function getCategoryInfo(category_id: number) { * @returns */ export function addCategory(params: Record) { - return request.post('shop/goods/category', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/category', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -493,10 +551,10 @@ export function addCategory(params: Record) { * @returns */ export function editCategory(params: Record) { - return request.put(`shop/goods/category/${ params.category_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/category/${params.category_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -505,7 +563,10 @@ export function editCategory(params: Record) { * @returns */ export function deleteCategory(category_id: number) { - return request.delete(`shop/goods/category/${ category_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/goods/category/${category_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -514,7 +575,10 @@ export function deleteCategory(category_id: number) { * @returns */ export function updateCategory(params: Record) { - return request.post(`shop/goods/category/update`, params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post(`shop/goods/category/update`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -523,7 +587,10 @@ export function updateCategory(params: Record) { * @returns */ export function setCategoryConfig(params: Record) { - return request.post(`shop/goods/category/config`, params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post(`shop/goods/category/config`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -531,7 +598,7 @@ export function setCategoryConfig(params: Record) { * @returns */ export function getCategoryConfig() { - return request.get(`shop/goods/category/config`); + return request.get(`shop/goods/category/config`) } /** @@ -539,7 +606,7 @@ export function getCategoryConfig() { * @returns */ export function getCategoryTreeComponents() { - return request.get(`shop/goods/category/components`) + return request.get(`shop/goods/category/components`) } /** @@ -548,7 +615,7 @@ export function getCategoryTreeComponents() { * @returns */ export function getSupplierList(params: Record) { - return request.get(`shop_supplier/supplier/list`, { params }) + return request.get(`shop_supplier/supplier/list`, { params }) } /** @@ -557,7 +624,7 @@ export function getSupplierList(params: Record) { * @returns */ export function getEvaluateList(params: Record) { - return request.get(`shop/goods/evaluate`, { params }) + return request.get(`shop/goods/evaluate`, { params }) } /** @@ -566,7 +633,10 @@ export function getEvaluateList(params: Record) { * @returns */ export function addEvaluate(params: Record) { - return request.post('shop/goods/evaluate', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/evaluate', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -575,7 +645,10 @@ export function addEvaluate(params: Record) { * @returns */ export function deleteEvaluate(evaluate_id: number) { - return request.delete(`shop/goods/evaluate/${ evaluate_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/goods/evaluate/${evaluate_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -584,10 +657,10 @@ export function deleteEvaluate(evaluate_id: number) { * @returns */ export function adoptEvaluate(evaluate_id: number) { - return request.put(`shop/goods/evaluate/adopt/${ evaluate_id }`, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/evaluate/adopt/${evaluate_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -596,10 +669,10 @@ export function adoptEvaluate(evaluate_id: number) { * @returns */ export function refuseEvaluate(evaluate_id: number) { - return request.put(`shop/goods/evaluate/refuse/${ evaluate_id }`, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/evaluate/refuse/${evaluate_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -608,10 +681,14 @@ export function refuseEvaluate(evaluate_id: number) { * @returns */ export function replyEvaluate(params: Record) { - return request.put(`shop/goods/evaluate/reply/${ params.evaluate_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put( + `shop/goods/evaluate/reply/${params.evaluate_id}`, + params, + { + showErrorMessage: true, + showSuccessMessage: true, + } + ) } /** @@ -620,10 +697,10 @@ export function replyEvaluate(params: Record) { * @returns */ export function toppingEvaluate(evaluate_id: number) { - return request.put(`shop/goods/evaluate/topping/${ evaluate_id }`, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/evaluate/topping/${evaluate_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -632,10 +709,10 @@ export function toppingEvaluate(evaluate_id: number) { * @returns */ export function cancelToppingEvaluate(evaluate_id: number) { - return request.put(`shop/goods/evaluate/cancel_topping/${ evaluate_id }`, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/evaluate/cancel_topping/${evaluate_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -644,7 +721,7 @@ export function cancelToppingEvaluate(evaluate_id: number) { * @returns */ export function getAttrPageList(params: Record) { - return request.get(`shop/goods/attr`, { params }) + return request.get(`shop/goods/attr`, { params }) } /** @@ -653,7 +730,7 @@ export function getAttrPageList(params: Record) { * @returns */ export function getAttrList(params: Record) { - return request.get(`shop/goods/attr/list`, { params }) + return request.get(`shop/goods/attr/list`, { params }) } /** @@ -662,7 +739,7 @@ export function getAttrList(params: Record) { * @returns */ export function getAttrInfo(attr_id: number) { - return request.get(`shop/goods/attr/${ attr_id }`); + return request.get(`shop/goods/attr/${attr_id}`) } /** @@ -671,7 +748,10 @@ export function getAttrInfo(attr_id: number) { * @returns */ export function addAttr(params: Record) { - return request.post('shop/goods/attr', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/goods/attr', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -680,10 +760,10 @@ export function addAttr(params: Record) { * @returns */ export function editAttr(params: Record) { - return request.put(`shop/goods/attr/${ params.attr_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/attr/${params.attr_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -692,7 +772,10 @@ export function editAttr(params: Record) { * @returns */ export function deleteAttr(attr_id: number) { - return request.delete(`shop/goods/attr/${ attr_id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/goods/attr/${attr_id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -700,7 +783,9 @@ export function deleteAttr(attr_id: number) { * @param params */ export function modifyAttrSort(params: Record) { - return request.put(`shop/goods/attr/sort`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/attr/sort`, params, { + showSuccessMessage: true, + }) } /** @@ -708,7 +793,9 @@ export function modifyAttrSort(params: Record) { * @param params */ export function modifyAttrName(params: Record) { - return request.put(`shop/goods/attr/attr_name`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/attr/attr_name`, params, { + showSuccessMessage: true, + }) } /** @@ -716,7 +803,9 @@ export function modifyAttrName(params: Record) { * @param params */ export function modifyAttrValue(params: Record) { - return request.put(`shop/goods/attr/attr_value`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/attr/attr_value`, params, { + showSuccessMessage: true, + }) } /** @@ -724,7 +813,7 @@ export function modifyAttrValue(params: Record) { * @returns */ export function getGoodsBatchSetDict() { - return request.get(`shop/goods/batchSet/dict`) + return request.get(`shop/goods/batchSet/dict`) } /** @@ -732,5 +821,7 @@ export function getGoodsBatchSetDict() { * @param params */ export function goodsBatchSet(params: Record) { - return request.put(`shop/goods/batchSet`, params, { showSuccessMessage: true }) -} \ No newline at end of file + return request.put(`shop/goods/batchSet`, params, { + showSuccessMessage: true, + }) +} diff --git a/admin/src/addon/shop/api/marketing.ts b/admin/src/addon/shop/api/marketing.ts index b48dd32f..d94114f4 100644 --- a/admin/src/addon/shop/api/marketing.ts +++ b/admin/src/addon/shop/api/marketing.ts @@ -6,7 +6,7 @@ import request from '@/utils/request' * @returns */ export function getMarketingIndex(params: Record) { - return request.get(`shop/marketing`, { params }) + return request.get(`shop/marketing`, { params }) } /** @@ -15,7 +15,7 @@ export function getMarketingIndex(params: Record) { * @returns */ export function getGoodsCategoryList(params: Record) { - return request.get(`shop/goods/coupon/init`, { params }) + return request.get(`shop/goods/coupon/init`, { params }) } /** @@ -24,7 +24,10 @@ export function getGoodsCategoryList(params: Record) { * @returns */ export function addCoupon(params: Record) { - return request.post(`shop/goods/coupon`, params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post(`shop/goods/coupon`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -32,7 +35,7 @@ export function addCoupon(params: Record) { * @returns */ export function getCouponStatusList() { - return request.get(`shop/goods/coupon/status`) + return request.get(`shop/goods/coupon/status`) } /** @@ -41,7 +44,7 @@ export function getCouponStatusList() { * @returns */ export function getCouponList(params: Record) { - return request.get(`shop/goods/coupon`, { params }) + return request.get(`shop/goods/coupon`, { params }) } /** @@ -50,7 +53,7 @@ export function getCouponList(params: Record) { * @returns */ export function getCouponSelectList(params: Record) { - return request.get(`shop/goods/coupon/select`, { params }) + return request.get(`shop/goods/coupon/select`, { params }) } /** @@ -59,7 +62,7 @@ export function getCouponSelectList(params: Record) { * @returns */ export function getCouponRecords(params: Record) { - return request.get(`shop/goods/coupon/records`, { params }); + return request.get(`shop/goods/coupon/records`, { params }) } /** @@ -68,7 +71,7 @@ export function getCouponRecords(params: Record) { * @returns */ export function getCouponInfo(id: number) { - return request.get(`shop/goods/coupon/detail/${ id }`); + return request.get(`shop/goods/coupon/detail/${id}`) } /** @@ -77,7 +80,9 @@ export function getCouponInfo(id: number) { * @returns */ export function editCouponStatus(params: Record) { - return request.put(`shop/goods/coupon/setstatus/${ params.status }`, params, { showSuccessMessage: true }) + return request.put(`shop/goods/coupon/setstatus/${params.status}`, params, { + showSuccessMessage: true, + }) } /** @@ -86,10 +91,10 @@ export function editCouponStatus(params: Record) { * @returns */ export function editCoupon(params: Record) { - return request.put(`shop/goods/coupon/edit/${ params.id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/coupon/edit/${params.id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -98,7 +103,7 @@ export function editCoupon(params: Record) { * @returns */ export function deleteCoupon(id: number) { - return request.delete(`shop/goods/coupon/${ id }`, { showSuccessMessage: true }) + return request.delete(`shop/goods/coupon/${id}`, { showSuccessMessage: true }) } /** @@ -107,7 +112,9 @@ export function deleteCoupon(id: number) { * @returns */ export function closeCoupon(id: number) { - return request.put(`shop/goods/coupon/invalid/${ id }`, { showSuccessMessage: true }) + return request.put(`shop/goods/coupon/invalid/${id}`, { + showSuccessMessage: true, + }) } /** @@ -116,7 +123,7 @@ export function closeCoupon(id: number) { * @returns */ export function getSelectedCouponList(params: Record) { - return request.get(`shop/goods/coupon/selected`, { params }) + return request.get(`shop/goods/coupon/selected`, { params }) } /************ 限时折扣 ****************/ @@ -126,7 +133,7 @@ export function getSelectedCouponList(params: Record) { * @returns */ export function getActiveDiscountPageList(params: Record) { - return request.get(`shop/active/discount`, { params }) + return request.get(`shop/active/discount`, { params }) } /** @@ -134,7 +141,7 @@ export function getActiveDiscountPageList(params: Record) { * @returns */ export function getActiveDiscountStatusList() { - return request.get(`shop/active/status`) + return request.get(`shop/active/status`) } /** @@ -143,7 +150,7 @@ export function getActiveDiscountStatusList() { * @returns */ export function getActiveDiscountInfo(active_id: number) { - return request.get(`shop/active/discount/${ active_id }`); + return request.get(`shop/active/discount/${active_id}`) } /** @@ -152,7 +159,10 @@ export function getActiveDiscountInfo(active_id: number) { * @returns */ export function addActiveDiscount(params: Record) { - return request.post('shop/active/discount', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/active/discount', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -161,10 +171,10 @@ export function addActiveDiscount(params: Record) { * @returns */ export function editActiveDiscount(params: Record) { - return request.put(`shop/active/discount/${ params.active_id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/active/discount/${params.active_id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -173,10 +183,14 @@ export function editActiveDiscount(params: Record) { * @returns */ export function closeActiveDiscount(active_id: number) { - return request.put(`shop/active/discount/close/${ active_id }`, {}, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put( + `shop/active/discount/close/${active_id}`, + {}, + { + showErrorMessage: true, + showSuccessMessage: true, + } + ) } /** @@ -185,7 +199,9 @@ export function closeActiveDiscount(active_id: number) { * @returns */ export function deleteActiveDiscount(active_id: number) { - return request.delete(`shop/active/discount/${ active_id }`, { showSuccessMessage: true }) + return request.delete(`shop/active/discount/${active_id}`, { + showSuccessMessage: true, + }) } /** @@ -194,7 +210,9 @@ export function deleteActiveDiscount(active_id: number) { * @returns */ export function getActiveDiscountGoodsPageList(params: Record) { - return request.get(`shop/active/discount/goods/${ params.active_id }`, { params }) + return request.get(`shop/active/discount/goods/${params.active_id}`, { + params, + }) } /** @@ -203,7 +221,9 @@ export function getActiveDiscountGoodsPageList(params: Record) { * @returns */ export function getActiveDiscountOrderPageList(params: Record) { - return request.get(`shop/active/discount/order/${ params.active_id }`, { params }) + return request.get(`shop/active/discount/order/${params.active_id}`, { + params, + }) } /** @@ -212,7 +232,9 @@ export function getActiveDiscountOrderPageList(params: Record) { * @returns */ export function getActiveDiscountMemberPageList(params: Record) { - return request.get(`shop/active/discount/member/${ params.active_id }`, { params }) + return request.get(`shop/active/discount/member/${params.active_id}`, { + params, + }) } /** @@ -220,7 +242,7 @@ export function getActiveDiscountMemberPageList(params: Record) { * @returns */ export function getActiveDiscountConfig() { - return request.get(`shop/active/discount/config`); + return request.get(`shop/active/discount/config`) } /** @@ -229,10 +251,10 @@ export function getActiveDiscountConfig() { * @returns */ export function editActiveDiscountConfig(params: Record) { - return request.put(`shop/active/discount/config`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/active/discount/config`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /********** 积分商品 ***********/ @@ -243,7 +265,7 @@ export function editActiveDiscountConfig(params: Record) { * @returns */ export function getActiveExchangePageList(params: Record) { - return request.get(`shop/active/exchange`, { params }) + return request.get(`shop/active/exchange`, { params }) } /** @@ -252,7 +274,7 @@ export function getActiveExchangePageList(params: Record) { * @returns */ export function getActiveExchangeInfo(id: number) { - return request.get(`shop/active/exchange/${ id }`); + return request.get(`shop/active/exchange/${id}`) } /** @@ -261,7 +283,10 @@ export function getActiveExchangeInfo(id: number) { * @returns */ export function addActiveExchange(params: Record) { - return request.post('shop/active/exchange', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/active/exchange', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -270,10 +295,10 @@ export function addActiveExchange(params: Record) { * @returns */ export function editActiveExchange(params: Record) { - return request.put(`shop/active/exchange/${ params.id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/active/exchange/${params.id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -282,10 +307,10 @@ export function editActiveExchange(params: Record) { * @returns */ export function editActiveExchangeStatus(params: Record) { - return request.put(`shop/active/exchange/status/${ params.id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/active/exchange/status/${params.id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -294,7 +319,9 @@ export function editActiveExchangeStatus(params: Record) { * @returns */ export function deleteActiveExchange(id: number) { - return request.delete(`shop/active/exchange/${ id }`, { showSuccessMessage: true }) + return request.delete(`shop/active/exchange/${id}`, { + showSuccessMessage: true, + }) } /** @@ -302,7 +329,7 @@ export function deleteActiveExchange(id: number) { * @returns */ export function getActiveExchangeStatus() { - return request.get(`shop/active/exchange/status`) + return request.get(`shop/active/exchange/status`) } /************ 新人专享 ****************/ @@ -312,7 +339,7 @@ export function getActiveExchangeStatus() { * @returns */ export function getActiveNewcomerConfig() { - return request.get(`shop/active/newcomer/config`); + return request.get(`shop/active/newcomer/config`) } /** @@ -321,10 +348,10 @@ export function getActiveNewcomerConfig() { * @returns */ export function editActiveNewcomerConfig(params: Record) { - return request.put(`shop/active/newcomer/config`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/active/newcomer/config`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -333,7 +360,7 @@ export function editActiveNewcomerConfig(params: Record) { * @returns */ export function getNewcomerGoodsList(params: Record) { - return request.get('shop/active/newcomer/goods/select', { params }) + return request.get('shop/active/newcomer/goods/select', { params }) } /** @@ -342,7 +369,7 @@ export function getNewcomerGoodsList(params: Record) { * @returns */ export function getNewcomerSelectGoodsList(params: Record) { - return request.get('shop/active/newcomer/goods/selectgoodssku', { params }) + return request.get('shop/active/newcomer/goods/selectgoodssku', { params }) } /************ 商品榜单 ****************/ @@ -353,7 +380,10 @@ export function getNewcomerSelectGoodsList(params: Record) { * @returns */ export function setRankConfig(params: Record) { - return request.post('shop/good/rank/config', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/good/rank/config', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -361,7 +391,7 @@ export function setRankConfig(params: Record) { * @returns */ export function getRankConfig() { - return request.get(`shop/good/rank/config`) + return request.get(`shop/good/rank/config`) } /** @@ -370,7 +400,7 @@ export function getRankConfig() { * @returns */ export function getRankPageList(params: Record) { - return request.get(`shop/good/rank`, { params }) + return request.get(`shop/good/rank`, { params }) } /** @@ -378,7 +408,7 @@ export function getRankPageList(params: Record) { * @returns */ export function optionData() { - return request.get(`shop/good/rank/dict`) + return request.get(`shop/good/rank/dict`) } /** @@ -387,7 +417,7 @@ export function optionData() { * @returns */ export function getRankInfo(rank_id: number) { - return request.get(`shop/good/rank/${ rank_id }`); + return request.get(`shop/good/rank/${rank_id}`) } /** @@ -396,7 +426,10 @@ export function getRankInfo(rank_id: number) { * @returns */ export function addGoodRank(params: Record) { - return request.post('shop/good/rank', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/good/rank', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -405,10 +438,10 @@ export function addGoodRank(params: Record) { * @returns */ export function editGoodRank(params: Record) { - return request.put(`shop/good/rank/${ params.id }`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/good/rank/${params.id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -417,10 +450,10 @@ export function editGoodRank(params: Record) { * @returns */ export function editRankStatus(params: Record) { - return request.put(`shop/goods/rank/status`, params, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put(`shop/goods/rank/status`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -429,7 +462,7 @@ export function editRankStatus(params: Record) { * @returns */ export function deleteGoodRank(id: number) { - return request.delete(`shop/good/rank/${ id }`, { showSuccessMessage: true }) + return request.delete(`shop/good/rank/${id}`, { showSuccessMessage: true }) } /** @@ -438,7 +471,9 @@ export function deleteGoodRank(id: number) { * @returns */ export function batchDelete(params: Record) { - return request.put(`shop/good/rank/batchDelete`, params, { showSuccessMessage: true }) + return request.put(`shop/good/rank/batchDelete`, params, { + showSuccessMessage: true, + }) } /** @@ -447,7 +482,9 @@ export function batchDelete(params: Record) { * @returns */ export function modifyGoodsRankSort(params: Record) { - return request.put(`shop/good/rank/sort`, params, { showSuccessMessage: true }) + return request.put(`shop/good/rank/sort`, params, { + showSuccessMessage: true, + }) } /** @@ -456,7 +493,7 @@ export function modifyGoodsRankSort(params: Record) { * @returns */ export function getSelectRankPageList(params: Record) { - return request.get(`shop/good/rank/select`, { params }) + return request.get(`shop/good/rank/select`, { params }) } /************ 满减 ****************/ @@ -467,7 +504,7 @@ export function getSelectRankPageList(params: Record) { * @returns */ export function getManjianList(params: Record) { - return request.get(`shop/manjian`, { params }) + return request.get(`shop/manjian`, { params }) } /** @@ -475,7 +512,7 @@ export function getManjianList(params: Record) { * @returns */ export function getManjianStatusList() { - return request.get(`shop/manjian/status`) + return request.get(`shop/manjian/status`) } /** @@ -484,7 +521,7 @@ export function getManjianStatusList() { * @returns */ export function addManjian(params: Record) { - return request.post('shop/manjian', params) + return request.post('shop/manjian', params) } /** @@ -493,7 +530,7 @@ export function addManjian(params: Record) { * @returns */ export function editManjian(params: Record) { - return request.put(`shop/manjian/${ params.id }`, params) + return request.put(`shop/manjian/${params.id}`, params) } /** @@ -502,7 +539,7 @@ export function editManjian(params: Record) { * @returns */ export function getManjianInfo(params: Record) { - return request.get(`shop/manjian/init`, { params }); + return request.get(`shop/manjian/init`, { params }) } /** @@ -511,7 +548,7 @@ export function getManjianInfo(params: Record) { * @returns */ export function goodsCheck(params: Record) { - return request.post('shop/manjian/goods/check', params) + return request.post('shop/manjian/goods/check', params) } /** @@ -520,7 +557,7 @@ export function goodsCheck(params: Record) { * @returns */ export function getManjianMemberPageList(params: Record) { - return request.get(`shop/manjian/member/${ params.id }`, { params }) + return request.get(`shop/manjian/member/${params.id}`, { params }) } /** @@ -529,10 +566,14 @@ export function getManjianMemberPageList(params: Record) { * @returns */ export function closeManjian(manjian_id: number) { - return request.put(`shop/manjian/close/${ manjian_id }`, {}, { - showErrorMessage: true, - showSuccessMessage: true - }) + return request.put( + `shop/manjian/close/${manjian_id}`, + {}, + { + showErrorMessage: true, + showSuccessMessage: true, + } + ) } /** @@ -541,7 +582,7 @@ export function closeManjian(manjian_id: number) { * @returns */ export function getGoodsSelectByReplaceBuy(params: Record) { - return request.get(`shop/goods/buy/goods/select`, { params }) + return request.get(`shop/goods/buy/goods/select`, { params }) } /** @@ -550,7 +591,7 @@ export function getGoodsSelectByReplaceBuy(params: Record) { * @returns */ export function getGoodsSelectedByReplaceBuy(params: Record) { - return request.get(`shop/goods/buy/goods/selected`, { params }) + return request.get(`shop/goods/buy/goods/selected`, { params }) } /** @@ -559,7 +600,7 @@ export function getGoodsSelectedByReplaceBuy(params: Record) { * @returns */ export function getGoodsSkuInfo(params: Record) { - return request.get(`shop/goods/buy/sku/select`, { params }) + return request.get(`shop/goods/buy/sku/select`, { params }) } /* @@ -568,7 +609,9 @@ export function getGoodsSkuInfo(params: Record) { * @returns */ export function deleteManjian(manjian_id: number) { - return request.delete(`shop/manjian/${ manjian_id }`, { showSuccessMessage: true }) + return request.delete(`shop/manjian/${manjian_id}`, { + showSuccessMessage: true, + }) } /** @@ -577,7 +620,9 @@ export function deleteManjian(manjian_id: number) { * @returns */ export function batchDeleteManjian(params: Record) { - return request.put(`shop/manjian/goods/batchDelete`, params, { showSuccessMessage: true }) + return request.put(`shop/manjian/goods/batchDelete`, params, { + showSuccessMessage: true, + }) } /** @@ -586,5 +631,7 @@ export function batchDeleteManjian(params: Record) { * @returns */ export function batchCloseMajian(params: Record) { - return request.put(`shop/manjian/goods/batchClose`, params, { showSuccessMessage: true }) + return request.put(`shop/manjian/goods/batchClose`, params, { + showSuccessMessage: true, + }) } diff --git a/admin/src/addon/shop/api/order.ts b/admin/src/addon/shop/api/order.ts index 787c9e7c..dd96bf3e 100644 --- a/admin/src/addon/shop/api/order.ts +++ b/admin/src/addon/shop/api/order.ts @@ -5,7 +5,7 @@ import request from '@/utils/request' * @returns */ export function getConfig() { - return request.get('shop/order/config') + return request.get('shop/order/config') } /** @@ -13,7 +13,7 @@ export function getConfig() { * @returns */ export function setConfig(param: any) { - return request.post('shop/order/config', param, { showSuccessMessage: true }) + return request.post('shop/order/config', param, { showSuccessMessage: true }) } /** @@ -21,7 +21,7 @@ export function setConfig(param: any) { * @returns */ export function getOrderList(params: Record) { - return request.get('shop/order/list', { params }) + return request.get('shop/order/list', { params }) } /** @@ -29,7 +29,7 @@ export function getOrderList(params: Record) { * @returns */ export function getOrderDetail(order_id: number) { - return request.get(`shop/order/detail/${ order_id }`) + return request.get(`shop/order/detail/${order_id}`) } /** @@ -37,7 +37,7 @@ export function getOrderDetail(order_id: number) { * @return */ export function getOrderStatus() { - return request.get(`shop/order/status`) + return request.get(`shop/order/status`) } /** @@ -45,7 +45,7 @@ export function getOrderStatus() { * @return */ export function getOrderType() { - return request.get(`shop/order/type`) + return request.get(`shop/order/type`) } /** @@ -53,7 +53,7 @@ export function getOrderType() { * @return */ export function orderClose(order_id: number) { - return request.put(`shop/order/close/${ order_id }`) + return request.put(`shop/order/close/${order_id}`) } /** @@ -61,7 +61,7 @@ export function orderClose(order_id: number) { * @return */ export function getOrderDeliveryType(params: Record) { - return request.get(`shop/order/delivery_type`, { params }) + return request.get(`shop/order/delivery_type`, { params }) } /** @@ -69,7 +69,7 @@ export function getOrderDeliveryType(params: Record) { * @return */ export function orderDelivery(params: Record) { - return request.put(`shop/order/delivery`, params) + return request.put(`shop/order/delivery`, params) } /** @@ -77,7 +77,7 @@ export function orderDelivery(params: Record) { * @return */ export function setShopRemark(params: Record) { - return request.put(`shop/order/shop_remark`, params) + return request.put(`shop/order/shop_remark`, params) } /** @@ -85,7 +85,7 @@ export function setShopRemark(params: Record) { * @return */ export function orderFinish(order_id: number) { - return request.put(`shop/order/finish/${ order_id }`) + return request.put(`shop/order/finish/${order_id}`) } /** @@ -93,7 +93,7 @@ export function orderFinish(order_id: number) { * @return */ export function deliveryPackage(params: Record) { - return request.get(`shop/order/delivery/package`, { params }) + return request.get(`shop/order/delivery/package`, { params }) } /** @@ -101,7 +101,7 @@ export function deliveryPackage(params: Record) { * @return */ export function deliveryPackageList(params: Record) { - return request.get(`shop/order/delivery/package/list`, { params }) + return request.get(`shop/order/delivery/package/list`, { params }) } /** @@ -110,14 +110,14 @@ export function deliveryPackageList(params: Record) { * @return */ export function orderRefund(params: Record) { - return request.get(`shop/order/refund`, { params }) + return request.get(`shop/order/refund`, { params }) } /** * 退款维权详情 */ export function orderRefundDetail(refund_id: number) { - return request.get(`shop/order/refund/${ refund_id }`) + return request.get(`shop/order/refund/${refund_id}`) } /** @@ -125,7 +125,10 @@ export function orderRefundDetail(refund_id: number) { * @return */ export function auditRefund(params: Record) { - return request.put(`shop/order/refund/audit/${ params.order_refund_no }`, params) + return request.put( + `shop/order/refund/audit/${params.order_refund_no}`, + params + ) } /** @@ -133,56 +136,61 @@ export function auditRefund(params: Record) { * @return */ export function refundDelivery(params: Record) { - return request.put(`shop/order/refund/delivery/${ params.order_refund_no }`, params) + return request.put( + `shop/order/refund/delivery/${params.order_refund_no}`, + params + ) } /** * 获取可退款金额 */ export function getRefundMoney(params: Record) { - return request.get(`shop/order/refund/refund_money`, { params }) + return request.get(`shop/order/refund/refund_money`, { params }) } /** * 商家主动退款 */ export function shopActiveRefund(params: Record) { - return request.post(`shop/order/refund/active`, params, { showSuccessMessage: true }) + return request.post(`shop/order/refund/active`, params, { + showSuccessMessage: true, + }) } /** * 获取发票列表 */ export function getInvoiceList(params: Record) { - return request.get(`shop/invoice`, { params }) + return request.get(`shop/invoice`, { params }) } /** * 获取发票列表 */ export function getInvoiceDetail(id: number) { - return request.get(`shop/invoice/${ id }`) + return request.get(`shop/invoice/${id}`) } /** * 开具发票 */ export function setInvoice(id: number, params: Record) { - return request.put(`shop/invoice/${ id }`, params, { showSuccessMessage: true }) + return request.put(`shop/invoice/${id}`, params, { showSuccessMessage: true }) } /** * 获取支付类型 */ export function getOrderPayType() { - return request.get(`shop/order/pay/type`) + return request.get(`shop/order/pay/type`) } /** * 获取订单来源 */ export function getOrderFrom() { - return request.get(`shop/order/from`) + return request.get(`shop/order/from`) } /** @@ -190,7 +198,9 @@ export function getOrderFrom() { * @return */ export function orderEditPrice(params: Record) { - return request.put(`shop/order/edit_price`, params, { showSuccessMessage: true }) + return request.put(`shop/order/edit_price`, params, { + showSuccessMessage: true, + }) } /** @@ -198,7 +208,7 @@ export function orderEditPrice(params: Record) { * @return */ export function getOrderEditAddress(params: Record) { - return request.get(`shop/order/edit_delivery`, { params }) + return request.get(`shop/order/edit_delivery`, { params }) } /** @@ -206,7 +216,7 @@ export function getOrderEditAddress(params: Record) { * @return */ export function getDeliveryList() { - return request.get(`shop/delivery/store/list`) + return request.get(`shop/delivery/store/list`) } /** @@ -214,7 +224,7 @@ export function getDeliveryList() { * @return */ export function orderEditAddress(params: Record) { - return request.put(`shop/order/edit_delivery`, params) + return request.put(`shop/order/edit_delivery`, params) } /** @@ -222,7 +232,7 @@ export function orderEditAddress(params: Record) { * @return */ export function getOrderBatchDeliveryList(params: Record) { - return request.get(`shop/order_batch_delivery`, { params }) + return request.get(`shop/order_batch_delivery`, { params }) } /** @@ -230,7 +240,10 @@ export function getOrderBatchDeliveryList(params: Record) { * @return */ export function addBatchOrderDelivery(params: Record) { - return request.put(`shop/order_batch_delivery/add_batch_order_delivery`, params) + return request.put( + `shop/order_batch_delivery/add_batch_order_delivery`, + params + ) } /** @@ -238,7 +251,7 @@ export function addBatchOrderDelivery(params: Record) { * @return */ export function getOrderBatchDeliveryState() { - return request.get(`shop/order_batch_delivery/get_status`) + return request.get(`shop/order_batch_delivery/get_status`) } /** @@ -246,5 +259,5 @@ export function getOrderBatchDeliveryState() { * @return */ export function getOrderBatchDeliveryType() { - return request.get(`shop/order_batch_delivery/get_type`) + return request.get(`shop/order_batch_delivery/get_type`) } diff --git a/admin/src/addon/shop/api/shop.ts b/admin/src/addon/shop/api/shop.ts index b2bea12c..5e56b4c8 100644 --- a/admin/src/addon/shop/api/shop.ts +++ b/admin/src/addon/shop/api/shop.ts @@ -4,40 +4,40 @@ import request from '@/utils/request' * 获取统计总数 */ export function getShopCountList() { - return request.get(`shop/stat/total`) + return request.get(`shop/stat/total`) } /** * 获取今日统计总数 */ export function getShopTodayCountList() { - return request.get(`shop/stat/today`) + return request.get(`shop/stat/today`) } /** * 获取昨日统计总数 */ export function getShopYesterdayCountList() { - return request.get(`shop/stat/yesterday`) + return request.get(`shop/stat/yesterday`) } /** * 获取统计图数据 */ export function getShopStat() { - return request.get(`shop/stat`) + return request.get(`shop/stat`) } /** * 获取订单统计 */ export function getShopOrderStat() { - return request.get(`shop/stat/order`) + return request.get(`shop/stat/order`) } /** * 获取商品统计 */ export function getShopGoodsStat() { - return request.get(`shop/stat/goods`) + return request.get(`shop/stat/goods`) } diff --git a/admin/src/addon/shop/api/shop_address.ts b/admin/src/addon/shop/api/shop_address.ts index 450d2ddc..563deacd 100644 --- a/admin/src/addon/shop/api/shop_address.ts +++ b/admin/src/addon/shop/api/shop_address.ts @@ -6,7 +6,7 @@ import request from '@/utils/request' * @returns */ export function getShopAddressList(params: Record) { - return request.get(`shop/shop_address`, { params }) + return request.get(`shop/shop_address`, { params }) } /** @@ -15,7 +15,7 @@ export function getShopAddressList(params: Record) { * @returns */ export function getShopAddressInfo(id: number) { - return request.get(`shop/shop_address/${ id }`); + return request.get(`shop/shop_address/${id}`) } /** @@ -24,7 +24,10 @@ export function getShopAddressInfo(id: number) { * @returns */ export function addShopAddress(params: Record) { - return request.post('shop/shop_address', params, { showErrorMessage: true, showSuccessMessage: true }) + return request.post('shop/shop_address', params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -33,7 +36,10 @@ export function addShopAddress(params: Record) { * @returns */ export function editShopAddress(params: Record) { - return request.put(`shop/shop_address/${ params.id }`, params, { showErrorMessage: true, showSuccessMessage: true }) + return request.put(`shop/shop_address/${params.id}`, params, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -42,7 +48,10 @@ export function editShopAddress(params: Record) { * @returns */ export function deleteShopAddress(id: number) { - return request.delete(`shop/shop_address/${ id }`, { showErrorMessage: true, showSuccessMessage: true }) + return request.delete(`shop/shop_address/${id}`, { + showErrorMessage: true, + showSuccessMessage: true, + }) } /** @@ -50,7 +59,7 @@ export function deleteShopAddress(id: number) { * @returns */ export function getShopDefaultDeliveryAddressInfo() { - return request.get('shop/shop_address/default/delivery'); + return request.get('shop/shop_address/default/delivery') } /** @@ -58,5 +67,5 @@ export function getShopDefaultDeliveryAddressInfo() { * @returns */ export function getOrderRefundAddress() { - return request.get('shop/order/refund/address'); -} \ No newline at end of file + return request.get('shop/order/refund/address') +} diff --git a/admin/src/addon/shop/api/stat.ts b/admin/src/addon/shop/api/stat.ts index b0e49c1d..8759bc56 100644 --- a/admin/src/addon/shop/api/stat.ts +++ b/admin/src/addon/shop/api/stat.ts @@ -4,7 +4,7 @@ import request from '@/utils/request' * @returns */ export function getGoodsStatisticsBasic(params: Record) { - return request.get('shop/goods/statistics/basic', { params }) + return request.get('shop/goods/statistics/basic', { params }) } /** @@ -12,13 +12,13 @@ export function getGoodsStatisticsBasic(params: Record) { * @returns */ export function getGoodsStatisticsTrend(params: Record) { - return request.get('shop/goods/statistics/trend', { params }) + return request.get('shop/goods/statistics/trend', { params }) } /** * 获取商品排行榜统计类型 */ export function getGoodsStatisticsType() { - return request.get(`shop/goods/statistics/type`) + return request.get(`shop/goods/statistics/type`) } /** @@ -26,5 +26,5 @@ export function getGoodsStatisticsType() { * @returns */ export function getGoodsStatisticsRank(params: Record) { - return request.get('shop/goods/statistics/rank', { params }) + return request.get('shop/goods/statistics/rank', { params }) } diff --git a/admin/src/addon/shop/lang/zh-cn/address.edit.json b/admin/src/addon/shop/lang/zh-cn/address.edit.json index 43e5ec4a..503f3b68 100644 --- a/admin/src/addon/shop/lang/zh-cn/address.edit.json +++ b/admin/src/addon/shop/lang/zh-cn/address.edit.json @@ -1,35 +1,35 @@ { - "contactName":"联系人", - "mobile":"联系方式", - "provinceId":"省", - "cityId":"市", - "districtId":"区", - "address":"详细地址", - "fullAddress":"地址", - "lat":"纬度", - "lng":"经度", - "isDeliveryAddress":"是否是发货地址", - "isRefundAddress":"是否是退货地址", - "isDefaultDelivery":"默认发货地址", - "isDefaultRefund":"默认收货地址", - "contactNamePlaceholder":"请输入联系人", - "mobilePlaceholder":"请输入联系方式", - "mobileTips":"请输入正确的手机号", - "addressPlaceholder":"请输入详细地址", - "fullAddressPlaceholder":"请输入地址", - "latPlaceholder":"请输入纬度", - "lngPlaceholder":"请输入经度", - "isDeliveryAddressPlaceholder":"请输入是否是发货地址", - "isRefundAddressPlaceholder":"请输入是否是退货地址", - "isDefaultDeliveryPlaceholder":"请输入默认发货地址", - "isDefaultRefundPlaceholder":"请输入默认收货地址", - "addShopAddress":"添加商家地址库", - "updateShopAddress":"编辑商家地址库", - "shopAddressDeleteTips":"确定要删除该商家地址库吗?", - "addressType": "地址类型", - "deliveryAddress": "发货地址", - "refundAddress": "收货地址", - "defaultDeliveryAddress": "是否设为默认发货地址", - "defaultRefundAddress": "是否设为默认收货地址", - "addressTypeRequire": "至少需设置一项类型" -} \ No newline at end of file + "contactName": "联系人", + "mobile": "联系方式", + "provinceId": "省", + "cityId": "市", + "districtId": "区", + "address": "详细地址", + "fullAddress": "地址", + "lat": "纬度", + "lng": "经度", + "isDeliveryAddress": "是否是发货地址", + "isRefundAddress": "是否是退货地址", + "isDefaultDelivery": "默认发货地址", + "isDefaultRefund": "默认收货地址", + "contactNamePlaceholder": "请输入联系人", + "mobilePlaceholder": "请输入联系方式", + "mobileTips": "请输入正确的手机号", + "addressPlaceholder": "请输入详细地址", + "fullAddressPlaceholder": "请输入地址", + "latPlaceholder": "请输入纬度", + "lngPlaceholder": "请输入经度", + "isDeliveryAddressPlaceholder": "请输入是否是发货地址", + "isRefundAddressPlaceholder": "请输入是否是退货地址", + "isDefaultDeliveryPlaceholder": "请输入默认发货地址", + "isDefaultRefundPlaceholder": "请输入默认收货地址", + "addShopAddress": "添加商家地址库", + "updateShopAddress": "编辑商家地址库", + "shopAddressDeleteTips": "确定要删除该商家地址库吗?", + "addressType": "地址类型", + "deliveryAddress": "发货地址", + "refundAddress": "收货地址", + "defaultDeliveryAddress": "是否设为默认发货地址", + "defaultRefundAddress": "是否设为默认收货地址", + "addressTypeRequire": "至少需设置一项类型" +} diff --git a/admin/src/addon/shop/lang/zh-cn/address.list.json b/admin/src/addon/shop/lang/zh-cn/address.list.json index 17372d2e..29bd5fa0 100644 --- a/admin/src/addon/shop/lang/zh-cn/address.list.json +++ b/admin/src/addon/shop/lang/zh-cn/address.list.json @@ -22,4 +22,4 @@ "deliveryAddress": "发货地址", "refundAddress": "收货地址", "default": "默认" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/common.json b/admin/src/addon/shop/lang/zh-cn/common.json index f53e8247..0a5c41da 100644 --- a/admin/src/addon/shop/lang/zh-cn/common.json +++ b/admin/src/addon/shop/lang/zh-cn/common.json @@ -88,41 +88,41 @@ "goodsSearchSet": "搜索设置", "goodsSearchText": "搜索内容", "goodsSearchTextPlaceholder": "请输入搜索内容", - "shopMemberInfoComponentUidTextColor":"编号颜色", - "shopMemberInfoComponentAccount":"账号信息", - "shopGoodsRecommendComponentTag":"标签", - "shopGoodsRecommendComponentTagcolor":"标签颜色", - "shopGoodsRecommendComponentTagPlaceholder":"请输入标签内容", - "shopGoodsRecommendComponentButtonBorderColor":"按钮边框颜色", - "carouselStyle":"轮播样式", - "recommendIndicatorStyle":"指示器设置", - "recommendIndicatorColor":"常规颜色", - "recommendIndicatorActiveColor":"选中颜色", - "activeCubeBlockContent":"板块内容" , - "bgImage":"背景图片", - "rankingTitleIcon":"图标" , - "rankSelect":"榜单选择", - "rankName":"榜单名称", - "rankNamePlaceholder":"请输入榜单名称", - "showGoodsNum":"榜单商品数量", - "goodsSourceName":"商品来源", - "ruleTypeName":"排序规则", - "rankTypeName":"排行周期", + "shopMemberInfoComponentUidTextColor": "编号颜色", + "shopMemberInfoComponentAccount": "账号信息", + "shopGoodsRecommendComponentTag": "标签", + "shopGoodsRecommendComponentTagcolor": "标签颜色", + "shopGoodsRecommendComponentTagPlaceholder": "请输入标签内容", + "shopGoodsRecommendComponentButtonBorderColor": "按钮边框颜色", + "carouselStyle": "轮播样式", + "recommendIndicatorStyle": "指示器设置", + "recommendIndicatorColor": "常规颜色", + "recommendIndicatorActiveColor": "选中颜色", + "activeCubeBlockContent": "板块内容", + "bgImage": "背景图片", + "rankingTitleIcon": "图标", + "rankSelect": "榜单选择", + "rankName": "榜单名称", + "rankNamePlaceholder": "请输入榜单名称", + "showGoodsNum": "榜单商品数量", + "goodsSourceName": "商品来源", + "ruleTypeName": "排序规则", + "rankTypeName": "排行周期", "rankSelectPopupAfterTip": "个榜单", "rankSelectPopupGoodsMinTip": "所选榜单数量不能少于", "rankSelectPopupGoodsMaxTip": "所选榜单数量不能超过", - "rankingTitleImage":"头部图片" , - "rankingSubTitle":"副标题", - "rankingSubTitleTextColor":"副标题颜色", - "rankTextColor":"名称颜色", - "rankingSubTitleLink":"副标题链接", - "listFrameColor":"背景颜色", - "topRounded":"上圆角", - "bottomRounded":"下圆角", + "rankingTitleImage": "头部图片", + "rankingSubTitle": "副标题", + "rankingSubTitleTextColor": "副标题颜色", + "rankTextColor": "名称颜色", + "rankingSubTitleLink": "副标题链接", + "listFrameColor": "背景颜色", + "topRounded": "上圆角", + "bottomRounded": "下圆角", "rankingStyle": "板块样式", "styleRecommend": "风格推荐", "countDownStyle": "倒计时样式", "newcomerNumberColor": "数字颜色", "newcomerNumberBg": "数字背景色", "newcomerOtherColor": "文字颜色" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.company.json b/admin/src/addon/shop/lang/zh-cn/delivery.company.json index 7f74fd91..79ab26be 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.company.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.company.json @@ -1,20 +1,20 @@ { - "companyId":"", - "companyIdPlaceholder":"请输入", - "companyName":"名称", - "companyNamePlaceholder":"请输入物流公司名称", - "logo":"LOGO", - "logoPlaceholder":"请输入物流公司logo", - "url":"网址", - "urlPlaceholder":"请输入物流公司网址", - "expressNoPlaceholder":"请输入物流公司编号", - "expressNoTips": "物流公司编号作用于物流查询,请根据物流跟踪对应配置设置编号", - "expressNoKd100":"快递100编码", - "expressNoKd100Placeholder":"请输入快递100编码", - "addCompany":"添加物流公司", - "updateCompany":"编辑物流公司", - "electronicSheetSwitchName": "是否支持电子面单", - "expressNoElectronicSheet":"电子面单编号", - "expressNo":"物流跟踪编号", - "companyDeleteTips":"确定要删除该数据吗?" -} \ No newline at end of file + "companyId": "", + "companyIdPlaceholder": "请输入", + "companyName": "名称", + "companyNamePlaceholder": "请输入物流公司名称", + "logo": "LOGO", + "logoPlaceholder": "请输入物流公司logo", + "url": "网址", + "urlPlaceholder": "请输入物流公司网址", + "expressNoPlaceholder": "请输入物流公司编号", + "expressNoTips": "物流公司编号作用于物流查询,请根据物流跟踪对应配置设置编号", + "expressNoKd100": "快递100编码", + "expressNoKd100Placeholder": "请输入快递100编码", + "addCompany": "添加物流公司", + "updateCompany": "编辑物流公司", + "electronicSheetSwitchName": "是否支持电子面单", + "expressNoElectronicSheet": "电子面单编号", + "expressNo": "物流跟踪编号", + "companyDeleteTips": "确定要删除该数据吗?" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.company_edit.json b/admin/src/addon/shop/lang/zh-cn/delivery.company_edit.json index 207333dc..33676130 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.company_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.company_edit.json @@ -1,44 +1,43 @@ { - "companyId":"", - "companyIdPlaceholder":"请输入", - "companyName":"名称", - "companyNamePlaceholder":"请输入物流公司名称", - "logo":"LOGO", - "logoPlaceholder":"请输入物流公司logo", - "url":"网址", - "urlPlaceholder":"请输入物流公司网址", - "expressNo":"物流跟踪编号", - "expressNoPlaceholder":"请输入物流公司编号", - "expressNoTips": "物流公司编号作用于物流查询,请根据物流跟踪对应配置设置编号", - "expressNoKd100":"快递100编码", - "expressNoKd100Placeholder":"请输入快递100编码", - "addCompany":"添加物流公司", - "updateCompany":"编辑物流公司", - "expressNoElectronicSheet":"电子面单编号", - "expressNoElectronicSheetTips":"电子面单编号作用于电子面单查询,请根据电子面单对应配置设置编号", - "printStyle": "模板样式", - "addPrintStyle": "添加模板样式", - "expType": "业务类型", - "addExpType": "添加业务类型", - "expTypeName": "业务名称", - "expTypeTextTips": "业务名称不能为空", - "expTypeValueTips": "业务值不能为空", - "expTypeTextRepeatTips": "业务名称不可以重复,请重新填写", - "expTypeValueRepeatTips": "业务值不可以重复,请重新填写", - "expTypeValueNullTips": "业务值不可以为零", - "expTypeValue": "业务值", - "electronicSheetSwitch": "是否支持电子面单", - "printStyleName": "模板名称" , - "printStyleNameTips": "模板名称不能为空", - "printStyleSizeTips": "模板尺寸不能为空", - "printStyleNameRepeatTips": "模板名称不可以重复,请重新填写", - "printStyleSizeRepeatTips": "模板尺寸不可以重复,请重新填写", - "printStyleId": "模板尺寸", - "expTypeTips": "快递鸟业务类型" , - "expTypeTips1": "不填默认为1" , - "printStyleTips": "快递鸟模版规格(常用)", - "printStyleTips1": "主流快递单打印纸尺寸一般为:76*130,100*180(单位mm)", - "printStyleTips2": "不填写则取物流公司的默认模板", - "examine": "点击查看" - -} \ No newline at end of file + "companyId": "", + "companyIdPlaceholder": "请输入", + "companyName": "名称", + "companyNamePlaceholder": "请输入物流公司名称", + "logo": "LOGO", + "logoPlaceholder": "请输入物流公司logo", + "url": "网址", + "urlPlaceholder": "请输入物流公司网址", + "expressNo": "物流跟踪编号", + "expressNoPlaceholder": "请输入物流公司编号", + "expressNoTips": "物流公司编号作用于物流查询,请根据物流跟踪对应配置设置编号", + "expressNoKd100": "快递100编码", + "expressNoKd100Placeholder": "请输入快递100编码", + "addCompany": "添加物流公司", + "updateCompany": "编辑物流公司", + "expressNoElectronicSheet": "电子面单编号", + "expressNoElectronicSheetTips": "电子面单编号作用于电子面单查询,请根据电子面单对应配置设置编号", + "printStyle": "模板样式", + "addPrintStyle": "添加模板样式", + "expType": "业务类型", + "addExpType": "添加业务类型", + "expTypeName": "业务名称", + "expTypeTextTips": "业务名称不能为空", + "expTypeValueTips": "业务值不能为空", + "expTypeTextRepeatTips": "业务名称不可以重复,请重新填写", + "expTypeValueRepeatTips": "业务值不可以重复,请重新填写", + "expTypeValueNullTips": "业务值不可以为零", + "expTypeValue": "业务值", + "electronicSheetSwitch": "是否支持电子面单", + "printStyleName": "模板名称", + "printStyleNameTips": "模板名称不能为空", + "printStyleSizeTips": "模板尺寸不能为空", + "printStyleNameRepeatTips": "模板名称不可以重复,请重新填写", + "printStyleSizeRepeatTips": "模板尺寸不可以重复,请重新填写", + "printStyleId": "模板尺寸", + "expTypeTips": "快递鸟业务类型", + "expTypeTips1": "不填默认为1", + "printStyleTips": "快递鸟模版规格(常用)", + "printStyleTips1": "主流快递单打印纸尺寸一般为:76*130,100*180(单位mm)", + "printStyleTips2": "不填写则取物流公司的默认模板", + "examine": "点击查看" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.config.json b/admin/src/addon/shop/lang/zh-cn/delivery.config.json index e502b15f..6f845c75 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.config.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.config.json @@ -1,11 +1,11 @@ { - "store":"启动门店自提后,买家可选择自提点提货。", - "express":"启用物流配送后,买家下单可以选择快递发货。", - "local_delivery":"启用同城配送后,在配送范围内的买家可以选择同城配送。", - "deliveryStaff":"配送员", - "deliveryCompany":"物流公司", - "deliveryTemplate":"运费模版", - "deliverySearch":"物流跟踪", - "deliveryStore":"自提点", - "localConfig": "同城配送设置" -} \ No newline at end of file + "store": "启动门店自提后,买家可选择自提点提货。", + "express": "启用物流配送后,买家下单可以选择快递发货。", + "local_delivery": "启用同城配送后,在配送范围内的买家可以选择同城配送。", + "deliveryStaff": "配送员", + "deliveryCompany": "物流公司", + "deliveryTemplate": "运费模版", + "deliverySearch": "物流跟踪", + "deliveryStore": "自提点", + "localConfig": "同城配送设置" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet.json b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet.json index 4b72fa8b..1c50cc68 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet.json @@ -14,4 +14,4 @@ "setDefault": "设为默认", "electronicSheetDeleteTips": "确定要删除该数据吗?", "electronicSheetSetDefaultTips": "确定要设置为默认模版吗?" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_config.json b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_config.json index b8fdb16a..b51d2662 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_config.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_config.json @@ -18,4 +18,4 @@ "serverPort2Placeholder": "请输入服务器端口2", "httpsPort": "HTTPS端口", "httpsPortPlaceholder": "请输入HTTPS端口" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_edit.json b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_edit.json index 2b1bee70..ce79ed5c 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.electronic_sheet_edit.json @@ -31,4 +31,4 @@ "examine": "点击查看", "customerNameTips": "快递鸟电子面单账号申请", "customerNameTips1": "电子面单账号对照表" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.local.json b/admin/src/addon/shop/lang/zh-cn/delivery.local.json index 321ec0cd..1c34ebb2 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.local.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.local.json @@ -1,55 +1,55 @@ { - "basicSettings":"同城配送基础设置", - "timeIsOpen":"配送时间设置", - "timeIsOpenTips":"开启后,买家下单选择同城配送时,可选择配送时间,提交订单后,将在买家备注中显示。", - "close": "关闭", - "open": "开启", - "everyDay": "每天", - "monday": "周一", - "tuesday": "周二", - "wednesday": "周三", - "thursday": "周四", - "friday": "周五", - "saturday": "周六", - "sunday": "周日", - "timeWeekRequire": "请选择配送时间", - "deliveryTimeSetting": "配送时间设置", - "feeType": "收费标准", - "region": "按区域收取配送费", - "distance": "按距离收取配送费", - "district": "按行政区域收取配送费", - "feeSetting": "费用设置", - "weightFee": "续重收费", - "feeSettingTextOne": "km内按", - "feeSettingTextTwo": "元收取配送费,每超出", - "feeSettingTextThree": "km费用增加", - "priceUnit": "元", - "weightFeeTextOne": "商品重量", - "weightFeeTextTwo": "kg 内不额外收费,每超出", - "weightFeeTextThree": "kg 费用增加", - "areaName": "区域名称", - "startPrice": "起送价", - "deliveryPrice": "配送费", - "areaType": "划分方式", - "radius": "半径", - "custom": "自定义", - "addDeliveryArea": "添加配送区域", - "baseDistRequire": "请输入起始公里数", - "gradDistRequire": "请输入超出公里数", - "basePriceRequire": "请输入起始公里内的配送费用", - "gradPriceRequire": "请输入每超出公里部分的费用", - "areaNameRequire": "请输入区域名称", - "startPriceRequire": "请输入起送价", - "startPriceMin": "起送价不能小于0", - "deliveryPriceRequire": "请输入配送费", - "deliveryPriceMin": "配送费不能小于0", - "areaPlaceholder": "请添加配送区域", - "deliveryType": "配送方式", - "business": "商家自配送", - "deliveryTypeRequire": "至少需选择一种配送方式", - "deliveryAddress": "取货地址", - "defaultDeliveryAddressEmpty": "请先配置默认发货地址", - "toSetting": "去配置", - "update": "修改", - "deliveryAddressChange": "取货地址已变更请注意是否需重新调整配送区域" -} \ No newline at end of file + "basicSettings": "同城配送基础设置", + "timeIsOpen": "配送时间设置", + "timeIsOpenTips": "开启后,买家下单选择同城配送时,可选择配送时间,提交订单后,将在买家备注中显示。", + "close": "关闭", + "open": "开启", + "everyDay": "每天", + "monday": "周一", + "tuesday": "周二", + "wednesday": "周三", + "thursday": "周四", + "friday": "周五", + "saturday": "周六", + "sunday": "周日", + "timeWeekRequire": "请选择配送时间", + "deliveryTimeSetting": "配送时间设置", + "feeType": "收费标准", + "region": "按区域收取配送费", + "distance": "按距离收取配送费", + "district": "按行政区域收取配送费", + "feeSetting": "费用设置", + "weightFee": "续重收费", + "feeSettingTextOne": "km内按", + "feeSettingTextTwo": "元收取配送费,每超出", + "feeSettingTextThree": "km费用增加", + "priceUnit": "元", + "weightFeeTextOne": "商品重量", + "weightFeeTextTwo": "kg 内不额外收费,每超出", + "weightFeeTextThree": "kg 费用增加", + "areaName": "区域名称", + "startPrice": "起送价", + "deliveryPrice": "配送费", + "areaType": "划分方式", + "radius": "半径", + "custom": "自定义", + "addDeliveryArea": "添加配送区域", + "baseDistRequire": "请输入起始公里数", + "gradDistRequire": "请输入超出公里数", + "basePriceRequire": "请输入起始公里内的配送费用", + "gradPriceRequire": "请输入每超出公里部分的费用", + "areaNameRequire": "请输入区域名称", + "startPriceRequire": "请输入起送价", + "startPriceMin": "起送价不能小于0", + "deliveryPriceRequire": "请输入配送费", + "deliveryPriceMin": "配送费不能小于0", + "areaPlaceholder": "请添加配送区域", + "deliveryType": "配送方式", + "business": "商家自配送", + "deliveryTypeRequire": "至少需选择一种配送方式", + "deliveryAddress": "取货地址", + "defaultDeliveryAddressEmpty": "请先配置默认发货地址", + "toSetting": "去配置", + "update": "修改", + "deliveryAddressChange": "取货地址已变更请注意是否需重新调整配送区域" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.search.json b/admin/src/addon/shop/lang/zh-cn/delivery.search.json index ccfb3e43..0b0e6436 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.search.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.search.json @@ -1,20 +1,20 @@ { - "prompt": "提示", - "promptTips1-1": "请到快递鸟官网申请", - "promptTips1-2": "快递鸟接口:目前只支持“申通,圆通、百世,极兔”免费查询。", - "promptTips2": "请到快递100官网申请", - "interfaceType": "接口类型", - "kdn": "快递鸟", - "kd100": "快递100", - "kdnEBusinessIDPlaceholder": "请输入快递鸟EBusinessID", - "kdnEBusinessIDTips": "快递鸟电商ID", - "kdnAppKeyPlaceholder": "请输入快递鸟AppKey", - "kdnAppKeyTips": "快递鸟分配的电商加密私钥", - "isPayEdition": "快递鸟套餐", - "free": "免费", - "pay": "付费", - "kd100AppKeyPlaceholder": "请输入快递100AppKey", - "kd100AppKeyTips": "快递100应用密钥", - "kd100CustomerPlaceholder": "请输入快递100Customer", - "kd100CustomerTips": "快递100分配给的公司编号" -} \ No newline at end of file + "prompt": "提示", + "promptTips1-1": "请到快递鸟官网申请", + "promptTips1-2": "快递鸟接口:目前只支持“申通,圆通、百世,极兔”免费查询。", + "promptTips2": "请到快递100官网申请", + "interfaceType": "接口类型", + "kdn": "快递鸟", + "kd100": "快递100", + "kdnEBusinessIDPlaceholder": "请输入快递鸟EBusinessID", + "kdnEBusinessIDTips": "快递鸟电商ID", + "kdnAppKeyPlaceholder": "请输入快递鸟AppKey", + "kdnAppKeyTips": "快递鸟分配的电商加密私钥", + "isPayEdition": "快递鸟套餐", + "free": "免费", + "pay": "付费", + "kd100AppKeyPlaceholder": "请输入快递100AppKey", + "kd100AppKeyTips": "快递100应用密钥", + "kd100CustomerPlaceholder": "请输入快递100Customer", + "kd100CustomerTips": "快递100分配给的公司编号" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.staff.json b/admin/src/addon/shop/lang/zh-cn/delivery.staff.json index 2d285388..a2f139bd 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.staff.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.staff.json @@ -1,9 +1,9 @@ { - "addDeliveryPersonnel":"添加配送员", - "updateDeliver":"编辑配送员", - "deliverName":"配送员名称", - "deliverMobile":"配送员手机号", - "deliverNamePlaceholder":"请输入配送员名称", - "deliverMobilePlaceholder":"请输入配送员手机号", - "deliverDeleteTips":"确定要删除该数据吗?" -} \ No newline at end of file + "addDeliveryPersonnel": "添加配送员", + "updateDeliver": "编辑配送员", + "deliverName": "配送员名称", + "deliverMobile": "配送员手机号", + "deliverNamePlaceholder": "请输入配送员名称", + "deliverMobilePlaceholder": "请输入配送员手机号", + "deliverDeleteTips": "确定要删除该数据吗?" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.store.json b/admin/src/addon/shop/lang/zh-cn/delivery.store.json index d3e0d04c..a20008d8 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.store.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.store.json @@ -1,18 +1,18 @@ { - "storeId":"", - "storeName":"自提点信息", - "storeNamePlaceholder":"请输入自提点名称", - "storeLogo":"自提点logo", - "storeMobile":"联系电话", - "address":"详细地址", - "fullAddress":"联系地址", - "longitude":"经度", - "latitude":"纬度", - "tradeTime":"营业时间", - "createTime":"添加时间", - "createTimePlaceholder":"请输入添加时间", - "addStore":"添加自提点", - "updateStore":"编辑自提点", - "storeDeleteTips":"确定要删除该数据吗?", - "storeInfo": "自提点信息" -} \ No newline at end of file + "storeId": "", + "storeName": "自提点信息", + "storeNamePlaceholder": "请输入自提点名称", + "storeLogo": "自提点logo", + "storeMobile": "联系电话", + "address": "详细地址", + "fullAddress": "联系地址", + "longitude": "经度", + "latitude": "纬度", + "tradeTime": "营业时间", + "createTime": "添加时间", + "createTimePlaceholder": "请输入添加时间", + "addStore": "添加自提点", + "updateStore": "编辑自提点", + "storeDeleteTips": "确定要删除该数据吗?", + "storeInfo": "自提点信息" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.store_edit.json b/admin/src/addon/shop/lang/zh-cn/delivery.store_edit.json index 861f59d2..48798606 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.store_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.store_edit.json @@ -1,38 +1,38 @@ { - "storeName":"自提点名称", - "storeDesc":"简介", - "storeLogo":"自提点logo", - "storeMobile":"手机号", - "provinceId":"省id", - "cityId":"市", - "districtId":"县(区)", - "address":"详细地址", - "fullAddress":"完整地址", - "longitude":"经度", - "latitude":"纬度", - "tradeTime":"营业时间", - "createTime":"下单时间", - "updateTime":"更新时间", - "storeNamePlaceholder":"请输入自提点名称", - "storeDescPlaceholder":"请输入简介", - "storeLogoPlaceholder":"请上传自提点logo", - "storeMobilePlaceholder":"请输入手机号", - "provinceIdPlaceholder":"请选择省id", - "cityIdPlaceholder":"请选择市", - "districtIdPlaceholder":"请选择县(区)", - "addressPlaceholder":"请输入详细地址", - "fullAddressPlaceholder":"请输入完整地址", - "longitudePlaceholder":"请输入经度", - "latitudePlaceholder":"请输入纬度", - "tradeTimePlaceholder":"请输入营业时间", - "tradeTimeTips": "例:上午9:00-12:00,下午2:00-6:00", - "createTimePlaceholder":"请选择添加时间", - "updateTimePlaceholder":"请输入更新时间", - "addStore":"添加自提点", - "updateStore":"编辑自提点", - "storeDeleteTips":"确定要删除该自提点吗?", - "storeAddress": "自提点地址", - "storeAddressPlaceholder": "请选择自提点地址", - "storeAddressDetail": "自提点详细地址", - "storeAddressDetailPlaceholder": "请输入自提点详细地址" -} \ No newline at end of file + "storeName": "自提点名称", + "storeDesc": "简介", + "storeLogo": "自提点logo", + "storeMobile": "手机号", + "provinceId": "省id", + "cityId": "市", + "districtId": "县(区)", + "address": "详细地址", + "fullAddress": "完整地址", + "longitude": "经度", + "latitude": "纬度", + "tradeTime": "营业时间", + "createTime": "下单时间", + "updateTime": "更新时间", + "storeNamePlaceholder": "请输入自提点名称", + "storeDescPlaceholder": "请输入简介", + "storeLogoPlaceholder": "请上传自提点logo", + "storeMobilePlaceholder": "请输入手机号", + "provinceIdPlaceholder": "请选择省id", + "cityIdPlaceholder": "请选择市", + "districtIdPlaceholder": "请选择县(区)", + "addressPlaceholder": "请输入详细地址", + "fullAddressPlaceholder": "请输入完整地址", + "longitudePlaceholder": "请输入经度", + "latitudePlaceholder": "请输入纬度", + "tradeTimePlaceholder": "请输入营业时间", + "tradeTimeTips": "例:上午9:00-12:00,下午2:00-6:00", + "createTimePlaceholder": "请选择添加时间", + "updateTimePlaceholder": "请输入更新时间", + "addStore": "添加自提点", + "updateStore": "编辑自提点", + "storeDeleteTips": "确定要删除该自提点吗?", + "storeAddress": "自提点地址", + "storeAddressPlaceholder": "请选择自提点地址", + "storeAddressDetail": "自提点详细地址", + "storeAddressDetailPlaceholder": "请输入自提点详细地址" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.template.json b/admin/src/addon/shop/lang/zh-cn/delivery.template.json index 4508f1eb..4f6ba643 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.template.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.template.json @@ -1,12 +1,12 @@ { - "templateName":"运费模板名称", - "templateNamePlaceholder":"请输入运费模板名称", - "createTime":"创建时间", - "addTemplate":"添加运费模板", - "updateTemplate":"编辑运费模板", - "templateDeleteTips":"确定要删除该模板吗?", - "feeTypeName": "计费类型", - "freeShipping": "指定区域包邮", - "open": "启用", - "close": "关闭" -} \ No newline at end of file + "templateName": "运费模板名称", + "templateNamePlaceholder": "请输入运费模板名称", + "createTime": "创建时间", + "addTemplate": "添加运费模板", + "updateTemplate": "编辑运费模板", + "templateDeleteTips": "确定要删除该模板吗?", + "feeTypeName": "计费类型", + "freeShipping": "指定区域包邮", + "open": "启用", + "close": "关闭" +} diff --git a/admin/src/addon/shop/lang/zh-cn/delivery.template_edit.json b/admin/src/addon/shop/lang/zh-cn/delivery.template_edit.json index 1cd0689e..5da4c502 100644 --- a/admin/src/addon/shop/lang/zh-cn/delivery.template_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/delivery.template_edit.json @@ -1,39 +1,39 @@ { - "templateName":"运费模板名称", - "templateNamePlaceholder":"请输入运费模板名称", - "createTime":"创建时间", - "addTemplate":"添加运费模板", - "updateTemplate":"编辑运费模板", - "templateDeleteTips":"确定要删除该模板吗?", - "feeTypeName": "计费类型", - "isDefault": "默认模板", - "num": "按件", - "weight": "按重量", - "volume": "按体积", - "feeSetting": "费用设置", - "selectArea": "选择地区", - "firstNum": "首件(件)", - "continueNum": "续件(件)", - "firstWeight": "首件重量(kg)", - "fee": "运费(元)", - "continueFee": "续费(元)", - "continueWeight": "续件重量(kg)", - "firstVolume": "首件体积(m³)", - "continueVolume": "续件体积(m³)", - "deliveryArea": "配送区域", - "addDeliveryArea": "添加单独配送区域", - "freeShipping": "指定区域包邮", - "freeShippingArea": "包邮区域", - "addFreeShippingArea": "添加包邮区域", - "freeShippingAreaTips": "两个条件满足其一便可以包邮", - "noDelivery": "不配送区域", - "addNoDelivery": "添加不配送区域", - "freeShippingNum": "包邮件数", - "freeShippingWeight": "包邮重量(kg)", - "freeShippingVolume": "包邮体积(m³)", - "freeShippingPrice": "包邮金额", - "areaPlaceholder":"请选择地区", - "noDeliveryPlaceholder": "请选择不配送的地区", - "freeShippingPlaceholder": "请选择包邮的地区", - "notUnderZero": "不能小于等于0" -} \ No newline at end of file + "templateName": "运费模板名称", + "templateNamePlaceholder": "请输入运费模板名称", + "createTime": "创建时间", + "addTemplate": "添加运费模板", + "updateTemplate": "编辑运费模板", + "templateDeleteTips": "确定要删除该模板吗?", + "feeTypeName": "计费类型", + "isDefault": "默认模板", + "num": "按件", + "weight": "按重量", + "volume": "按体积", + "feeSetting": "费用设置", + "selectArea": "选择地区", + "firstNum": "首件(件)", + "continueNum": "续件(件)", + "firstWeight": "首件重量(kg)", + "fee": "运费(元)", + "continueFee": "续费(元)", + "continueWeight": "续件重量(kg)", + "firstVolume": "首件体积(m³)", + "continueVolume": "续件体积(m³)", + "deliveryArea": "配送区域", + "addDeliveryArea": "添加单独配送区域", + "freeShipping": "指定区域包邮", + "freeShippingArea": "包邮区域", + "addFreeShippingArea": "添加包邮区域", + "freeShippingAreaTips": "两个条件满足其一便可以包邮", + "noDelivery": "不配送区域", + "addNoDelivery": "添加不配送区域", + "freeShippingNum": "包邮件数", + "freeShippingWeight": "包邮重量(kg)", + "freeShippingVolume": "包邮体积(m³)", + "freeShippingPrice": "包邮金额", + "areaPlaceholder": "请选择地区", + "noDeliveryPlaceholder": "请选择不配送的地区", + "freeShippingPlaceholder": "请选择包邮的地区", + "notUnderZero": "不能小于等于0" +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.attr.json b/admin/src/addon/shop/lang/zh-cn/goods.attr.json index e0290cdc..d0f352b9 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.attr.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.attr.json @@ -5,6 +5,6 @@ "addShopGoodsAttr": "添加参数模板", "updateShopGoodsAttr": "编辑参数模板", "goodsAttrDeleteTips": "确定要删除该数据吗?", - "sortTips":"排序号格式输入错误", + "sortTips": "排序号格式输入错误", "manage": "管理" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.attr_edit.json b/admin/src/addon/shop/lang/zh-cn/goods.attr_edit.json index 0c03e2ae..d127a986 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.attr_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.attr_edit.json @@ -15,4 +15,4 @@ "attrValueName": "参数名称", "addAttrValue": "添加参数", "attrValueNamePlaceholder": "请输入参数名称" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.brand_list.json b/admin/src/addon/shop/lang/zh-cn/goods.brand_list.json index 71be5bba..24733403 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.brand_list.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.brand_list.json @@ -1,15 +1,15 @@ { - "brandId":"品牌ID", - "brandIdPlaceholder":"请输入品牌ID", - "brandName":"品牌名称", - "brandNamePlaceholder":"请输入品牌名称", - "logo":"品牌logo", - "logoPlaceholder":"请输入品牌logo", - "desc":"品牌介绍", - "descPlaceholder":"请输入品牌介绍", - "sort":"排序", - "sortPlaceholder":"请输入排序", - "addBrand":"添加商品品牌", - "updateBrand":"编辑商品品牌", - "brandDeleteTips":"确定要删除该数据吗?" -} \ No newline at end of file + "brandId": "品牌ID", + "brandIdPlaceholder": "请输入品牌ID", + "brandName": "品牌名称", + "brandNamePlaceholder": "请输入品牌名称", + "logo": "品牌logo", + "logoPlaceholder": "请输入品牌logo", + "desc": "品牌介绍", + "descPlaceholder": "请输入品牌介绍", + "sort": "排序", + "sortPlaceholder": "请输入排序", + "addBrand": "添加商品品牌", + "updateBrand": "编辑商品品牌", + "brandDeleteTips": "确定要删除该数据吗?" +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.category.json b/admin/src/addon/shop/lang/zh-cn/goods.category.json index fd8f9f7f..c2d44c2f 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.category.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.category.json @@ -1,26 +1,26 @@ { - "categoryId":"商品分类id", - "categoryIdPlaceholder":"请输入商品分类id", - "categoryName":"分类名称", - "categoryNamePlaceholder":"请输入分类名称", - "image":"分类图片", - "imagePlaceholder":"请输入分类图片", - "pid":"上级分类", - "pidPlaceholder":"请选择上级分类", - "categoryFullName":"组装分类名称", - "categoryFullNamePlaceholder":"请输入组装分类名称", - "isShow":"是否显示", - "sort":"排序号", - "sortPlaceholder":"请输入排序号", - "addCategory":"添加商品分类", - "updateCategory":"编辑商品分类", - "categoryDeleteTips":"确定要删除该数据吗?", - "categoryDeleteTips1":"子级分类也会删除,确定要删除该数据吗?", - "spreadGoodsCategory": "推广", - "goodsCategorySpreadTitle": "商品分类推广", - "spreadLink": "推广链接", - "copy": "复制", - "downloadQrcode": "下载二维码", - "tabGoodsCategory": "商品分类", - "tabGoodsCategoryConfig": "分类设置" -} \ No newline at end of file + "categoryId": "商品分类id", + "categoryIdPlaceholder": "请输入商品分类id", + "categoryName": "分类名称", + "categoryNamePlaceholder": "请输入分类名称", + "image": "分类图片", + "imagePlaceholder": "请输入分类图片", + "pid": "上级分类", + "pidPlaceholder": "请选择上级分类", + "categoryFullName": "组装分类名称", + "categoryFullNamePlaceholder": "请输入组装分类名称", + "isShow": "是否显示", + "sort": "排序号", + "sortPlaceholder": "请输入排序号", + "addCategory": "添加商品分类", + "updateCategory": "编辑商品分类", + "categoryDeleteTips": "确定要删除该数据吗?", + "categoryDeleteTips1": "子级分类也会删除,确定要删除该数据吗?", + "spreadGoodsCategory": "推广", + "goodsCategorySpreadTitle": "商品分类推广", + "spreadLink": "推广链接", + "copy": "复制", + "downloadQrcode": "下载二维码", + "tabGoodsCategory": "商品分类", + "tabGoodsCategoryConfig": "分类设置" +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.category_config.json b/admin/src/addon/shop/lang/zh-cn/goods.category_config.json index 041cb29f..7a9978d9 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.category_config.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.category_config.json @@ -1,27 +1,27 @@ { - "categoryTemplate":"分类模板", - "categoryType":"分类类型", - "categorystyleOne":"一级分类", - "categorystyleTwo":"二级分类", - "pageSettings":"页面设置", - "pageTitle":"页面名称", - "pageTitlePlaceholder":"请输入页面名称", - "searchControl":"搜索栏", - "searchTitle":"搜索栏文字", - "searchTitlePlaceholder":"请输入搜索栏文字", - "open":"开启", - "close":"关闭", - "goodsStyle":"商品排列", - "singleCols": "单列", - "doubleCols": "双列", - "sort":"商品排序", - "sortPlaceholder":"请选择商品排序", - "cartControl":"购物车显示", - "cartStyle":"购物车样式", - "cartTextPlaceholder":"请输入购物车按钮文字", - "cartEvent":"点击按钮", - "detail": "跳转商品详情", - "cart": "加入购物车", - "tabGoodsCategory": "商品分类", - "tabGoodsCategoryConfig": "分类设置" -} \ No newline at end of file + "categoryTemplate": "分类模板", + "categoryType": "分类类型", + "categorystyleOne": "一级分类", + "categorystyleTwo": "二级分类", + "pageSettings": "页面设置", + "pageTitle": "页面名称", + "pageTitlePlaceholder": "请输入页面名称", + "searchControl": "搜索栏", + "searchTitle": "搜索栏文字", + "searchTitlePlaceholder": "请输入搜索栏文字", + "open": "开启", + "close": "关闭", + "goodsStyle": "商品排列", + "singleCols": "单列", + "doubleCols": "双列", + "sort": "商品排序", + "sortPlaceholder": "请选择商品排序", + "cartControl": "购物车显示", + "cartStyle": "购物车样式", + "cartTextPlaceholder": "请输入购物车按钮文字", + "cartEvent": "点击按钮", + "detail": "跳转商品详情", + "cart": "加入购物车", + "tabGoodsCategory": "商品分类", + "tabGoodsCategoryConfig": "分类设置" +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.evaluate.json b/admin/src/addon/shop/lang/zh-cn/goods.evaluate.json index 731211ce..ffee2f50 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.evaluate.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.evaluate.json @@ -1,49 +1,49 @@ { - "evaluateId":"", - "evaluateIdPlaceholder":"请输入", - "orderId":"订单id", - "orderIdPlaceholder":"请输入订单id", - "orderGoodsId":"订单项ID", - "orderGoodsIdPlaceholder":"请输入订单项ID", - "goodsId":"商品ID", - "goodsIdPlaceholder":"请选择商品", - "memberId":"会员ID", - "memberIdPlaceholder":"请输入会员ID", - "content":"评价内容", - "contentPlaceholder":"请输入评价内容", - "images":"评价图片", - "imagesPlaceholder":"请输入评价图片", - "isAnonymous":"是否匿名", - "anonymous": "匿名", - "notAnonymous": "不匿名", - "scores":"评价等级", - "scoresPlaceholder":"请输入评价分数 1-5", - "auditName":"审核状态", - "explainFirst":"商家回复", - "explainFirstPlaceholder": "请输入商家回复", - "createTime":"评价时间", - "createTimePlaceholder":"请输入评价时间", - "again": "追评", - "againTime":"追评时间", - "againTimePlaceholder":"请输入追评时间", - "isShow":"是否显示", - "show": "显示", - "notShow": "不显示", - "isShowPlaceholder":"请输入是否显示 1显示 2不显示", - "addEvaluate":"添加自评", - "updateEvaluate":"编辑商品评价", - "evaluateDeleteTips":"确定要删除该数据吗?", - "goodsInfo": "商品信息", - "memberHead": "会员头像", - "memberName": "会员名称", - "memberNamePlaceholder": "请输入会员名称", - "adopt": "通过", - "refuse": "拒绝", - "auditAdoptTips": "确定要通过审核吗?", - "reply": "回复", - "goodsName": "商品名称", - "goodsNamePlaceholder": "请输入商品名称", - "topping": "置顶", - "cancelTopping": "取消置顶", - "memberHeadPlaceholder": "请上传会员头像" -} \ No newline at end of file + "evaluateId": "", + "evaluateIdPlaceholder": "请输入", + "orderId": "订单id", + "orderIdPlaceholder": "请输入订单id", + "orderGoodsId": "订单项ID", + "orderGoodsIdPlaceholder": "请输入订单项ID", + "goodsId": "商品ID", + "goodsIdPlaceholder": "请选择商品", + "memberId": "会员ID", + "memberIdPlaceholder": "请输入会员ID", + "content": "评价内容", + "contentPlaceholder": "请输入评价内容", + "images": "评价图片", + "imagesPlaceholder": "请输入评价图片", + "isAnonymous": "是否匿名", + "anonymous": "匿名", + "notAnonymous": "不匿名", + "scores": "评价等级", + "scoresPlaceholder": "请输入评价分数 1-5", + "auditName": "审核状态", + "explainFirst": "商家回复", + "explainFirstPlaceholder": "请输入商家回复", + "createTime": "评价时间", + "createTimePlaceholder": "请输入评价时间", + "again": "追评", + "againTime": "追评时间", + "againTimePlaceholder": "请输入追评时间", + "isShow": "是否显示", + "show": "显示", + "notShow": "不显示", + "isShowPlaceholder": "请输入是否显示 1显示 2不显示", + "addEvaluate": "添加自评", + "updateEvaluate": "编辑商品评价", + "evaluateDeleteTips": "确定要删除该数据吗?", + "goodsInfo": "商品信息", + "memberHead": "会员头像", + "memberName": "会员名称", + "memberNamePlaceholder": "请输入会员名称", + "adopt": "通过", + "refuse": "拒绝", + "auditAdoptTips": "确定要通过审核吗?", + "reply": "回复", + "goodsName": "商品名称", + "goodsNamePlaceholder": "请输入商品名称", + "topping": "置顶", + "cancelTopping": "取消置顶", + "memberHeadPlaceholder": "请上传会员头像" +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.evaluate_edit.json b/admin/src/addon/shop/lang/zh-cn/goods.evaluate_edit.json index e9224851..f9347a12 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.evaluate_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.evaluate_edit.json @@ -1,37 +1,37 @@ { - "orderId":"订单id", - "orderGoodsId":"订单项ID", - "goodsId":"商品ID", - "memberId":"会员ID", - "content":"评价内容", - "images":"评价图片", - "isAnonymous":"0 匿名 1不匿名", - "scores":"评价分数 1-5", - "isAudit":"审核状态 1待审 2通过 3拒绝", - "explainFirst":"解释内容", - "againContent":"追评内容", - "againImages":"追评图片", - "againExplain":"追评解释", - "againTime":"追评时间", - "againIsAudit":"审核状态 1待审 2通过 3拒绝", - "isShow":"是否显示 1显示 2不显示", - "orderIdPlaceholder":"请输入订单id", - "orderGoodsIdPlaceholder":"请输入订单项ID", - "goodsIdPlaceholder":"请输入商品ID", - "memberIdPlaceholder":"请输入会员ID", - "contentPlaceholder":"请输入评价内容", - "imagesPlaceholder":"请上传评价图片", - "isAnonymousPlaceholder":"请输入0 匿名 1不匿名", - "scoresPlaceholder":"请输入评价分数 1-5", - "isAuditPlaceholder":"请输入审核状态 1待审 2通过 3拒绝", - "explainFirstPlaceholder":"请输入解释内容", - "againContentPlaceholder":"请输入追评内容", - "againImagesPlaceholder":"请上传追评图片", - "againExplainPlaceholder":"请输入追评解释", - "againTimePlaceholder":"请输入追评时间", - "againIsAuditPlaceholder":"请输入审核状态 1待审 2通过 3拒绝", - "isShowPlaceholder":"请输入是否显示 1显示 2不显示", - "addEvaluate":"添加商品评价", - "updateEvaluate":"编辑商品评价", - "evaluateDeleteTips":"确定要删除该商品评价吗?" -} \ No newline at end of file + "orderId": "订单id", + "orderGoodsId": "订单项ID", + "goodsId": "商品ID", + "memberId": "会员ID", + "content": "评价内容", + "images": "评价图片", + "isAnonymous": "0 匿名 1不匿名", + "scores": "评价分数 1-5", + "isAudit": "审核状态 1待审 2通过 3拒绝", + "explainFirst": "解释内容", + "againContent": "追评内容", + "againImages": "追评图片", + "againExplain": "追评解释", + "againTime": "追评时间", + "againIsAudit": "审核状态 1待审 2通过 3拒绝", + "isShow": "是否显示 1显示 2不显示", + "orderIdPlaceholder": "请输入订单id", + "orderGoodsIdPlaceholder": "请输入订单项ID", + "goodsIdPlaceholder": "请输入商品ID", + "memberIdPlaceholder": "请输入会员ID", + "contentPlaceholder": "请输入评价内容", + "imagesPlaceholder": "请上传评价图片", + "isAnonymousPlaceholder": "请输入0 匿名 1不匿名", + "scoresPlaceholder": "请输入评价分数 1-5", + "isAuditPlaceholder": "请输入审核状态 1待审 2通过 3拒绝", + "explainFirstPlaceholder": "请输入解释内容", + "againContentPlaceholder": "请输入追评内容", + "againImagesPlaceholder": "请上传追评图片", + "againExplainPlaceholder": "请输入追评解释", + "againTimePlaceholder": "请输入追评时间", + "againIsAuditPlaceholder": "请输入审核状态 1待审 2通过 3拒绝", + "isShowPlaceholder": "请输入是否显示 1显示 2不显示", + "addEvaluate": "添加商品评价", + "updateEvaluate": "编辑商品评价", + "evaluateDeleteTips": "确定要删除该商品评价吗?" +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.label_group_list.json b/admin/src/addon/shop/lang/zh-cn/goods.label_group_list.json index dfceabec..91990e86 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.label_group_list.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.label_group_list.json @@ -9,4 +9,4 @@ "updateLabelGroup": "编辑标签分组", "sortTips": "排序号格式输入错误", "labelGroupDeleteTips": "确定要删除该数据吗?" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.label_list.json b/admin/src/addon/shop/lang/zh-cn/goods.label_list.json index c5230b4c..0fe25d86 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.label_list.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.label_list.json @@ -27,4 +27,4 @@ "status": "状态", "label": "标签", "createTime": "创建时间" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.list.json b/admin/src/addon/shop/lang/zh-cn/goods.list.json index 2fc98f61..db15b77e 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.list.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.list.json @@ -14,13 +14,13 @@ "startSaleNumTips": "最低销量输入错误", "endSaleNumPlaceholder": "最高销量", "endSaleNumTips": "最高销量输入错误", - "shopSaleNumTips":"最低销量不能大于最高销量", + "shopSaleNumTips": "最低销量不能大于最高销量", "skuPrice": "价格", "startPricePlaceholder": "最低价格", "startPriceTips": "最低价格输入错误", "endPricePlaceholder": "最高价格", "endPriceTips": "最高价格输入错误", - "shopPriceTips":"最低价格不能大于最高价格", + "shopPriceTips": "最低价格不能大于最高价格", "statusOn": "销售中", "statusOff": "仓库中", "statusAll": "全部商品", @@ -40,7 +40,7 @@ "addGoods": "添加商品", "statusActionOn": "上架", "statusActionOff": "下架", - "statusChangeTips":"确定要下架该商品吗?", + "statusChangeTips": "确定要下架该商品吗?", "spreadGoods": "推广", "copyGoods": "复制", @@ -105,7 +105,6 @@ "discountHint": "会员折扣说明:按照默认会员等级折扣优惠", "fixedPriceHint": "会员价说明:指定优惠价格,商品未参与活动时,按照会员价优惠,若商品参与活动,则以活动价为准", - "addGoodsLabel": "添加商品标签", "addGoodsService": "添加商品服务", "addGoodsCategory": "添加分类", @@ -133,9 +132,9 @@ "addDeliveryTemplateId": "添加运费模板", "deliveryType": "配送方式", "deliveryTypePlaceholder": "请选择配送方式", - "yuan":"元", - "label":"商品标签", - "service":"商品服务", + "yuan": "元", + "label": "商品标签", + "service": "商品服务", "virtualSaleNum": "虚拟销量", "goodsBrand": "商品品牌", "goodsPoster": "商品海报", diff --git a/admin/src/addon/shop/lang/zh-cn/goods.real_edit.json b/admin/src/addon/shop/lang/zh-cn/goods.real_edit.json index 67b335b4..ce01c9ba 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.real_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.real_edit.json @@ -11,9 +11,9 @@ "subTitlePlaceholder": "请输入副标题", "subTitleMaxLengthTips": "副标题不能超过80个字符", "goodsImage": "商品图片", - "goodsImagePlaceholder":"请上传商品图片", + "goodsImagePlaceholder": "请上传商品图片", "goodsVideo": "商品视频", - "goodsVideoPlaceholder":"请上传商品视频", + "goodsVideoPlaceholder": "请上传商品视频", "goodsCategory": "商品分类", "refresh": "刷新", "addGoodsCategory": "添加分类", @@ -87,21 +87,21 @@ "deliveryTab": "配送设置", "deliveryType": "配送方式", "deliveryTypePlaceholder": "请选择配送方式", - "pleaseSelectSku":"请先选择商品规格", - "isLimit":"是否限购", - "isLimitTips":"启用限购后,购买商品时,会对该商品购买量做限制判断。", - "limitType":"限购类型", - "limitTypeTips":"单次限购是针对于每次下单不能超过限购数量,单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。", - "singleTime":"单次限购", - "singlePerson":"单人限购", - "maxBuy":"限购数量", - "maxBuyPlaceholder":"请输入限购数量", + "pleaseSelectSku": "请先选择商品规格", + "isLimit": "是否限购", + "isLimitTips": "启用限购后,购买商品时,会对该商品购买量做限制判断。", + "limitType": "限购类型", + "limitTypeTips": "单次限购是针对于每次下单不能超过限购数量,单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。", + "singleTime": "单次限购", + "singlePerson": "单人限购", + "maxBuy": "限购数量", + "maxBuyPlaceholder": "请输入限购数量", "maxBuyTips": "[限购数量]格式输入错误", - "maxBuyWarnTips":"限购数量超出商品库存时,买家将无法购买该商品", + "maxBuyWarnTips": "限购数量超出商品库存时,买家将无法购买该商品", "maxBuyNotZeroTips": "限购数量不能小于1", - "minBuy":"起购数量", - "minBuyTips":"起购数量超出商品库存时,买家将无法购买该商品", - "minBuyFormatErrorTips":"[起购数量]格式输入错误", + "minBuy": "起购数量", + "minBuyTips": "起购数量超出商品库存时,买家将无法购买该商品", + "minBuyFormatErrorTips": "[起购数量]格式输入错误", "minBuyNotZeroTips": "起购数量不能小于0", "minBuyGreaterThanMaxBuyTips": "起购数量不能大于限购数量", diff --git a/admin/src/addon/shop/lang/zh-cn/goods.service.json b/admin/src/addon/shop/lang/zh-cn/goods.service.json index 95510240..18515ce1 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.service.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.service.json @@ -1,10 +1,10 @@ { - "serviceName":"服务名称", - "serviceNamePlaceholder":"请输入服务名称", - "desc":"描述", - "descPlaceholder":"请输入描述", - "addServe":"添加商品服务", - "updateServe":"编辑商品服务", - "serveDeleteTips":"确定要删除该数据吗?", - "imagePlaceholder": "请上传服务图片" -} \ No newline at end of file + "serviceName": "服务名称", + "serviceNamePlaceholder": "请输入服务名称", + "desc": "描述", + "descPlaceholder": "请输入描述", + "addServe": "添加商品服务", + "updateServe": "编辑商品服务", + "serveDeleteTips": "确定要删除该数据吗?", + "imagePlaceholder": "请上传服务图片" +} diff --git a/admin/src/addon/shop/lang/zh-cn/goods.virtual_edit.json b/admin/src/addon/shop/lang/zh-cn/goods.virtual_edit.json index 40fbe3c3..79043fa3 100644 --- a/admin/src/addon/shop/lang/zh-cn/goods.virtual_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/goods.virtual_edit.json @@ -11,9 +11,9 @@ "subTitlePlaceholder": "请输入副标题", "subTitleMaxLengthTips": "副标题不能超过80个字符", "goodsImage": "商品图片", - "goodsImagePlaceholder":"请上传商品图片", + "goodsImagePlaceholder": "请上传商品图片", "goodsVideo": "商品视频", - "goodsVideoPlaceholder":"请上传商品视频", + "goodsVideoPlaceholder": "请上传商品视频", "goodsCategory": "商品分类", "refresh": "刷新", "addGoodsCategory": "添加分类", @@ -81,20 +81,20 @@ "maxAddSpecTips": "最多添加5个规格项", "pleaseEditSpecPlaceholder": "请编辑规格信息", "refreshSuccess": "刷新成功", - "isLimit":"是否限购", - "isLimitTips":"启用限购后,购买商品时,会对该商品购买量做限制判断。", - "limitType":"限购类型", - "limitTypeTips":"单次限购是针对于每次下单不能超过限购数量,单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。", - "singleTime":"单次限购", - "singlePerson":"单人限购", - "maxBuy":"限购数量", - "maxBuyPlaceholder":"请输入限购数量", + "isLimit": "是否限购", + "isLimitTips": "启用限购后,购买商品时,会对该商品购买量做限制判断。", + "limitType": "限购类型", + "limitTypeTips": "单次限购是针对于每次下单不能超过限购数量,单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。", + "singleTime": "单次限购", + "singlePerson": "单人限购", + "maxBuy": "限购数量", + "maxBuyPlaceholder": "请输入限购数量", "maxBuyTips": "[限购数量]格式输入错误", - "maxBuyWarnTips":"限购数量超出商品库存时,买家将无法购买该商品", + "maxBuyWarnTips": "限购数量超出商品库存时,买家将无法购买该商品", "maxBuyNotZeroTips": "限购数量不能小于1", - "minBuy":"起购数量", - "minBuyTips":"起购数量超出商品库存时,买家将无法购买该商品", - "minBuyFormatErrorTips":"[起购数量]格式输入错误", + "minBuy": "起购数量", + "minBuyTips": "起购数量超出商品库存时,买家将无法购买该商品", + "minBuyFormatErrorTips": "[起购数量]格式输入错误", "minBuyNotZeroTips": "起购数量不能小于0", "minBuyGreaterThanMaxBuyTips": "起购数量不能大于限购数量", @@ -124,7 +124,6 @@ "specValueNameRepeat": "规格值不能重复", "lackDefaultSpec": "商品缺少默认规格", - "setDeliverGoods": "发货设置", "autoDeliverGoods": "自动发货", "handDeliverGoods": "手动发货", @@ -163,5 +162,4 @@ "fixedPriceHint": "会员价说明:指定优惠价格,商品未参与活动时,按照会员价优惠,若商品参与活动,则以活动价为准", "participateInActiveDisableTips": "商品正在参与营销活动,禁止操作" - } diff --git a/admin/src/addon/shop/lang/zh-cn/index.index.json b/admin/src/addon/shop/lang/zh-cn/index.index.json index 88e23253..94c20f58 100644 --- a/admin/src/addon/shop/lang/zh-cn/index.index.json +++ b/admin/src/addon/shop/lang/zh-cn/index.index.json @@ -1,20 +1,20 @@ { - "realtimeOverview":"实时概况", - "updateTime":"更新时间:", - "todayOrderCount":"今日订单数", - "todayOrderSale":"今日销售额", - "todayAddMemberCount":"今日退款金额", - "todayBrowseCount":"今日浏览量", - "yesterday":"昨日:", - "orderCount":"订单总数", - "salesTotal":"销售总额(元)", - "memberTotal":"退款金额", - "browseTotal":"总浏览量", - "agentMatters":"待办事项", - "waitPayOrder":"待付款订单", - "waitDeliveryOrder":"待发货订单", - "waitTakeOrder":"待收货订单", - "refundOrder":"退款订单", - "saleGoodsNum":"出售商品数量", - "warehouseGoodsNum":"仓库商品数量" -} \ No newline at end of file + "realtimeOverview": "实时概况", + "updateTime": "更新时间:", + "todayOrderCount": "今日订单数", + "todayOrderSale": "今日销售额", + "todayAddMemberCount": "今日退款金额", + "todayBrowseCount": "今日浏览量", + "yesterday": "昨日:", + "orderCount": "订单总数", + "salesTotal": "销售总额(元)", + "memberTotal": "退款金额", + "browseTotal": "总浏览量", + "agentMatters": "待办事项", + "waitPayOrder": "待付款订单", + "waitDeliveryOrder": "待发货订单", + "waitTakeOrder": "待收货订单", + "refundOrder": "退款订单", + "saleGoodsNum": "出售商品数量", + "warehouseGoodsNum": "仓库商品数量" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.add.json b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.add.json index 6b7d33f5..4cb995a6 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.add.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.add.json @@ -1,42 +1,42 @@ { - "addCoupon": "添加优惠券", - "title": "名称", - "titlePlaceholder": "请如:XXX优惠券,最多20个字", - "type": "类型", - "price": "面值", - "receiveType": "是否手动领取", - "startTime": "开始时间", - "endTime": "结束时间", - "remainCount": "剩余数量", - "limitCount": "已领取数量", - "receive": "领取记录", - "user": "是", - "grant": "否", - "limit": "限量", - "unlimited": "不限量", - "receiveNumber": "发放数量", - "pricePlaceholder": "请输入优惠券面值", - "remainCountPlaceholder": "最多发放100000张", - "reduction": "满减券", - "noThreshold": "无门槛券", - "threshold": "使用门槛", - "minConditionMoneyPlaceholder": "请输入优惠券的最低消费金额", - "userLimitCount": "限领张数", - "userLimitCountPlaceholder": "请输入限领张数", - "receiveTime": "领取时间", - "limitedTime": "限时", - "unlimitedTime": "不限时", - "days":"天数", - "times": "固定时间", - "validType": "有效期", - "lengthPlaceholder": "请输入使用时间", - "status": "状态", - "open": "开启", - "close": "关闭", - "cancel": "取消", - "save": "保存", - "startDate": "开始时间", - "endDate": "结束时间", - "validTimePlaceholder": "用券截止时间", - "arrivalTimePlaceholder": "领券截止时间" -} \ No newline at end of file + "addCoupon": "添加优惠券", + "title": "名称", + "titlePlaceholder": "请如:XXX优惠券,最多20个字", + "type": "类型", + "price": "面值", + "receiveType": "是否手动领取", + "startTime": "开始时间", + "endTime": "结束时间", + "remainCount": "剩余数量", + "limitCount": "已领取数量", + "receive": "领取记录", + "user": "是", + "grant": "否", + "limit": "限量", + "unlimited": "不限量", + "receiveNumber": "发放数量", + "pricePlaceholder": "请输入优惠券面值", + "remainCountPlaceholder": "最多发放100000张", + "reduction": "满减券", + "noThreshold": "无门槛券", + "threshold": "使用门槛", + "minConditionMoneyPlaceholder": "请输入优惠券的最低消费金额", + "userLimitCount": "限领张数", + "userLimitCountPlaceholder": "请输入限领张数", + "receiveTime": "领取时间", + "limitedTime": "限时", + "unlimitedTime": "不限时", + "days": "天数", + "times": "固定时间", + "validType": "有效期", + "lengthPlaceholder": "请输入使用时间", + "status": "状态", + "open": "开启", + "close": "关闭", + "cancel": "取消", + "save": "保存", + "startDate": "开始时间", + "endDate": "结束时间", + "validTimePlaceholder": "用券截止时间", + "arrivalTimePlaceholder": "领券截止时间" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.edit.json b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.edit.json index 5d4a3c78..4a29925f 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.edit.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.edit.json @@ -1,42 +1,42 @@ { - "editCoupon": "编辑优惠券", - "title": "名称", - "titlePlaceholder": "请如:XXX优惠券,最多20个字", - "type": "类型", - "price": "面值", - "receiveType": "是否手动领取", - "startTime": "开始时间", - "endTime": "结束时间", - "remainCount": "剩余数量", - "limitCount": "已领取数量", - "receive": "领取记录", - "user": "是", - "grant": "否", - "limit": "限量", - "unlimited": "不限量", - "receiveNumber": "发放数量", - "pricePlaceholder": "请输入优惠券面值", - "remainCountPlaceholder": "最多发放100000张", - "reduction": "满减券", - "noThreshold": "无门槛券", - "threshold": "使用门槛", - "minConditionMoneyPlaceholder": "请输入优惠券的最低消费金额", - "userLimitCount": "限领张数", - "userLimitCountPlaceholder": "请输入限领张数", - "receiveTime": "领取时间", - "limitedTime": "限时", - "unlimitedTime": "不限时", - "days":"天数", - "times": "固定时间", - "validType": "使用时间", - "lengthPlaceholder": "请输入使用时间", - "status": "状态", - "open": "开启", - "close": "关闭", - "cancel": "取消", - "save": "保存", - "startDate": "开始时间", - "endDate": "结束时间", - "validTimePlaceholder": "用券截止时间", - "arrivalTimePlaceholder": "领券截止时间" -} \ No newline at end of file + "editCoupon": "编辑优惠券", + "title": "名称", + "titlePlaceholder": "请如:XXX优惠券,最多20个字", + "type": "类型", + "price": "面值", + "receiveType": "是否手动领取", + "startTime": "开始时间", + "endTime": "结束时间", + "remainCount": "剩余数量", + "limitCount": "已领取数量", + "receive": "领取记录", + "user": "是", + "grant": "否", + "limit": "限量", + "unlimited": "不限量", + "receiveNumber": "发放数量", + "pricePlaceholder": "请输入优惠券面值", + "remainCountPlaceholder": "最多发放100000张", + "reduction": "满减券", + "noThreshold": "无门槛券", + "threshold": "使用门槛", + "minConditionMoneyPlaceholder": "请输入优惠券的最低消费金额", + "userLimitCount": "限领张数", + "userLimitCountPlaceholder": "请输入限领张数", + "receiveTime": "领取时间", + "limitedTime": "限时", + "unlimitedTime": "不限时", + "days": "天数", + "times": "固定时间", + "validType": "使用时间", + "lengthPlaceholder": "请输入使用时间", + "status": "状态", + "open": "开启", + "close": "关闭", + "cancel": "取消", + "save": "保存", + "startDate": "开始时间", + "endDate": "结束时间", + "validTimePlaceholder": "用券截止时间", + "arrivalTimePlaceholder": "领券截止时间" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.list.json b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.list.json index 91ecaa41..f1afeb9b 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.coupon.list.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.coupon.list.json @@ -1,47 +1,47 @@ { - "addCoupon": "添加优惠券", - "title": "名称", - "titlePlaceholder": "请输入优惠券名称", - "type": "类型", - "price": "面值", - "receiveType": "是否手动领取", - "startTime": "开始时间", - "endTime": "结束时间", - "sumCount": "剩余数量/发放数量", - "remainCount": "已领用/已使用", - "receive": "领取记录", - "edit": "编辑", - "Status": "是否关闭领取", - "threshold": "使用门槛", - "reduction": "满减券", - "noThreshold": "无门槛券", - "couponDeleteTips": "确定要删除该优惠券吗?", - "couponColseTips": "确定要关闭该优惠券吗?关闭后将不可领取,若会员已领取将变为失效", - "validType": "有效期", - "statusName":"状态", - "receiveTypeTime": "领取有效期", - "spreadGoods":"推广", - "close":"关闭", - "couponSpreadTitle":"优惠券推广", - "downloadQrcode": "下载二维码", - "spreadLink": "推广链接", - "receiveUseCount": "已使用", + "addCoupon": "添加优惠券", + "title": "名称", + "titlePlaceholder": "请输入优惠券名称", + "type": "类型", + "price": "面值", + "receiveType": "是否手动领取", + "startTime": "开始时间", + "endTime": "结束时间", + "sumCount": "剩余数量/发放数量", + "remainCount": "已领用/已使用", + "receive": "领取记录", + "edit": "编辑", + "Status": "是否关闭领取", + "threshold": "使用门槛", + "reduction": "满减券", + "noThreshold": "无门槛券", + "couponDeleteTips": "确定要删除该优惠券吗?", + "couponColseTips": "确定要关闭该优惠券吗?关闭后将不可领取,若会员已领取将变为失效", + "validType": "有效期", + "statusName": "状态", + "receiveTypeTime": "领取有效期", + "spreadGoods": "推广", + "close": "关闭", + "couponSpreadTitle": "优惠券推广", + "downloadQrcode": "下载二维码", + "spreadLink": "推广链接", + "receiveUseCount": "已使用", - "collectionCoupon":"领取记录", - "collectionTtitle": "优惠券名称", - "userName": "领用会员", - "collectionReceiveType": "领用方式", - "createTime": "领取时间", - "expireTime": "到期时间", - "status":"当前状态", - "useTime": "使用时间", - "validity":"使用有效期", - "mobile": "手机号", - "memberInfo": "会员信息", - "memberInfoPlaceholder":"请输入会员昵称/手机号", - "collectionSumCount": "发放数量", - "couponInfo": "优惠券基本信息", - "receiveCount":"已领取", - "receiveExpireCount":"已过期", - "showOrder": "查看订单" -} \ No newline at end of file + "collectionCoupon": "领取记录", + "collectionTtitle": "优惠券名称", + "userName": "领用会员", + "collectionReceiveType": "领用方式", + "createTime": "领取时间", + "expireTime": "到期时间", + "status": "当前状态", + "useTime": "使用时间", + "validity": "使用有效期", + "mobile": "手机号", + "memberInfo": "会员信息", + "memberInfoPlaceholder": "请输入会员昵称/手机号", + "collectionSumCount": "发放数量", + "couponInfo": "优惠券基本信息", + "receiveCount": "已领取", + "receiveExpireCount": "已过期", + "showOrder": "查看订单" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.discount.add.json b/admin/src/addon/shop/lang/zh-cn/marketing.discount.add.json index a67d7e6d..3ebb9e9b 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.discount.add.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.discount.add.json @@ -1,38 +1,38 @@ { - "editDiscount":"添加限时折扣", - "name": "活动名称", - "namePlaceholder":"请输入活动名称", - "nameTip":"活动标题用于在手机或者电脑前端,建议输入长度不要大于5", - "title":"标题", - "titlePlaceholder":"请输入活动标题", - "titleTip":"活动标题用户展示在手机或者电脑前端展示使用,建议输入长度不要大于5", - "activityTime": "活动时间", - "discountTimePlaceholder":"请选择活动时间", - "selectProduct": "选择商品", - "selectProductPlaceholder": "请选择商品", - "noSpaceAllowed": "内容不能为空", - "batchOperation": "批量设置", - "batchEmptySelectedGoodsTips": "请选择要操作的商品", - "discountType":"折扣类型", - "price":"原价", - "discounts":"打折", - "discountsTips":"[打折]格式错误", - "discountsTipsTwo":"打折折扣不可小于0", - "discountsTipsThree":"打折折扣不可大于9.9", - "discountsPlaceholder":"请输入打折折扣", - "reduceMoney":"减钱", - "reduceMoneyTips":"[减钱]格式错误", - "reduceMoneyTipsTwo":"减钱金额不可小于等于0", - "reduceMoneyTipsThree":"减钱金额不可大于等于原价金额", - "reduceMoneyPlaceholder":"请输入减钱金额", - "promotional":"促销价", - "promotionalTips":"[促销价]格式错误", - "promotionalTipsTwo":"促销价金额不可小于等于0", - "promotionalTipsThree":"促销价金额不可大于等于原价金额", - "promotionalPlaceholder":"请输入促销价", - "delete":"删除", - "enabled":"设为参与", - "noEnabled":"设为不参与", - "skuDiscountSettings":"规格折扣设置", - "skuDiscountSettingsPlaceholder":"请输入规格折扣设置" + "editDiscount": "添加限时折扣", + "name": "活动名称", + "namePlaceholder": "请输入活动名称", + "nameTip": "活动标题用于在手机或者电脑前端,建议输入长度不要大于5", + "title": "标题", + "titlePlaceholder": "请输入活动标题", + "titleTip": "活动标题用户展示在手机或者电脑前端展示使用,建议输入长度不要大于5", + "activityTime": "活动时间", + "discountTimePlaceholder": "请选择活动时间", + "selectProduct": "选择商品", + "selectProductPlaceholder": "请选择商品", + "noSpaceAllowed": "内容不能为空", + "batchOperation": "批量设置", + "batchEmptySelectedGoodsTips": "请选择要操作的商品", + "discountType": "折扣类型", + "price": "原价", + "discounts": "打折", + "discountsTips": "[打折]格式错误", + "discountsTipsTwo": "打折折扣不可小于0", + "discountsTipsThree": "打折折扣不可大于9.9", + "discountsPlaceholder": "请输入打折折扣", + "reduceMoney": "减钱", + "reduceMoneyTips": "[减钱]格式错误", + "reduceMoneyTipsTwo": "减钱金额不可小于等于0", + "reduceMoneyTipsThree": "减钱金额不可大于等于原价金额", + "reduceMoneyPlaceholder": "请输入减钱金额", + "promotional": "促销价", + "promotionalTips": "[促销价]格式错误", + "promotionalTipsTwo": "促销价金额不可小于等于0", + "promotionalTipsThree": "促销价金额不可大于等于原价金额", + "promotionalPlaceholder": "请输入促销价", + "delete": "删除", + "enabled": "设为参与", + "noEnabled": "设为不参与", + "skuDiscountSettings": "规格折扣设置", + "skuDiscountSettingsPlaceholder": "请输入规格折扣设置" } diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.discount.config.json b/admin/src/addon/shop/lang/zh-cn/marketing.discount.config.json index 2781754d..3bbcf8a9 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.discount.config.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.discount.config.json @@ -1,8 +1,8 @@ { - "headTitle":"顶部广告图", - "image":"图片上传", - "imagePlaceholder":"请上传图片", - "toLink":"跳转链接", - "toLinkPlaceholder":"请输入跳转链接", - "addConfigList":"添加广告图" -} \ No newline at end of file + "headTitle": "顶部广告图", + "image": "图片上传", + "imagePlaceholder": "请上传图片", + "toLink": "跳转链接", + "toLinkPlaceholder": "请输入跳转链接", + "addConfigList": "添加广告图" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.discount.detail.json b/admin/src/addon/shop/lang/zh-cn/marketing.discount.detail.json index b3364c6f..80fa2653 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.discount.detail.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.discount.detail.json @@ -34,4 +34,4 @@ "participationNum": "参与次数", "orderTime": "最后下单时间", "memberInfo": "会员信息" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.discount.edit.json b/admin/src/addon/shop/lang/zh-cn/marketing.discount.edit.json index 7dec8b59..3088051f 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.discount.edit.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.discount.edit.json @@ -1,38 +1,38 @@ { - "editDiscount":"编辑限时折扣", - "name": "活动名称", - "namePlaceholder":"请输入活动名称", - "nameTip":"活动名称用于展示在商家后台管理", - "title":"标题", - "titlePlaceholder":"请输入活动标题", - "titleTip":"活动标题用于在手机或者电脑前端,建议输入长度不要大于5", - "activityTime": "活动时间", - "discountTimePlaceholder":"请选择活动时间", - "noSpaceAllowed":"内容不能为空", - "selectProduct": "选择商品", - "selectProductPlaceholder": "请选择商品", - "batchOperation": "批量设置", - "batchEmptySelectedGoodsTips": "请选择要操作的商品", - "discountType":"折扣类型", - "price":"原价", - "discounts":"打折", - "discountsTips":"[打折]格式错误", - "discountsTipsTwo":"打折折扣不可小于0", - "discountsTipsThree":"打折折扣不可大于9.9", - "discountsPlaceholder":"请输入打折折扣", - "reduceMoney":"减钱", - "reduceMoneyTips":"[减钱]格式错误", - "reduceMoneyTipsTwo":"减钱金额不可小于等于0", - "reduceMoneyTipsThree":"减钱金额不可大于等于原价金额", - "reduceMoneyPlaceholder":"请输入减钱金额", - "promotional":"促销价", - "promotionalTips":"[促销价]格式错误", - "promotionalTipsTwo":"促销价金额不可小于等于0", - "promotionalTipsThree":"促销价金额不可大于等于原价金额", - "promotionalPlaceholder":"请输入促销价", - "delete":"删除", - "enabled":"设为参与", - "noEnabled":"设为不参与", - "skuDiscountSettings":"规格折扣设置", - "skuDiscountSettingsPlaceholder":"请输入规格折扣设置" + "editDiscount": "编辑限时折扣", + "name": "活动名称", + "namePlaceholder": "请输入活动名称", + "nameTip": "活动名称用于展示在商家后台管理", + "title": "标题", + "titlePlaceholder": "请输入活动标题", + "titleTip": "活动标题用于在手机或者电脑前端,建议输入长度不要大于5", + "activityTime": "活动时间", + "discountTimePlaceholder": "请选择活动时间", + "noSpaceAllowed": "内容不能为空", + "selectProduct": "选择商品", + "selectProductPlaceholder": "请选择商品", + "batchOperation": "批量设置", + "batchEmptySelectedGoodsTips": "请选择要操作的商品", + "discountType": "折扣类型", + "price": "原价", + "discounts": "打折", + "discountsTips": "[打折]格式错误", + "discountsTipsTwo": "打折折扣不可小于0", + "discountsTipsThree": "打折折扣不可大于9.9", + "discountsPlaceholder": "请输入打折折扣", + "reduceMoney": "减钱", + "reduceMoneyTips": "[减钱]格式错误", + "reduceMoneyTipsTwo": "减钱金额不可小于等于0", + "reduceMoneyTipsThree": "减钱金额不可大于等于原价金额", + "reduceMoneyPlaceholder": "请输入减钱金额", + "promotional": "促销价", + "promotionalTips": "[促销价]格式错误", + "promotionalTipsTwo": "促销价金额不可小于等于0", + "promotionalTipsThree": "促销价金额不可大于等于原价金额", + "promotionalPlaceholder": "请输入促销价", + "delete": "删除", + "enabled": "设为参与", + "noEnabled": "设为不参与", + "skuDiscountSettings": "规格折扣设置", + "skuDiscountSettingsPlaceholder": "请输入规格折扣设置" } diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.discount.list.json b/admin/src/addon/shop/lang/zh-cn/marketing.discount.list.json index 0b76eb16..06ac4282 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.discount.list.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.discount.list.json @@ -1,50 +1,50 @@ { - "addDiscount":"添加限时折扣", - "name":"名称", - "namePlaceholder":"请输入活动名称", - "title":"标题", - "status":"状态", - "statusPlaceholder":"请选择状态", - "paymentAmount":"支付金额", - "memberCount":"会员数", - "orderCount":"订单数", - "discountTime":"活动时间", - "detail":"详情", - "close":"关闭", - "closeTips":"活动正在进行中,是否确认关闭当前活动?", - "deleteTips":"是否确认删除当前活动", - "baseInfo": "基础信息", - "createTime": "创建时间", - "startTime": "活动开始时间", - "endTime": "活动结束时间", - "keywordPlaceholder": "请输入商品名称", - "keyword": "商品名称", - "goodsInfo": "商品信息", - "price": "商品价格", - "activeOrderMoney": "累计订单金额", - "activeOrderNum": "累计订单数", - "activeMemberNum": "参与会员数", - "activeSuccessNum": "支付销量", - "orderInfo": "订单编号", - "payTime": "支付时间", - "orderNo": "订单编号", - "orderMoney": "订单金额", - "buyInfo": "买家/收货人", - "payType": "支付类型", - "orderStatus": "订单状态", - "toBePaid": "待支付", - "toBeShipped": "待发货", - "shipped": "已发货", - "receivedGoods": "已收货", - "completed": "已完成", - "closed": "已关闭", - "consumptionMoney": "消费总额", - "participationNum": "参与次数", - "orderTime": "最后下单时间", - "memberInfo": "会员信息", - "activeName": "活动名称", - "participationMemberCount": "参与会员数", - "payOrderCount": "支付订单数", - "startDate": "开始时间", - "endDate": "结束时间" -} \ No newline at end of file + "addDiscount": "添加限时折扣", + "name": "名称", + "namePlaceholder": "请输入活动名称", + "title": "标题", + "status": "状态", + "statusPlaceholder": "请选择状态", + "paymentAmount": "支付金额", + "memberCount": "会员数", + "orderCount": "订单数", + "discountTime": "活动时间", + "detail": "详情", + "close": "关闭", + "closeTips": "活动正在进行中,是否确认关闭当前活动?", + "deleteTips": "是否确认删除当前活动", + "baseInfo": "基础信息", + "createTime": "创建时间", + "startTime": "活动开始时间", + "endTime": "活动结束时间", + "keywordPlaceholder": "请输入商品名称", + "keyword": "商品名称", + "goodsInfo": "商品信息", + "price": "商品价格", + "activeOrderMoney": "累计订单金额", + "activeOrderNum": "累计订单数", + "activeMemberNum": "参与会员数", + "activeSuccessNum": "支付销量", + "orderInfo": "订单编号", + "payTime": "支付时间", + "orderNo": "订单编号", + "orderMoney": "订单金额", + "buyInfo": "买家/收货人", + "payType": "支付类型", + "orderStatus": "订单状态", + "toBePaid": "待支付", + "toBeShipped": "待发货", + "shipped": "已发货", + "receivedGoods": "已收货", + "completed": "已完成", + "closed": "已关闭", + "consumptionMoney": "消费总额", + "participationNum": "参与次数", + "orderTime": "最后下单时间", + "memberInfo": "会员信息", + "activeName": "活动名称", + "participationMemberCount": "参与会员数", + "payOrderCount": "支付订单数", + "startDate": "开始时间", + "endDate": "结束时间" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_add.json b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_add.json index 66ddcb71..8f4c86e3 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_add.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_add.json @@ -1,66 +1,66 @@ { - "addGoods":"添加商品", - "baseInfo":"基础设置", - "goodsType":"商品类型", - "goodsName":"商品名称", - "goodsNamePlaceholder":"请输入商品名称", - "goodsTitle":"副标题", - "goodsTitlePlaceholder":"请输入副标题", - "image":"商品图片", - "imagePlaceholder":"请选择商品图片", - "selectProduct": "选择商品", - "selectGoodsPlaceholder": "请选择商品", - "goodsStatus":"商品状态", - "goodsSelect":"选择商品", - "redemptionSettings":"积分设置", + "addGoods": "添加商品", + "baseInfo": "基础设置", + "goodsType": "商品类型", + "goodsName": "商品名称", + "goodsNamePlaceholder": "请输入商品名称", + "goodsTitle": "副标题", + "goodsTitlePlaceholder": "请输入副标题", + "image": "商品图片", + "imagePlaceholder": "请选择商品图片", + "selectProduct": "选择商品", + "selectGoodsPlaceholder": "请选择商品", + "goodsStatus": "商品状态", + "goodsSelect": "选择商品", + "redemptionSettings": "积分设置", - "batchOperation": "批量设置", - "batchEmptySelectedGoodsTips": "请选择要操作的商品", - "goodsSelectPopupGoodsInfo":"商品信息", - "price":"销售价", - "stock":"兑换库存", - "stockPlaceholder":"请输入兑换库存", - "stockTips":"[兑换库存]格式错误", - "stockTipsTwo":"兑换库存不可小于等于0", - "stockTipsThree":"兑换限制数量不可大于商品库存", - "limit":"兑换限制", - "limitPlaceholder":"请输入兑换限制", - "limitTips":"[兑换限制]格式错误", - "limitTipsTwo":"兑换限制数量不可小于等于0", - "limitTipsThree":"兑换限制数量不能大于兑换库存", - "limitUnit":"件/人", - "integralUnit":"积分", - "prickUnit":"元", - "pointPlaceholder":"请输入积分积分", - "pointTips":"[积分]格式错误", - "pointTipsTwo":"积分不可小于等于0", - "money":"兑换价", - "newPrice":"价格", - "moneyTips":"[价格]格式错误", - "moneyTipsTwo":"价格不可小于0", - "limitRules":"每人每单可兑换件数", - - "couponSelect":"选择优惠券", - "couponSelectPlaceholder":"请选择优惠券", - "couponName":"优惠券名称", - "couponType":"类型", - "couponPrice":"面值", - "sumCount":"总库存", - "threshold": "使用门槛", - "validType": "有效期", - "receiveTypeTime": "领取有效期", + "batchOperation": "批量设置", + "batchEmptySelectedGoodsTips": "请选择要操作的商品", + "goodsSelectPopupGoodsInfo": "商品信息", + "price": "销售价", + "stock": "兑换库存", + "stockPlaceholder": "请输入兑换库存", + "stockTips": "[兑换库存]格式错误", + "stockTipsTwo": "兑换库存不可小于等于0", + "stockTipsThree": "兑换限制数量不可大于商品库存", + "limit": "兑换限制", + "limitPlaceholder": "请输入兑换限制", + "limitTips": "[兑换限制]格式错误", + "limitTipsTwo": "兑换限制数量不可小于等于0", + "limitTipsThree": "兑换限制数量不能大于兑换库存", + "limitUnit": "件/人", + "integralUnit": "积分", + "prickUnit": "元", + "pointPlaceholder": "请输入积分积分", + "pointTips": "[积分]格式错误", + "pointTipsTwo": "积分不可小于等于0", + "money": "兑换价", + "newPrice": "价格", + "moneyTips": "[价格]格式错误", + "moneyTipsTwo": "价格不可小于0", + "limitRules": "每人每单可兑换件数", - "balance":"兑换余额", - "balancePlaceholder":"请输入兑换余额", - "balanceTips":"[兑换余额]格式错误", - "balanceTipsTwo":"兑换余额不可小于等于0", - "balanceType":"余额类型", + "couponSelect": "选择优惠券", + "couponSelectPlaceholder": "请选择优惠券", + "couponName": "优惠券名称", + "couponType": "类型", + "couponPrice": "面值", + "sumCount": "总库存", + "threshold": "使用门槛", + "validType": "有效期", + "receiveTypeTime": "领取有效期", - "goodsSkuTitle":"选择商品规格", - "goodsSkuPlaceholder":"请选择商品规格", - "goodsStock":"库存", - "enabled":"设为参与", - "noEnabled":"设为不参与", - "noEnabledTip":"请至少设置一个规格参与", - "goodsDetail":"商品详情" -} \ No newline at end of file + "balance": "兑换余额", + "balancePlaceholder": "请输入兑换余额", + "balanceTips": "[兑换余额]格式错误", + "balanceTipsTwo": "兑换余额不可小于等于0", + "balanceType": "余额类型", + + "goodsSkuTitle": "选择商品规格", + "goodsSkuPlaceholder": "请选择商品规格", + "goodsStock": "库存", + "enabled": "设为参与", + "noEnabled": "设为不参与", + "noEnabledTip": "请至少设置一个规格参与", + "goodsDetail": "商品详情" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_edit.json b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_edit.json index ace24e94..0f812f57 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_edit.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_edit.json @@ -1,67 +1,66 @@ { - "editGoods":"编辑商品", - "baseInfo":"基础设置", - "goodsType":"商品类型", - "goodsName":"商品名称", - "goodsNamePlaceholder":"请输入商品名称", - "goodsTitle":"副标题", - "goodsTitlePlaceholder":"请输入副标题", - "image":"商品图片", - "imagePlaceholder":"请选择商品图片", - "selectProduct": "选择商品", - "selectGoodsPlaceholder": "请选择商品", - "goodsStatus":"商品状态", - "goodsSelect":"选择商品", - "redemptionSettings":"积分设置", + "editGoods": "编辑商品", + "baseInfo": "基础设置", + "goodsType": "商品类型", + "goodsName": "商品名称", + "goodsNamePlaceholder": "请输入商品名称", + "goodsTitle": "副标题", + "goodsTitlePlaceholder": "请输入副标题", + "image": "商品图片", + "imagePlaceholder": "请选择商品图片", + "selectProduct": "选择商品", + "selectGoodsPlaceholder": "请选择商品", + "goodsStatus": "商品状态", + "goodsSelect": "选择商品", + "redemptionSettings": "积分设置", - "batchOperation": "批量设置", - "batchEmptySelectedGoodsTips": "请选择要操作的商品", - "goodsSelectPopupGoodsInfo":"商品信息", - "price":"销售价", - "stock":"兑换库存", - "stockPlaceholder":"请输入兑换库存", - "stockTips":"[兑换库存]格式错误", - "stockTipsTwo":"兑换库存不可小于等于0", - "stockTipsThree":"兑换限制数量不可大于商品库存", - "limit":"兑换限制", - "limitPlaceholder":"请输入兑换限制", - "limitTips":"[兑换限制]格式错误", - "limitTipsTwo":"兑换限制数量不可小于等于0", - "limitTipsThree":"兑换限制数量不能大于兑换库存", - "limitUnit":"件/人", - "integralUnit":"积分", - "prickUnit":"元", - "pointPlaceholder":"请输入积分积分", - "pointTips":"[积分]格式错误", - "pointTipsTwo":"积分不可小于等于0", - "money":"兑换价", - "newPrice":"价格", - "moneyTips":"[价格]格式错误", - "moneyTipsTwo":"价格不可小于0", - "limitRules":"每人每单可兑换件数", + "batchOperation": "批量设置", + "batchEmptySelectedGoodsTips": "请选择要操作的商品", + "goodsSelectPopupGoodsInfo": "商品信息", + "price": "销售价", + "stock": "兑换库存", + "stockPlaceholder": "请输入兑换库存", + "stockTips": "[兑换库存]格式错误", + "stockTipsTwo": "兑换库存不可小于等于0", + "stockTipsThree": "兑换限制数量不可大于商品库存", + "limit": "兑换限制", + "limitPlaceholder": "请输入兑换限制", + "limitTips": "[兑换限制]格式错误", + "limitTipsTwo": "兑换限制数量不可小于等于0", + "limitTipsThree": "兑换限制数量不能大于兑换库存", + "limitUnit": "件/人", + "integralUnit": "积分", + "prickUnit": "元", + "pointPlaceholder": "请输入积分积分", + "pointTips": "[积分]格式错误", + "pointTipsTwo": "积分不可小于等于0", + "money": "兑换价", + "newPrice": "价格", + "moneyTips": "[价格]格式错误", + "moneyTipsTwo": "价格不可小于0", + "limitRules": "每人每单可兑换件数", - - "couponSelect":"选择优惠券", - "couponSelectPlaceholder":"请选择优惠券", - "couponName":"优惠券名称", - "couponType":"类型", - "couponPrice":"面值", - "sumCount":"总库存", - "threshold": "使用门槛", - "validType": "有效期", - "receiveTypeTime": "领取有效期", + "couponSelect": "选择优惠券", + "couponSelectPlaceholder": "请选择优惠券", + "couponName": "优惠券名称", + "couponType": "类型", + "couponPrice": "面值", + "sumCount": "总库存", + "threshold": "使用门槛", + "validType": "有效期", + "receiveTypeTime": "领取有效期", - "balance":"兑换余额", - "balancePlaceholder":"请输入兑换余额", - "balanceTips":"[兑换余额]格式错误", - "balanceTipsTwo":"兑换余额不可小于等于0", - "balanceType":"余额类型", + "balance": "兑换余额", + "balancePlaceholder": "请输入兑换余额", + "balanceTips": "[兑换余额]格式错误", + "balanceTipsTwo": "兑换余额不可小于等于0", + "balanceType": "余额类型", - "goodsSkuTitle":"选择商品规格", - "goodsSkuPlaceholder":"请选择商品规格", - "goodsStock":"库存", - "enabled":"设为参与", - "noEnabled":"设为不参与", - "noEnabledTip":"请至少设置一个规格参与", - "goodsDetail":"商品详情" -} \ No newline at end of file + "goodsSkuTitle": "选择商品规格", + "goodsSkuPlaceholder": "请选择商品规格", + "goodsStock": "库存", + "enabled": "设为参与", + "noEnabled": "设为不参与", + "noEnabledTip": "请至少设置一个规格参与", + "goodsDetail": "商品详情" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_list.json b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_list.json index 1b2a030a..b11282fd 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_list.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_list.json @@ -1,27 +1,27 @@ { - "addGoods":"添加商品", - "goods":"商品", - "goodsName":"商品名称", - "goodsNamePlaceholder":"请输入商品名称", - "status":"状态", - "statusPlaceholder":"请选择状态", - "goodsType":"商品类型", - "exchangePrice":"兑换价格", - "pointUnit":"积分", - "priceUnit":"元", - "redeemedAndSurplus":"已兑/剩余", - "deleteTips":"是否确认删除当前商品", - "createTime":"创建时间", - "spreadGoods": "推广", - "copyGoods": "复制", - "spreadLink": "推广链接", - "copy": "复制", - "downloadQrcode": "下载二维码", - "goodsSpreadTitle": "积分商品推广", - "up":"上架", - "upTips":"是否确认上架当前商品", - "down":"下架", - "downTips":"是否确认下架当前商品", - "startDate":"开始时间", - "endDate":"结束时间" -} \ No newline at end of file + "addGoods": "添加商品", + "goods": "商品", + "goodsName": "商品名称", + "goodsNamePlaceholder": "请输入商品名称", + "status": "状态", + "statusPlaceholder": "请选择状态", + "goodsType": "商品类型", + "exchangePrice": "兑换价格", + "pointUnit": "积分", + "priceUnit": "元", + "redeemedAndSurplus": "已兑/剩余", + "deleteTips": "是否确认删除当前商品", + "createTime": "创建时间", + "spreadGoods": "推广", + "copyGoods": "复制", + "spreadLink": "推广链接", + "copy": "复制", + "downloadQrcode": "下载二维码", + "goodsSpreadTitle": "积分商品推广", + "up": "上架", + "upTips": "是否确认上架当前商品", + "down": "下架", + "downTips": "是否确认下架当前商品", + "startDate": "开始时间", + "endDate": "结束时间" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.order_list.json b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.order_list.json index ddb11dfd..05f05b5f 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.exchange.order_list.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.exchange.order_list.json @@ -1,55 +1,55 @@ { - "orderNo":"订单编号", - "orderNoPlaceholder": "请输入订单编号", - "orderStatus": "订单状态", - "orderStatusPlaceholder": "请选择订单状态", - "orderFrom": "订单类型", - "orderFromPlaceholder": "请选择订单类型", - "payTime": "支付时间", - "orderGoods": "商品", - "goodsPriceNumber": "单价(元)/数量", - "orderMoney": "实付金额(元)", - "startDate": "开始时间", - "endDate": "结束时间", - "piece": "件", - "activeRefund": "主动退款", - "notes": "备注", - "offlinePayment": "线下支付", - "orderClose": "关闭订单", - "editPrice": "修改价格", - "editAddress": "修改地址", - "sendOutGoods": "发货", - "confirmTakeDelivery": "确认收货", - "all": "全部", - "toBeShipped": "待发货", - "shipped": "已发货", - "receivedGoods": "已收货", - "completed": "已完成", - "closed": "已关闭", - "refunding": "退款中", - "notesDetail": "备注信息", - - "delivery": "订单发货", - "company": "物流公司", - "companyPlaceholder": "请选择物流公司", - "expressNumber": "物流单号", - "expressNumberPlaceholder": "请输入物流单号", - "orderGoodsIdsPlaceholder": "请选择订单项", - "virtualDelivery": "虚拟发货", - "goodsName": "商品名称", - "num": "商品数量", - "orderCloseTips": "关闭订单后该订单将无法支付,是否确认关闭?", - "orderFinishTips": "是否确认用户已经收货?", - "orderGoodsPlaceholder": "请选择要发货的商品", - "deliveryStatusName": "发货状态", - "fromType": "订单来源", - "payType": "支付类型", - "orderInfo": "订单信息", - "refundStatusName": "退款状态", - "outTradeNo": "交易流水号", + "orderNo": "订单编号", + "orderNoPlaceholder": "请输入订单编号", + "orderStatus": "订单状态", + "orderStatusPlaceholder": "请选择订单状态", + "orderFrom": "订单类型", + "orderFromPlaceholder": "请选择订单类型", + "payTime": "支付时间", + "orderGoods": "商品", + "goodsPriceNumber": "单价(元)/数量", + "orderMoney": "实付金额(元)", + "startDate": "开始时间", + "endDate": "结束时间", + "piece": "件", + "activeRefund": "主动退款", + "notes": "备注", + "offlinePayment": "线下支付", + "orderClose": "关闭订单", + "editPrice": "修改价格", + "editAddress": "修改地址", + "sendOutGoods": "发货", + "confirmTakeDelivery": "确认收货", + "all": "全部", + "toBeShipped": "待发货", + "shipped": "已发货", + "receivedGoods": "已收货", + "completed": "已完成", + "closed": "已关闭", + "refunding": "退款中", + "notesDetail": "备注信息", - "exportOrderType": "导出订单类型", - "shopOrder": "订单数据表", - "shopOrderGoods": "订单商品表", - "point":"积分" -} \ No newline at end of file + "delivery": "订单发货", + "company": "物流公司", + "companyPlaceholder": "请选择物流公司", + "expressNumber": "物流单号", + "expressNumberPlaceholder": "请输入物流单号", + "orderGoodsIdsPlaceholder": "请选择订单项", + "virtualDelivery": "虚拟发货", + "goodsName": "商品名称", + "num": "商品数量", + "orderCloseTips": "关闭订单后该订单将无法支付,是否确认关闭?", + "orderFinishTips": "是否确认用户已经收货?", + "orderGoodsPlaceholder": "请选择要发货的商品", + "deliveryStatusName": "发货状态", + "fromType": "订单来源", + "payType": "支付类型", + "orderInfo": "订单信息", + "refundStatusName": "退款状态", + "outTradeNo": "交易流水号", + + "exportOrderType": "导出订单类型", + "shopOrder": "订单数据表", + "shopOrderGoods": "订单商品表", + "point": "积分" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.manjian.detail.json b/admin/src/addon/shop/lang/zh-cn/marketing.manjian.detail.json index 7ba75abb..80fa2653 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.manjian.detail.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.manjian.detail.json @@ -1,37 +1,37 @@ { - "baseInfo": "基础信息", - "name": "活动名称", - "title": "标题", - "status": "状态", - "paymentAmount": "支付金额", - "memberCount": "参与会员数", - "orderCount": "支付订单数", - "createTime": "创建时间", - "startTime": "活动开始时间", - "endTime": "活动结束时间", - "keywordPlaceholder": "请输入商品名称", - "keyword": "商品名称", - "goodsInfo": "商品信息", - "price": "商品价格", - "activeOrderMoney": "累计订单金额", - "activeOrderNum": "累计订单数", - "activeMemberNum": "参与会员数", - "activeSuccessNum": "支付销量", - "orderInfo": "订单编号", - "payTime": "支付时间", - "orderNo": "订单编号", - "orderMoney": "订单金额", - "buyInfo": "买家/收货人", - "payType": "支付类型", - "orderStatus": "订单状态", - "toBePaid": "待支付", - "toBeShipped": "待发货", - "shipped": "已发货", - "receivedGoods": "已收货", - "completed": "已完成", - "closed": "已关闭", - "consumptionMoney": "消费总额", - "participationNum": "参与次数", - "orderTime": "最后下单时间", - "memberInfo": "会员信息" -} \ No newline at end of file + "baseInfo": "基础信息", + "name": "活动名称", + "title": "标题", + "status": "状态", + "paymentAmount": "支付金额", + "memberCount": "参与会员数", + "orderCount": "支付订单数", + "createTime": "创建时间", + "startTime": "活动开始时间", + "endTime": "活动结束时间", + "keywordPlaceholder": "请输入商品名称", + "keyword": "商品名称", + "goodsInfo": "商品信息", + "price": "商品价格", + "activeOrderMoney": "累计订单金额", + "activeOrderNum": "累计订单数", + "activeMemberNum": "参与会员数", + "activeSuccessNum": "支付销量", + "orderInfo": "订单编号", + "payTime": "支付时间", + "orderNo": "订单编号", + "orderMoney": "订单金额", + "buyInfo": "买家/收货人", + "payType": "支付类型", + "orderStatus": "订单状态", + "toBePaid": "待支付", + "toBeShipped": "待发货", + "shipped": "已发货", + "receivedGoods": "已收货", + "completed": "已完成", + "closed": "已关闭", + "consumptionMoney": "消费总额", + "participationNum": "参与次数", + "orderTime": "最后下单时间", + "memberInfo": "会员信息" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.manjian.edit.json b/admin/src/addon/shop/lang/zh-cn/marketing.manjian.edit.json index 2d526265..e966425e 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.manjian.edit.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.manjian.edit.json @@ -84,5 +84,5 @@ "limitTipsThree": "必须大于上一层级的优惠门槛", "ruleTypeTips": "阶梯优惠根据设定的门槛逐级增加优惠,达到特定层级门槛即可享受对应优惠,最高可设5个层级。", "ruleTypeTipsTwo": "循环优惠指每次达到门槛即获赠一次优惠,无次数上限,需合理设置门槛。", - "goodsOffTips":"该商品已下架" + "goodsOffTips": "该商品已下架" } diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.config.json b/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.config.json index 162a3fad..6d6f631f 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.config.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.config.json @@ -1,45 +1,45 @@ { - "basicInfoTab":"基础设置", - "bannerList":"顶部广告图", - "activeStatus":"是否启用", - "validityType":"有效期", - "validityDay":"天数", - "validityDayPlaceholder":"请输入有效天数", - "validityDayTips":"有效天数不可小于等于0", - "validityDayTipsLeft":"达成门槛立即生效,", - "validityDayTipsRight":"天有效期", - "validityTime":"固定时间", - "validityTimePlaceholder":"请选择有效期截止时间", - "validityTimePlaceholderTwo":"请先选择参与门槛时间", - "validityTimePlaceholderThree":"有效期截止时间不可小于参与门槛时间", - "validityTimeTips":"达成门槛立即生效,有效期截止为", - "validityTimeTipsTwo":"修改有效期将同步更新所有未参与活动用户的结束时间", - "participationWay":"参与门槛", - "neverOrder":"从未下过单的会员", - "assignTimeOrder":"指定时间内未下过单的会员", - "assignTimeRegister":"指定时间内注册的会员", - "appointTimePlaceholder":"请选择指定时间", - "activityGoods":"活动商品", - "selectGoods":"选择商品", - "goodsSkuIdsPlaceholder":"请选择商品", - "limitNum":"限购数量", - "limitNumPlaceholder":"请输入限购数量", - "limitNumTips":"限购数量不可小于等于0", - "limitNumTipsThree":"限购数量不可超过已选商品数量", - "oldPrice":"原价", - "newcomerPrice":"新人价", - "newcomerPricePlaceholder":"请输入新人价", - "newcomerPriceTips":"[新人价]格式错误", - "newcomerPriceTipsOne":"新人价不可小于0", - "newcomerPriceTipsTwo":"新人价不可大于原价", - "batchOperation":"批量操作", - "batchEmptySelectedGoodsTips": "请选择要操作的商品", - "activeDesc":"规则说明", - "activeDescPlaceholder":"请输入规则说明", - "useDefaultActiveDesc": "使用默认说明", - "image":"图片上传", - "imagePlaceholder":"请上传图片", - "toLink":"跳转链接", - "toLinkPlaceholder":"请输入跳转链接", - "addConfigList":"添加广告图" -} \ No newline at end of file + "basicInfoTab": "基础设置", + "bannerList": "顶部广告图", + "activeStatus": "是否启用", + "validityType": "有效期", + "validityDay": "天数", + "validityDayPlaceholder": "请输入有效天数", + "validityDayTips": "有效天数不可小于等于0", + "validityDayTipsLeft": "达成门槛立即生效,", + "validityDayTipsRight": "天有效期", + "validityTime": "固定时间", + "validityTimePlaceholder": "请选择有效期截止时间", + "validityTimePlaceholderTwo": "请先选择参与门槛时间", + "validityTimePlaceholderThree": "有效期截止时间不可小于参与门槛时间", + "validityTimeTips": "达成门槛立即生效,有效期截止为", + "validityTimeTipsTwo": "修改有效期将同步更新所有未参与活动用户的结束时间", + "participationWay": "参与门槛", + "neverOrder": "从未下过单的会员", + "assignTimeOrder": "指定时间内未下过单的会员", + "assignTimeRegister": "指定时间内注册的会员", + "appointTimePlaceholder": "请选择指定时间", + "activityGoods": "活动商品", + "selectGoods": "选择商品", + "goodsSkuIdsPlaceholder": "请选择商品", + "limitNum": "限购数量", + "limitNumPlaceholder": "请输入限购数量", + "limitNumTips": "限购数量不可小于等于0", + "limitNumTipsThree": "限购数量不可超过已选商品数量", + "oldPrice": "原价", + "newcomerPrice": "新人价", + "newcomerPricePlaceholder": "请输入新人价", + "newcomerPriceTips": "[新人价]格式错误", + "newcomerPriceTipsOne": "新人价不可小于0", + "newcomerPriceTipsTwo": "新人价不可大于原价", + "batchOperation": "批量操作", + "batchEmptySelectedGoodsTips": "请选择要操作的商品", + "activeDesc": "规则说明", + "activeDescPlaceholder": "请输入规则说明", + "useDefaultActiveDesc": "使用默认说明", + "image": "图片上传", + "imagePlaceholder": "请上传图片", + "toLink": "跳转链接", + "toLinkPlaceholder": "请输入跳转链接", + "addConfigList": "添加广告图" +} diff --git a/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.order_list.json b/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.order_list.json index 3bcab31f..3a15fc4f 100644 --- a/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.order_list.json +++ b/admin/src/addon/shop/lang/zh-cn/marketing.newcomer.order_list.json @@ -1,57 +1,57 @@ { - "orderNo":"订单编号", - "orderNoPlaceholder": "请输入订单编号", - "orderStatus": "订单状态", - "orderStatusPlaceholder": "请选择订单状态", - "orderFrom": "订单类型", - "orderFromPlaceholder": "请选择订单类型", - "payTime": "支付时间", - "orderGoods": "商品", - "goodsPriceNumber": "单价(元)/数量", - "goodsPriceNumberTips": "新人价商品购买数量为1时,单价显示新人价,购买数量大于1时,单价显示原价或折扣价或会员价", - "orderMoney": "实付金额(元)", - "startDate": "开始时间", - "endDate": "结束时间", - "piece": "件", - "createTime": "创建时间", - "activeRefund": "主动退款", - "notes": "备注", - "offlinePayment": "线下支付", - "orderClose": "关闭订单", - "editPrice": "修改价格", - "editAddress": "修改地址", - "sendOutGoods": "发货", - "confirmTakeDelivery": "确认收货", - "all": "全部", - "toBeShipped": "待发货", - "shipped": "已发货", - "receivedGoods": "已收货", - "completed": "已完成", - "closed": "已关闭", - "refunding": "退款中", - "notesDetail": "备注信息", - - "delivery": "订单发货", - "company": "物流公司", - "companyPlaceholder": "请选择物流公司", - "expressNumber": "物流单号", - "expressNumberPlaceholder": "请输入物流单号", - "orderGoodsIdsPlaceholder": "请选择订单项", - "virtualDelivery": "虚拟发货", - "goodsName": "商品名称", - "num": "商品数量", - "orderCloseTips": "关闭订单后该订单将无法支付,是否确认关闭?", - "orderFinishTips": "是否确认用户已经收货?", - "orderGoodsPlaceholder": "请选择要发货的商品", - "deliveryStatusName": "发货状态", - "fromType": "订单来源", - "payType": "支付类型", - "orderInfo": "订单信息", - "refundStatusName": "退款状态", - "outTradeNo": "交易流水号", + "orderNo": "订单编号", + "orderNoPlaceholder": "请输入订单编号", + "orderStatus": "订单状态", + "orderStatusPlaceholder": "请选择订单状态", + "orderFrom": "订单类型", + "orderFromPlaceholder": "请选择订单类型", + "payTime": "支付时间", + "orderGoods": "商品", + "goodsPriceNumber": "单价(元)/数量", + "goodsPriceNumberTips": "新人价商品购买数量为1时,单价显示新人价,购买数量大于1时,单价显示原价或折扣价或会员价", + "orderMoney": "实付金额(元)", + "startDate": "开始时间", + "endDate": "结束时间", + "piece": "件", + "createTime": "创建时间", + "activeRefund": "主动退款", + "notes": "备注", + "offlinePayment": "线下支付", + "orderClose": "关闭订单", + "editPrice": "修改价格", + "editAddress": "修改地址", + "sendOutGoods": "发货", + "confirmTakeDelivery": "确认收货", + "all": "全部", + "toBeShipped": "待发货", + "shipped": "已发货", + "receivedGoods": "已收货", + "completed": "已完成", + "closed": "已关闭", + "refunding": "退款中", + "notesDetail": "备注信息", - "exportOrderType": "导出订单类型", - "shopOrder": "订单数据表", - "shopOrderGoods": "订单商品表", - "point":"积分" -} \ No newline at end of file + "delivery": "订单发货", + "company": "物流公司", + "companyPlaceholder": "请选择物流公司", + "expressNumber": "物流单号", + "expressNumberPlaceholder": "请输入物流单号", + "orderGoodsIdsPlaceholder": "请选择订单项", + "virtualDelivery": "虚拟发货", + "goodsName": "商品名称", + "num": "商品数量", + "orderCloseTips": "关闭订单后该订单将无法支付,是否确认关闭?", + "orderFinishTips": "是否确认用户已经收货?", + "orderGoodsPlaceholder": "请选择要发货的商品", + "deliveryStatusName": "发货状态", + "fromType": "订单来源", + "payType": "支付类型", + "orderInfo": "订单信息", + "refundStatusName": "退款状态", + "outTradeNo": "交易流水号", + + "exportOrderType": "导出订单类型", + "shopOrder": "订单数据表", + "shopOrderGoods": "订单商品表", + "point": "积分" +} diff --git a/admin/src/addon/shop/lang/zh-cn/order.batch_delivery.json b/admin/src/addon/shop/lang/zh-cn/order.batch_delivery.json index 85ffdf8a..b7fdddad 100644 --- a/admin/src/addon/shop/lang/zh-cn/order.batch_delivery.json +++ b/admin/src/addon/shop/lang/zh-cn/order.batch_delivery.json @@ -1,25 +1,25 @@ { - "failuresNum":"发货失败单数", - "succeedNum":"发货成功单数", - "totalNum":"总发货单数", - "operationTime":"操作时间", - "operationType":"操作类型", - "state":"状态", - "operator":"操作人", - "importData":"批量发货", - "templateType":"模板类型", - "fullOrderDelivery":"整单发货模板", - "openOrderDelivery":"拆单发货模板", - "uploadFile":"上传文件", - "createTime":"时间", - "uploadFilePlaceholder":"请上传文件", - "operatorPlaceholder":"请选择操作人", - "causeFailure":"下载失败记录", - "downloadRecord":"下载记录", - "orderTemplate":"下载整单发货模板.xls", - "orderGoodsTemplate":"下载拆单发货模板.xls", - "checkCause": "查看失败原因", - "startTime": "开始时间", - "endTime": "结束时间", - "checkCause1": "失败原因" -} \ No newline at end of file + "failuresNum": "发货失败单数", + "succeedNum": "发货成功单数", + "totalNum": "总发货单数", + "operationTime": "操作时间", + "operationType": "操作类型", + "state": "状态", + "operator": "操作人", + "importData": "批量发货", + "templateType": "模板类型", + "fullOrderDelivery": "整单发货模板", + "openOrderDelivery": "拆单发货模板", + "uploadFile": "上传文件", + "createTime": "时间", + "uploadFilePlaceholder": "请上传文件", + "operatorPlaceholder": "请选择操作人", + "causeFailure": "下载失败记录", + "downloadRecord": "下载记录", + "orderTemplate": "下载整单发货模板.xls", + "orderGoodsTemplate": "下载拆单发货模板.xls", + "checkCause": "查看失败原因", + "startTime": "开始时间", + "endTime": "结束时间", + "checkCause1": "失败原因" +} diff --git a/admin/src/addon/shop/lang/zh-cn/order.config.json b/admin/src/addon/shop/lang/zh-cn/order.config.json index dea0f710..6d0d9425 100644 --- a/admin/src/addon/shop/lang/zh-cn/order.config.json +++ b/admin/src/addon/shop/lang/zh-cn/order.config.json @@ -1,41 +1,41 @@ { - "closeOrderInfo":"自动取消订单", - "closeOrderInfoLeft":"提交订单", - "closeOrderInfoRight":"分钟未付款,自动取消订单", - "closeOrderInfoBottom":"订单取消时间必须在10-1440分钟之间", - "CloseLengthPlaceholder":"请输入订单取消时间", - "isClose":"自动取消订单", - "confirm":"自动确认收货", - "confirmLeft":"发货后", - "confirmRight":"天,自动确认收货", - "confirmBottom":"自动确认收货时间必须在1-30天之间", - "finishLengthPlaceholder":"请输入自动确认收货时间", - "isFinish":"自动确认收货", - "refund":"确认收货后售后", - "refundLeft":"确认收货", - "refundRight":"天内,可申请售后", - "refundBottom":"确认收货后售后时间必须在1-30天之间", - "noAllowRefund":"确认收货后不支持售后", - "validRefundLengthPlaceholder":"请输入确认收货后售后时间", - "invoice":"发票设置", - "isInvoice":"发票开关", - "isInvoiceClose":"关闭", - "isInvoiceOpen":"开启", - "invoiceContent":"发票内容", - "insert":"添加", - "paperInvoice":"纸质发票", - "electronicInvoice":"电子发票", - "invoicePlaceholder":"所有发票内容不能为空", - "invoiceType":"发票类型", - "invoiceTypePlaceholder":"请至少选择一个发票类型", - "evaluate": "评价设置", - "isEvaluate": "评价开关", - "evaluateIsToExamine": "评价审核", - "evaluateIsShow": "评价显示", - "isEvaluateOpen": "开启", - "isEvaluateClose": "关闭", + "closeOrderInfo": "自动取消订单", + "closeOrderInfoLeft": "提交订单", + "closeOrderInfoRight": "分钟未付款,自动取消订单", + "closeOrderInfoBottom": "订单取消时间必须在10-1440分钟之间", + "CloseLengthPlaceholder": "请输入订单取消时间", + "isClose": "自动取消订单", + "confirm": "自动确认收货", + "confirmLeft": "发货后", + "confirmRight": "天,自动确认收货", + "confirmBottom": "自动确认收货时间必须在1-30天之间", + "finishLengthPlaceholder": "请输入自动确认收货时间", + "isFinish": "自动确认收货", + "refund": "确认收货后售后", + "refundLeft": "确认收货", + "refundRight": "天内,可申请售后", + "refundBottom": "确认收货后售后时间必须在1-30天之间", + "noAllowRefund": "确认收货后不支持售后", + "validRefundLengthPlaceholder": "请输入确认收货后售后时间", + "invoice": "发票设置", + "isInvoice": "发票开关", + "isInvoiceClose": "关闭", + "isInvoiceOpen": "开启", + "invoiceContent": "发票内容", + "insert": "添加", + "paperInvoice": "纸质发票", + "electronicInvoice": "电子发票", + "invoicePlaceholder": "所有发票内容不能为空", + "invoiceType": "发票类型", + "invoiceTypePlaceholder": "请至少选择一个发票类型", + "evaluate": "评价设置", + "isEvaluate": "评价开关", + "evaluateIsToExamine": "评价审核", + "evaluateIsShow": "评价显示", + "isEvaluateOpen": "开启", + "isEvaluateClose": "关闭", - "diyForm": "万能表单", - "diyFormPlaceholder": "请选择万能表单", - "addDiyForm": "添加表单" + "diyForm": "万能表单", + "diyFormPlaceholder": "请选择万能表单", + "addDiyForm": "添加表单" } diff --git a/admin/src/addon/shop/lang/zh-cn/order.detail.json b/admin/src/addon/shop/lang/zh-cn/order.detail.json index 1f7e80a1..bba63d6a 100644 --- a/admin/src/addon/shop/lang/zh-cn/order.detail.json +++ b/admin/src/addon/shop/lang/zh-cn/order.detail.json @@ -131,4 +131,4 @@ "refundGoodsNum": "数量", "refundGoodsPlaceholder": "请选择退款的商品", "formDetail": "表单详情" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/order.invoice.json b/admin/src/addon/shop/lang/zh-cn/order.invoice.json index b91598cd..456514da 100644 --- a/admin/src/addon/shop/lang/zh-cn/order.invoice.json +++ b/admin/src/addon/shop/lang/zh-cn/order.invoice.json @@ -1,40 +1,40 @@ { - "isInvoice":"是否开票", - "isInvoicePlaceholder":"请输入开票类型", - "startDate":"开始时间", - "endDate":"结束时间", - "headType":"抬头类型", - "headerTypeName":"抬头类型", - "person":"个人", - "firm":"企业", - "headTypePlaceholder":"请输入抬头类型", - "headerName":"发票抬头", - "headerNamePlaceholder":"请输入发票抬头", - "name":"发票内容", - "tradeType":"发票类型", - "typeName":"发票名称", - "headTypeName":"抬头类型", - "taxNumber":"纳税人识别号", - "mobile":"手机号", - "email":"邮件", - "telephone":"电话号", - "address":"地址", - "bankTame":"开户银行", - "bankCardNumber":"开户行账号", - "money":"开票金额", - "invoiceNumber":"发票号码", - "invoiceVoucher":"发票凭证", - "remark":"备注", - "createTime":"创建时间", - "invoiceTime":"开票时间", - "status":"状态", - "operation":"操作", - "detail":"详情", - "hasInvoice":"已开票", - "noInvoice":"未开票", - "all":"全部", - "invoice":"开票", - "viewOrder":"查看订单", - "invoiceNumberPlaceholder":"请输入发票号码", - "invoiceVoucherPlaceholder":"请输入发票凭证" -} \ No newline at end of file + "isInvoice": "是否开票", + "isInvoicePlaceholder": "请输入开票类型", + "startDate": "开始时间", + "endDate": "结束时间", + "headType": "抬头类型", + "headerTypeName": "抬头类型", + "person": "个人", + "firm": "企业", + "headTypePlaceholder": "请输入抬头类型", + "headerName": "发票抬头", + "headerNamePlaceholder": "请输入发票抬头", + "name": "发票内容", + "tradeType": "发票类型", + "typeName": "发票名称", + "headTypeName": "抬头类型", + "taxNumber": "纳税人识别号", + "mobile": "手机号", + "email": "邮件", + "telephone": "电话号", + "address": "地址", + "bankTame": "开户银行", + "bankCardNumber": "开户行账号", + "money": "开票金额", + "invoiceNumber": "发票号码", + "invoiceVoucher": "发票凭证", + "remark": "备注", + "createTime": "创建时间", + "invoiceTime": "开票时间", + "status": "状态", + "operation": "操作", + "detail": "详情", + "hasInvoice": "已开票", + "noInvoice": "未开票", + "all": "全部", + "invoice": "开票", + "viewOrder": "查看订单", + "invoiceNumberPlaceholder": "请输入发票号码", + "invoiceVoucherPlaceholder": "请输入发票凭证" +} diff --git a/admin/src/addon/shop/lang/zh-cn/order.refund.json b/admin/src/addon/shop/lang/zh-cn/order.refund.json index b07aea9e..bd4756c1 100644 --- a/admin/src/addon/shop/lang/zh-cn/order.refund.json +++ b/admin/src/addon/shop/lang/zh-cn/order.refund.json @@ -1,106 +1,106 @@ { - "goodsName": "商品名称", - "orderNo": "订单编号", - "orderRefundNo": "退款编号", - "refundTime": "退款时间", - "startDate": "开始时间", - "endDate": "结束时间", - "goodsNamePlaceholder": "请输入商品名称", - "orderNoPlaceholder": "请输入订单编号", - "orderRefundNoPlaceholder": "请输入退款编号", - "goodsInfo": "商品信息", - "orderMoney": "订单金额", - "realityMoney":"实付金额", - "goodsMoney": "商品金额", - "buyMember": "买家", - "refundMoney": "退款金额", - "createTime": "申请时间", - "refundStatus": "退款状态", - "all": "全部", - "refundType": "退款方式", - "applyForRefund": "申请退款", - "refundEnd": "维权结束", - "toBeReturned": "买家待退货", - "receivedGoods": "卖家待收货", - "refundRefuse": "卖家拒绝", - "orderInfo": "订单信息", - "outTradeNo": "交易流水号", - "orderType": "订单类型", - "orderForm": "订单来源", - "takerName": "收货人", - "takerMobile": "收货人手机号", - "takerFullAddress": "收货地址", - "goodsDetail": "商品信息", - "price": "价格", - "num": "数量", - "preferentialMoney": "优惠金额", - "deliveryMoney": "配送金额", - "operateLog": "订单日志", - "orderStatus": "订单状态", - "orderStatusPlaceholder": "请选择订单状态", - "orderFrom": "订单类型", - "orderFromPlaceholder": "请选择订单类型", - "payTime": "支付时间", - "orderGoods": "商品", - "goodsPriceNumber": "单价(元)/数量", - "detailOrderMoney": "实付金额(元)", - "buyInfo": "买家/收货人", - "deliveryType": "配送方式", - "piece": "件", - "payType": "支付方式", - "notes": "备注", - "editAddress": "修改地址", - "remind": "提醒", - "remindTips1": "如果未发货,请点击同意退款给买家。", - "remindTips2": "如果实际已发货,请主动与买家联系。", - "remindTips3": "如果订单整体退款后,优惠券和余额会退还给买家。", - "close": "关闭订单", - "finish": "确认收货", - "delivery": "订单发货", - "deliveryTypePlaceholder": "请选择配送方式", - "company": "物流公司", - "companyPlaceholder": "请选择物流公司", - "expressNumber": "物流单号", - "expressNumberPlaceholder": "请输入物流单号", - "orderGoodsIdsPlaceholder": "请选择订单项", - "virtualDelivery": "虚拟发货", - "orderCloseTips": "关闭订单后该订单将无法支付,是否确认关闭?", - "orderFinishTips": "是否确认用户已经收货?", - "orderGoodsPlaceholder": "请选择要发货的商品", - "memberRemark": "买家留言", - "discountMoney": "订单详情", - "orderDelivery": "物流信息", - "devliveryTime": "发货时间", - "companyName": "物流公司", - "logisticNo": "物流单号", - "packageInfo": "物流包裹信息", - "deliveryInfo": "发货信息", - "logisticInfo": "物流信息", - "storeName": "自提点名称", - "storeAddress": "自提点地址", - "storeMobile": "自提点电话", - "tradeTime": "营业时间", - "deliveryStatusName": "发货状态", - "refundReason": "退款原因", - "afterSales": "售后信息", - "orderRefundRefuse": "退款拒绝", - "orderRefundAgree": "同意退款", - "agree": "同意", - "applyMoney": "申请金额", - "refuse": "拒绝", - "transferAccounts": "转账", - "refuseReason": "拒绝原因", - "shopReasonPlaceholder": "请输入拒绝原因", - "confirmDelivery": "确认收货", - "orderDeliveryTips": "确定商品收到了吗?", - "agreeRefundDelivery": "同意买家收货", - "refundDeliveryAddress": "退货地址", - "refundVoucher": "申请凭证", - "refundRemark": "退款描述", - "agreeMoney": "退款金额", - "moneyPlaceholder": "请输入退款金额", - "refundaddressPlaceholder": "请输入退货地址", - "expressCompany": "物流公司", - "expressRemark": "物流说明", - "orderInfoEmpty": "暂无数据" -} \ No newline at end of file + "goodsName": "商品名称", + "orderNo": "订单编号", + "orderRefundNo": "退款编号", + "refundTime": "退款时间", + "startDate": "开始时间", + "endDate": "结束时间", + "goodsNamePlaceholder": "请输入商品名称", + "orderNoPlaceholder": "请输入订单编号", + "orderRefundNoPlaceholder": "请输入退款编号", + "goodsInfo": "商品信息", + "orderMoney": "订单金额", + "realityMoney": "实付金额", + "goodsMoney": "商品金额", + "buyMember": "买家", + "refundMoney": "退款金额", + "createTime": "申请时间", + "refundStatus": "退款状态", + "all": "全部", + "refundType": "退款方式", + "applyForRefund": "申请退款", + "refundEnd": "维权结束", + "toBeReturned": "买家待退货", + "receivedGoods": "卖家待收货", + "refundRefuse": "卖家拒绝", + "orderInfo": "订单信息", + "outTradeNo": "交易流水号", + "orderType": "订单类型", + "orderForm": "订单来源", + "takerName": "收货人", + "takerMobile": "收货人手机号", + "takerFullAddress": "收货地址", + "goodsDetail": "商品信息", + "price": "价格", + "num": "数量", + "preferentialMoney": "优惠金额", + "deliveryMoney": "配送金额", + "operateLog": "订单日志", + "orderStatus": "订单状态", + "orderStatusPlaceholder": "请选择订单状态", + "orderFrom": "订单类型", + "orderFromPlaceholder": "请选择订单类型", + "payTime": "支付时间", + "orderGoods": "商品", + "goodsPriceNumber": "单价(元)/数量", + "detailOrderMoney": "实付金额(元)", + "buyInfo": "买家/收货人", + "deliveryType": "配送方式", + "piece": "件", + "payType": "支付方式", + "notes": "备注", + "editAddress": "修改地址", + "remind": "提醒", + "remindTips1": "如果未发货,请点击同意退款给买家。", + "remindTips2": "如果实际已发货,请主动与买家联系。", + "remindTips3": "如果订单整体退款后,优惠券和余额会退还给买家。", + "close": "关闭订单", + "finish": "确认收货", + "delivery": "订单发货", + "deliveryTypePlaceholder": "请选择配送方式", + "company": "物流公司", + "companyPlaceholder": "请选择物流公司", + "expressNumber": "物流单号", + "expressNumberPlaceholder": "请输入物流单号", + "orderGoodsIdsPlaceholder": "请选择订单项", + "virtualDelivery": "虚拟发货", + "orderCloseTips": "关闭订单后该订单将无法支付,是否确认关闭?", + "orderFinishTips": "是否确认用户已经收货?", + "orderGoodsPlaceholder": "请选择要发货的商品", + "memberRemark": "买家留言", + "discountMoney": "订单详情", + "orderDelivery": "物流信息", + "devliveryTime": "发货时间", + "companyName": "物流公司", + "logisticNo": "物流单号", + "packageInfo": "物流包裹信息", + "deliveryInfo": "发货信息", + "logisticInfo": "物流信息", + "storeName": "自提点名称", + "storeAddress": "自提点地址", + "storeMobile": "自提点电话", + "tradeTime": "营业时间", + "deliveryStatusName": "发货状态", + "refundReason": "退款原因", + "afterSales": "售后信息", + "orderRefundRefuse": "退款拒绝", + "orderRefundAgree": "同意退款", + "agree": "同意", + "applyMoney": "申请金额", + "refuse": "拒绝", + "transferAccounts": "转账", + "refuseReason": "拒绝原因", + "shopReasonPlaceholder": "请输入拒绝原因", + "confirmDelivery": "确认收货", + "orderDeliveryTips": "确定商品收到了吗?", + "agreeRefundDelivery": "同意买家收货", + "refundDeliveryAddress": "退货地址", + "refundVoucher": "申请凭证", + "refundRemark": "退款描述", + "agreeMoney": "退款金额", + "moneyPlaceholder": "请输入退款金额", + "refundaddressPlaceholder": "请输入退货地址", + "expressCompany": "物流公司", + "expressRemark": "物流说明", + "orderInfoEmpty": "暂无数据" +} diff --git a/admin/src/addon/shop/lang/zh-cn/order.refund_detail.json b/admin/src/addon/shop/lang/zh-cn/order.refund_detail.json index 89c5d0f4..220216af 100644 --- a/admin/src/addon/shop/lang/zh-cn/order.refund_detail.json +++ b/admin/src/addon/shop/lang/zh-cn/order.refund_detail.json @@ -91,4 +91,4 @@ "expressCompany": "物流公司", "expressRemark": "物流说明", "orderInfoEmpty": "暂无数据" -} \ No newline at end of file +} diff --git a/admin/src/addon/shop/lang/zh-cn/stat.goods.json b/admin/src/addon/shop/lang/zh-cn/stat.goods.json index 172d17ed..ea3bcd05 100644 --- a/admin/src/addon/shop/lang/zh-cn/stat.goods.json +++ b/admin/src/addon/shop/lang/zh-cn/stat.goods.json @@ -1,37 +1,37 @@ { - "goodsOverview": "商品概况", - "timeFilter": "时间筛选", - "startTime": "开始时间", - "endTime": "结束时间", - "search": "搜索", - "goodsAccessNum": "商品浏览量", - "goodsAccessNumTip": "统计时间内,所有商品详情页被访问的次数,一个人在统计时间内访问多次记为多次", - "goodsVisitCount": "商品访客数", - "goodsVisitCountTips":"统计时间内,访问任何商品详情页的人数,一个人在统计时间范围内访问多次只记为一个", - "cartNum":"加购件数", - "cartNumTips":"统计时间内,添加商品进入购物车的商品件数", - "saleNum": "下单件数", - "saleNumTips": "统计时间内,成功下单的商品件数之和(不剔除退款订单)", - "payNum": "支付件数", - "payNumTips": "统计时间内, 成功付款订单的商品件数之和(不剔除退款订单)", - "payMoney":"支付金额", - "payMoneyTips":"统计时间内,成功付款订单的商品金额之和(不剔除退款订单)", - "refundMoney":"退款金额", - "refundMoneyTips":"统计时间内,成功退款的商品金额之和", - "refundNum":"退款件数", - "refundNumTips":"统计时间内,成功退款的商品件数之和", - "goodsRank": "商品排行", - "goodsName":"商品名称", - "goodsNamePlaceholder":"请输入商品名称", - "goodsCategory": "商品分类", - "all":"全部", - "totalType":"统计类型", - "totalTypePlaceholder":"请选择统计类型", - "goodsInfo":"商品信息", - "accessNum":"访问次数", - "visitCount":"访客数", - "cartNumber":"加入购物车数量", - "saleNumber":"商品销量", - "payTotal":"支付总金额", - "collectNum":"收藏数量" -} \ No newline at end of file + "goodsOverview": "商品概况", + "timeFilter": "时间筛选", + "startTime": "开始时间", + "endTime": "结束时间", + "search": "搜索", + "goodsAccessNum": "商品浏览量", + "goodsAccessNumTip": "统计时间内,所有商品详情页被访问的次数,一个人在统计时间内访问多次记为多次", + "goodsVisitCount": "商品访客数", + "goodsVisitCountTips": "统计时间内,访问任何商品详情页的人数,一个人在统计时间范围内访问多次只记为一个", + "cartNum": "加购件数", + "cartNumTips": "统计时间内,添加商品进入购物车的商品件数", + "saleNum": "下单件数", + "saleNumTips": "统计时间内,成功下单的商品件数之和(不剔除退款订单)", + "payNum": "支付件数", + "payNumTips": "统计时间内, 成功付款订单的商品件数之和(不剔除退款订单)", + "payMoney": "支付金额", + "payMoneyTips": "统计时间内,成功付款订单的商品金额之和(不剔除退款订单)", + "refundMoney": "退款金额", + "refundMoneyTips": "统计时间内,成功退款的商品金额之和", + "refundNum": "退款件数", + "refundNumTips": "统计时间内,成功退款的商品件数之和", + "goodsRank": "商品排行", + "goodsName": "商品名称", + "goodsNamePlaceholder": "请输入商品名称", + "goodsCategory": "商品分类", + "all": "全部", + "totalType": "统计类型", + "totalTypePlaceholder": "请选择统计类型", + "goodsInfo": "商品信息", + "accessNum": "访问次数", + "visitCount": "访客数", + "cartNumber": "加入购物车数量", + "saleNumber": "商品销量", + "payTotal": "支付总金额", + "collectNum": "收藏数量" +} diff --git a/admin/src/addon/shop/views/address/edit.vue b/admin/src/addon/shop/views/address/edit.vue index fad35649..8d676f6c 100644 --- a/admin/src/addon/shop/views/address/edit.vue +++ b/admin/src/addon/shop/views/address/edit.vue @@ -1,69 +1,158 @@ diff --git a/admin/src/addon/shop/views/address/list.vue b/admin/src/addon/shop/views/address/list.vue index 7d8b73d3..d9fa670d 100644 --- a/admin/src/addon/shop/views/address/list.vue +++ b/admin/src/addon/shop/views/address/list.vue @@ -1,89 +1,144 @@ - + diff --git a/admin/src/addon/shop/views/delivery/company.vue b/admin/src/addon/shop/views/delivery/company.vue index ee9a86fd..24b07db2 100644 --- a/admin/src/addon/shop/views/delivery/company.vue +++ b/admin/src/addon/shop/views/delivery/company.vue @@ -1,67 +1,124 @@ - + diff --git a/admin/src/addon/shop/views/delivery/company_edit.vue b/admin/src/addon/shop/views/delivery/company_edit.vue index c3298eb5..7ffced3e 100644 --- a/admin/src/addon/shop/views/delivery/company_edit.vue +++ b/admin/src/addon/shop/views/delivery/company_edit.vue @@ -1,122 +1,281 @@ - + diff --git a/admin/src/addon/shop/views/delivery/components/delivery-personnel-edit.vue b/admin/src/addon/shop/views/delivery/components/delivery-personnel-edit.vue index 3951874b..9571496a 100644 --- a/admin/src/addon/shop/views/delivery/components/delivery-personnel-edit.vue +++ b/admin/src/addon/shop/views/delivery/components/delivery-personnel-edit.vue @@ -1,27 +1,64 @@ diff --git a/admin/src/addon/shop/views/delivery/config.vue b/admin/src/addon/shop/views/delivery/config.vue index 15041102..0981e497 100644 --- a/admin/src/addon/shop/views/delivery/config.vue +++ b/admin/src/addon/shop/views/delivery/config.vue @@ -1,53 +1,108 @@ diff --git a/admin/src/addon/shop/views/delivery/electronic_sheet.vue b/admin/src/addon/shop/views/delivery/electronic_sheet.vue index 15add295..8977289e 100644 --- a/admin/src/addon/shop/views/delivery/electronic_sheet.vue +++ b/admin/src/addon/shop/views/delivery/electronic_sheet.vue @@ -1,131 +1,216 @@ - + diff --git a/admin/src/addon/shop/views/delivery/electronic_sheet_config.vue b/admin/src/addon/shop/views/delivery/electronic_sheet_config.vue index f09e4aae..bf3d5fb3 100644 --- a/admin/src/addon/shop/views/delivery/electronic_sheet_config.vue +++ b/admin/src/addon/shop/views/delivery/electronic_sheet_config.vue @@ -1,184 +1,257 @@ diff --git a/admin/src/addon/shop/views/delivery/electronic_sheet_edit.vue b/admin/src/addon/shop/views/delivery/electronic_sheet_edit.vue index 0a37ae2b..d0988dc9 100644 --- a/admin/src/addon/shop/views/delivery/electronic_sheet_edit.vue +++ b/admin/src/addon/shop/views/delivery/electronic_sheet_edit.vue @@ -1,270 +1,384 @@ diff --git a/admin/src/addon/shop/views/delivery/local.vue b/admin/src/addon/shop/views/delivery/local.vue index c3d35606..3b977bd7 100644 --- a/admin/src/addon/shop/views/delivery/local.vue +++ b/admin/src/addon/shop/views/delivery/local.vue @@ -1,18 +1,25 @@ diff --git a/admin/src/addon/shop/views/delivery/search.vue b/admin/src/addon/shop/views/delivery/search.vue index 6a80f470..39b643ad 100644 --- a/admin/src/addon/shop/views/delivery/search.vue +++ b/admin/src/addon/shop/views/delivery/search.vue @@ -1,76 +1,116 @@ diff --git a/admin/src/addon/shop/views/delivery/staff.vue b/admin/src/addon/shop/views/delivery/staff.vue index 691ae3d8..97a75df9 100644 --- a/admin/src/addon/shop/views/delivery/staff.vue +++ b/admin/src/addon/shop/views/delivery/staff.vue @@ -1,57 +1,98 @@ diff --git a/admin/src/addon/shop/views/delivery/store.vue b/admin/src/addon/shop/views/delivery/store.vue index ad71b5b6..a27fc36a 100644 --- a/admin/src/addon/shop/views/delivery/store.vue +++ b/admin/src/addon/shop/views/delivery/store.vue @@ -1,77 +1,129 @@ - + diff --git a/admin/src/addon/shop/views/delivery/store_edit.vue b/admin/src/addon/shop/views/delivery/store_edit.vue index 76c0f635..cb9bb25c 100644 --- a/admin/src/addon/shop/views/delivery/store_edit.vue +++ b/admin/src/addon/shop/views/delivery/store_edit.vue @@ -1,63 +1,136 @@ diff --git a/admin/src/addon/shop/views/delivery/template.vue b/admin/src/addon/shop/views/delivery/template.vue index 31e450d7..166648c8 100644 --- a/admin/src/addon/shop/views/delivery/template.vue +++ b/admin/src/addon/shop/views/delivery/template.vue @@ -1,84 +1,137 @@ - + diff --git a/admin/src/addon/shop/views/delivery/template_edit.vue b/admin/src/addon/shop/views/delivery/template_edit.vue index 6209cd5e..1e92ff86 100644 --- a/admin/src/addon/shop/views/delivery/template_edit.vue +++ b/admin/src/addon/shop/views/delivery/template_edit.vue @@ -1,149 +1,286 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-goods-coupon.vue b/admin/src/addon/shop/views/diy/components/edit-goods-coupon.vue index 63321032..df934dfb 100644 --- a/admin/src/addon/shop/views/diy/components/edit-goods-coupon.vue +++ b/admin/src/addon/shop/views/diy/components/edit-goods-coupon.vue @@ -1,119 +1,203 @@ - + \ No newline at end of file + diff --git a/admin/src/addon/shop/views/diy/components/edit-goods-list.vue b/admin/src/addon/shop/views/diy/components/edit-goods-list.vue index 47cb6360..ef567139 100644 --- a/admin/src/addon/shop/views/diy/components/edit-goods-list.vue +++ b/admin/src/addon/shop/views/diy/components/edit-goods-list.vue @@ -1,196 +1,372 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-many-goods-list.vue b/admin/src/addon/shop/views/diy/components/edit-many-goods-list.vue index e344d0c6..f6c3184e 100644 --- a/admin/src/addon/shop/views/diy/components/edit-many-goods-list.vue +++ b/admin/src/addon/shop/views/diy/components/edit-many-goods-list.vue @@ -1,272 +1,498 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-exchange-goods.vue b/admin/src/addon/shop/views/diy/components/edit-shop-exchange-goods.vue index e05caee9..cbbb3403 100644 --- a/admin/src/addon/shop/views/diy/components/edit-shop-exchange-goods.vue +++ b/admin/src/addon/shop/views/diy/components/edit-shop-exchange-goods.vue @@ -1,8 +1,8 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-exchange-info.vue b/admin/src/addon/shop/views/diy/components/edit-shop-exchange-info.vue index 17757aa7..2c787575 100644 --- a/admin/src/addon/shop/views/diy/components/edit-shop-exchange-info.vue +++ b/admin/src/addon/shop/views/diy/components/edit-shop-exchange-info.vue @@ -1,38 +1,37 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-goods-ranking.vue b/admin/src/addon/shop/views/diy/components/edit-shop-goods-ranking.vue index 9bb60ec0..9e37f58b 100644 --- a/admin/src/addon/shop/views/diy/components/edit-shop-goods-ranking.vue +++ b/admin/src/addon/shop/views/diy/components/edit-shop-goods-ranking.vue @@ -1,83 +1,150 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-member-info.vue b/admin/src/addon/shop/views/diy/components/edit-shop-member-info.vue index 10a65585..f7e24614 100644 --- a/admin/src/addon/shop/views/diy/components/edit-shop-member-info.vue +++ b/admin/src/addon/shop/views/diy/components/edit-shop-member-info.vue @@ -1,41 +1,41 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-newcomer.vue b/admin/src/addon/shop/views/diy/components/edit-shop-newcomer.vue index 5feb6593..7b5260f1 100644 --- a/admin/src/addon/shop/views/diy/components/edit-shop-newcomer.vue +++ b/admin/src/addon/shop/views/diy/components/edit-shop-newcomer.vue @@ -1,116 +1,232 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-order-info.vue b/admin/src/addon/shop/views/diy/components/edit-shop-order-info.vue index 187f9edf..e3555b38 100644 --- a/admin/src/addon/shop/views/diy/components/edit-shop-order-info.vue +++ b/admin/src/addon/shop/views/diy/components/edit-shop-order-info.vue @@ -1,78 +1,104 @@ diff --git a/admin/src/addon/shop/views/diy/components/edit-shop-search.vue b/admin/src/addon/shop/views/diy/components/edit-shop-search.vue index cd175271..805f9e50 100644 --- a/admin/src/addon/shop/views/diy/components/edit-shop-search.vue +++ b/admin/src/addon/shop/views/diy/components/edit-shop-search.vue @@ -1,24 +1,27 @@ - + diff --git a/admin/src/addon/shop/views/goods/attr_edit.vue b/admin/src/addon/shop/views/goods/attr_edit.vue index 7e4989c4..48b09b34 100644 --- a/admin/src/addon/shop/views/goods/attr_edit.vue +++ b/admin/src/addon/shop/views/goods/attr_edit.vue @@ -1,202 +1,363 @@ diff --git a/admin/src/addon/shop/views/goods/components/brand-edit.vue b/admin/src/addon/shop/views/goods/components/brand-edit.vue index 600c3175..f6e51388 100644 --- a/admin/src/addon/shop/views/goods/components/brand-edit.vue +++ b/admin/src/addon/shop/views/goods/components/brand-edit.vue @@ -1,30 +1,71 @@ diff --git a/admin/src/addon/shop/views/goods/components/category-edit.vue b/admin/src/addon/shop/views/goods/components/category-edit.vue index 2fd0f87c..0ba64043 100644 --- a/admin/src/addon/shop/views/goods/components/category-edit.vue +++ b/admin/src/addon/shop/views/goods/components/category-edit.vue @@ -1,38 +1,84 @@ diff --git a/admin/src/addon/shop/views/goods/components/coupon-select-popup.vue b/admin/src/addon/shop/views/goods/components/coupon-select-popup.vue index 68d53da9..54091d8f 100644 --- a/admin/src/addon/shop/views/goods/components/coupon-select-popup.vue +++ b/admin/src/addon/shop/views/goods/components/coupon-select-popup.vue @@ -1,76 +1,124 @@ diff --git a/admin/src/addon/shop/views/goods/components/evaluate-add.vue b/admin/src/addon/shop/views/goods/components/evaluate-add.vue index 61052688..58813751 100644 --- a/admin/src/addon/shop/views/goods/components/evaluate-add.vue +++ b/admin/src/addon/shop/views/goods/components/evaluate-add.vue @@ -1,47 +1,95 @@ diff --git a/admin/src/addon/shop/views/goods/components/goods-batch-settings-popup.vue b/admin/src/addon/shop/views/goods/components/goods-batch-settings-popup.vue index 1a248a9b..0259fd3d 100644 --- a/admin/src/addon/shop/views/goods/components/goods-batch-settings-popup.vue +++ b/admin/src/addon/shop/views/goods/components/goods-batch-settings-popup.vue @@ -1,155 +1,379 @@ diff --git a/admin/src/addon/shop/views/goods/components/goods-category-spread-popup.vue b/admin/src/addon/shop/views/goods/components/goods-category-spread-popup.vue index f41c0fb1..095bc32b 100644 --- a/admin/src/addon/shop/views/goods/components/goods-category-spread-popup.vue +++ b/admin/src/addon/shop/views/goods/components/goods-category-spread-popup.vue @@ -1,24 +1,32 @@ diff --git a/admin/src/addon/shop/views/goods/components/goods-member-price-popup.vue b/admin/src/addon/shop/views/goods/components/goods-member-price-popup.vue index e9a17350..ce3ab67c 100644 --- a/admin/src/addon/shop/views/goods/components/goods-member-price-popup.vue +++ b/admin/src/addon/shop/views/goods/components/goods-member-price-popup.vue @@ -1,84 +1,175 @@ diff --git a/admin/src/addon/shop/views/goods/components/goods-price-edit-popup.vue b/admin/src/addon/shop/views/goods/components/goods-price-edit-popup.vue index 85382eb3..89c205bd 100644 --- a/admin/src/addon/shop/views/goods/components/goods-price-edit-popup.vue +++ b/admin/src/addon/shop/views/goods/components/goods-price-edit-popup.vue @@ -1,74 +1,152 @@