Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李俊赕
self-support
Commits
6a97f680
Commit
6a97f680
authored
Aug 17, 2021
by
Facius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-1.4.5' into test
parents
7a3f1140
8d17eb09
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
2464 additions
and
2149 deletions
+2464
-2149
.env.js
.env.js
+1
-1
appoint-time.vue
src/components/appoint/appoint-time.vue
+375
-321
feedback.vue
src/components/order/feedback.vue
+469
-0
index.vue
src/components/order/index.vue
+1
-1
performanceRecord.vue
src/components/order/performanceRecord.vue
+240
-208
detail.vue
src/pages/order/detail.vue
+1226
-1089
feedback.vue
src/pages/order/feedback.vue
+152
-529
No files found.
.env.js
View file @
6a97f680
;(
function
()
{
;(
function
()
{
let
NODE_ENV
=
'test'
// dev:开发环境 | test:测试环境 | prod:生产环境
let
NODE_ENV
=
'test'
// dev:开发环境 | test:测试环境 | prod:生产环境
let
ENV_VAR
=
null
let
ENV_VAR
=
null
let
VERSION_NUMBER
=
'1.4.
0
'
//版本号
let
VERSION_NUMBER
=
'1.4.
1
'
//版本号
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
if
(
process
.
env
.
NODE_ENV
===
'development'
)
{
if
(
process
.
env
.
NODE_ENV
===
'development'
)
{
if
(
NODE_ENV
===
'dev'
)
{
if
(
NODE_ENV
===
'dev'
)
{
...
...
src/components/appoint/appoint-time.vue
View file @
6a97f680
This diff is collapsed.
Click to expand it.
src/components/order/feedback.vue
0 → 100644
View file @
6a97f680
This diff is collapsed.
Click to expand it.
src/components/order/index.vue
View file @
6a97f680
...
@@ -299,7 +299,7 @@ export default {
...
@@ -299,7 +299,7 @@ export default {
待预约 orderStatus == 31 and appointmentDatetime == null 工单状态等于30并且预约时间为空
待预约 orderStatus == 31 and appointmentDatetime == null 工单状态等于30并且预约时间为空
待签到 orderStatus == 31 and appointmentDatetime is not null 工单状态等于30并且预约时间不为空
待签到 orderStatus == 31 and appointmentDatetime is not null 工单状态等于30并且预约时间不为空
待完工 orderStatus >31 and orderStatus < 80 工单状态大于31 小于80
待完工 orderStatus >31 and orderStatus < 80 工单状态大于31 小于80
审核中 orderStatus ==85 or orderStatus == 87 or orderStatus == 88 工单状态 等于85 或者 等于
有87
审核中 orderStatus ==85 or orderStatus == 87 or orderStatus == 88 工单状态 等于85 或者 等于
87 或者 等于88
异常 orderStatus ==86 工单状态 等于86
异常 orderStatus ==86 工单状态 等于86
已完工 orderStatus in(80,81,89,110) 工单状态 等于80 or 81 or 89 or 110
已完工 orderStatus in(80,81,89,110) 工单状态 等于80 or 81 or 89 or 110
*/
*/
...
...
src/components/order/performanceRecord.vue
View file @
6a97f680
This diff is collapsed.
Click to expand it.
src/pages/order/detail.vue
View file @
6a97f680
This diff is collapsed.
Click to expand it.
src/pages/order/feedback.vue
View file @
6a97f680
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment