Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/repair_workers_h5 into spp

src/api/apiList.js

@@ -34,8 +34,9 @@ export default {
     REPAIR_BEGIN: baseUrl + '/worker/repair/begin', // 开始维修接口
     REPAIR_ORDER_DETAIL: baseUrl + '/worker/repair/order/detail', // 报修单详情
     REPAIR_ORDER: baseUrl + '/worker/material/order', // 发起收费生成耗材单
-    MATERIAL_REMARK: baseUrl + '/worker/material/remark' // 备注耗材
-    // BINDLOGINTWO: baseUrl + '/scm/bind/login/two', // 绑定后台账号
-    // REFRESHTOKEN: baseUrl + '/scm/change/token', // 更新token
-    // LOGOUT: baseUrl + '/scm/logout', // 更新token
+    MATERIAL_REMARK: baseUrl + '/worker/material/remark', // 备注耗材
+    REPAIR_MATERIAL_SHOW: baseUrl + '/worker/material/show', // 查看耗材
+    REPAIR_TRANSFER: baseUrl + '/worker/repair/transfer', // 发起转单
+    REPAIR_COMPLETE: baseUrl + '/worker/repair/complete', // 确认完成
+    REPAIR_APPRAISAL: baseUrl + '/worker/repair/appraisal' // 查看评论
 }

src/assets/js/format.js

@@ -6,3 +6,12 @@ export function formatTel (tel) {
     var phone = tel.substr(0, 3) + '****' + tel.substring(7, 11)
     return phone
 }
+
+/**
+ * 清空左右空格
+ * @param {*} str
+ * @returns
+ */
+export function trimStrSpace (str) {
+    return str.replace(/(^\s*)|(\s*$)/g, '')
+}

src/assets/js/util.js

-import { Toast, Dialog } from 'vant'
-function selfLoading (msg = '加载中...') {
-    Toast.loading({
-        message: msg,
-        duration: 0,
-        forbidClick: true,
-        loadingType: 'spinner'
-    })
-}
-
-export default {
-    selfLoading: selfLoading
-}