diff --git a/api/config.js b/api/config.js index b43ebf5..7a4c28e 100644 --- a/api/config.js +++ b/api/config.js @@ -3,7 +3,7 @@ let accountInfo = wx.getAccountInfoSync(); let envVersion = accountInfo.miniProgram.envVersion //手动指定版本 -envVersion = 'trial' +// envVersion = 'trial' let hosts = { "develop": 'http://wanyu.test', diff --git a/components/me-icon/me-icon.css b/components/me-icon/me-icon.css index 56fed6a..c128214 100644 --- a/components/me-icon/me-icon.css +++ b/components/me-icon/me-icon.css @@ -1,45 +1,51 @@ -.icon-arrow-up-line:before { - content: "\e90d"; -} -.icon-progress-2-line:before { - content: "\e90e"; -} -.icon-reset-left-line:before { - content: "\e90c"; -} -.icon-upload-cloud-fill:before { - content: "\e90b"; -} -.icon-arrow-right:before { - content: "\e90a"; -} -.icon-info:before { +.icon-arrow-right-circle:before { content: "\e900"; } -.icon-call:before { +.icon-arrow-right:before { content: "\e901"; } -.icon-user:before { +.icon-arrow-up-line:before { content: "\e902"; } -.icon-logout:before { +.icon-call:before { content: "\e903"; } -.icon-navigation:before { +.icon-checkbox-blank-circle:before { content: "\e904"; } -.icon-flashlight:before { +.icon-checkbox-circle:before { content: "\e905"; } -.icon-time:before { +.icon-close-circle-fill:before { content: "\e906"; } -.icon-arrow-right-circle:before { +.icon-flashlight:before { content: "\e907"; } -.icon-checkbox-circle:before { +.icon-info:before { content: "\e908"; } -.icon-checkbox-blank-circle:before { +.icon-logout:before { content: "\e909"; } +.icon-navigation:before { + content: "\e90a"; +} +.icon-progress-2-line:before { + content: "\e90b"; +} +.icon-reset-left-fill:before { + content: "\e90c"; +} +.icon-reset-left-line:before { + content: "\e90d"; +} +.icon-time:before { + content: "\e90e"; +} +.icon-upload-cloud-fill:before { + content: "\e90f"; +} +.icon-user:before { + content: "\e910"; +} diff --git a/components/me-icon/me-icon.ttf b/components/me-icon/me-icon.ttf index 43b8f8a..c5be73f 100644 Binary files a/components/me-icon/me-icon.ttf and b/components/me-icon/me-icon.ttf differ diff --git a/pages/order/arrived-on-site.vue b/pages/order/arrived-on-site.vue index ad9a1f1..7942611 100644 --- a/pages/order/arrived-on-site.vue +++ b/pages/order/arrived-on-site.vue @@ -11,9 +11,15 @@ 请上传上门的打卡照片(最多 10 张) - - + + + + + + + + diff --git a/pages/order/complete-service.vue b/pages/order/complete-service.vue index a1f0c39..1ab1c17 100644 --- a/pages/order/complete-service.vue +++ b/pages/order/complete-service.vue @@ -11,9 +11,15 @@ 请上传完成图片(最多 10 张) - - + + + + + + + + @@ -59,9 +65,15 @@ 点击上传 - - + + + + + + + + diff --git a/pages/order/order-info.vue b/pages/order/order-info.vue index 889c882..7caa8d0 100644 --- a/pages/order/order-info.vue +++ b/pages/order/order-info.vue @@ -88,7 +88,7 @@ 上门图片 - + @@ -100,7 +100,7 @@ 完成图片 - + @@ -126,7 +126,7 @@ 收款凭证 - + @@ -295,21 +295,6 @@ const getPriceDescText = () => { const getOrderStatusText = (status) => { return enums.WORKBENCH_STATUS_TEXT[status] } - -//预览图片 -const previewImage = (url) => { - uni.previewImage({ - urls: [url], - longPressActions: { - itemList: ['发送给朋友', '保存图片', '收藏'], - success: function(data) { - }, - fail: function(err) { - console.log(err.errMsg); - } - } - }); -}