From ec68e43992745fb680692f4cf44b2e87e8700bd1 Mon Sep 17 00:00:00 2001 From: Devil Date: Sun, 6 Oct 2019 16:58:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=94=AE=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/OrderAftersaleService.php | 14 +++++++------- public/appmini/old/weixin/app.js | 2 +- .../user-orderaftersale-detail.js | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/application/service/OrderAftersaleService.php b/application/service/OrderAftersaleService.php index 4e0adf306..967e515ab 100644 --- a/application/service/OrderAftersaleService.php +++ b/application/service/OrderAftersaleService.php @@ -158,7 +158,7 @@ class OrderAftersaleService $count = (int) Db::name('OrderAftersale')->where($where)->count(); if($count > 0) { - return DataReturn('当前订单商品售后正在进行中，请勿重复申请', -1); + return DataReturn('订单售后正在进行中，请勿重复申请', -1); } // 获取历史申请售后条件 @@ -1223,12 +1223,12 @@ class OrderAftersaleService public static function OrderAftersaleTipsMsg($orderaftersale = []) { $msg_all = [ - 0 => '当前订单商品售后已提交申请，等待管理员确认中！', - 1 => '当前订单商品售后，管理员已确认，请尽快完成退货！', - 2 => '当前订单商品售后已退货，等待管理员审核中！', - 3 => '当前订单商品售后已处理结束！', - 4 => '当前订单商品售后申请已被拒绝！', - 5 => '当前订单商品售后申请已关闭！', + 0 => '订单售后已提交申请，等待管理员确认中！', + 1 => '订单售后，管理员已确认，请尽快完成退货！', + 2 => '订单售后已退货，等待管理员审核中！', + 3 => '订单售后已处理结束！', + 4 => '订单售后申请已被拒绝！', + 5 => '订单售后申请已关闭！', ]; if(isset($orderaftersale['status']) && array_key_exists($orderaftersale['status'], $msg_all)) { diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index 6c5de82f4..4abeac210 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -64,7 +64,7 @@ App({ // 请求地址 request_url: "{{request_url}}", request_url: 'http://tp5-dev.com/', - // request_url: 'https://test.shopxo.net/', + request_url: 'https://test.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js index 0e5e18864..17e7bfe07 100644 --- a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js +++ b/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js @@ -320,7 +320,7 @@ Page({ number: (this.data.form_type == 0) ? 0 : this.data.form_number, price: this.data.form_price, msg: this.data.form_msg, - images: JSON.stringify(this.data.form_images_list), + images: (this.data.form_images_list.length > 0) ? JSON.stringify(this.data.form_images_list) : '', } // 防止金额大于计算的金额 -- GitLab