sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小程序售后

feat/task1-c-wallet
Devil 2019-10-06 16:58:17 +08:00
parent 9670daf021
commit ec68e43992
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/service/OrderAftersaleService.php
View File

@ -158,7 +158,7 @@ class OrderAftersaleService
$count = (int) Db::name('OrderAftersale')->where($where)->count(); $count = (int) Db::name('OrderAftersale')->where($where)->count();
if($count > 0) if($count > 0)
{ {
return DataReturn('当前订单商品售后正在进行中，请勿重复申请', -1); return DataReturn('订单售后正在进行中，请勿重复申请', -1);
} }
// 获取历史申请售后条件 // 获取历史申请售后条件
@ -1223,12 +1223,12 @@ class OrderAftersaleService
public static function OrderAftersaleTipsMsg($orderaftersale = []) public static function OrderAftersaleTipsMsg($orderaftersale = [])
{ {
$msg_all = [ $msg_all = [
0 => '当前订单商品售后已提交申请，等待管理员确认中！', 0 => '订单售后已提交申请，等待管理员确认中！',
1 => '当前订单商品售后，管理员已确认，请尽快完成退货！', 1 => '订单售后，管理员已确认，请尽快完成退货！',
2 => '当前订单商品售后已退货，等待管理员审核中！', 2 => '订单售后已退货，等待管理员审核中！',
3 => '当前订单商品售后已处理结束！', 3 => '订单售后已处理结束！',
4 => '当前订单商品售后申请已被拒绝！', 4 => '订单售后申请已被拒绝！',
5 => '当前订单商品售后申请已关闭！', 5 => '订单售后申请已关闭！',
]; ];
if(isset($orderaftersale['status']) && array_key_exists($orderaftersale['status'], $msg_all)) if(isset($orderaftersale['status']) && array_key_exists($orderaftersale['status'], $msg_all))
{ {

2
public/appmini/old/weixin/app.js
View File

@ -64,7 +64,7 @@ App({
// 请求地址 // 请求地址
request_url: "{{request_url}}", request_url: "{{request_url}}",
request_url: 'http://tp5-dev.com/', request_url: 'http://tp5-dev.com/',
// request_url: 'https://test.shopxo.net/', request_url: 'https://test.shopxo.net/',
// 基础信息 // 基础信息
application_title: "{{application_title}}", application_title: "{{application_title}}",

2
public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
View File

@ -320,7 +320,7 @@ Page({
number: (this.data.form_type == 0) ? 0 : this.data.form_number, number: (this.data.form_type == 0) ? 0 : this.data.form_number,
price: this.data.form_price, price: this.data.form_price,
msg: this.data.form_msg, 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) : '',
} }
// 防止金额大于计算的金额 // 防止金额大于计算的金额