Merge branch 'zjl_check_pay_20200421'

app/Http/Controllers/ApiController.php

@@ -18,6 +18,7 @@ use App\Model\UserSampleInviteModel;
 use App\Model\OrderItemsModel;
 use App\Model\UserGroupModel;
 use App\Model\BrandBlackListModel;
+use App\Model\PayExtendModel;
 
 class ApiController extends Controller
 {
@@ -277,4 +278,11 @@ class ApiController extends Controller
         $this->Export($BrandBlackListModel->action($request));
     }
 
+    // 自营申请收款
+    public function ajaxApplyPaid($request) 
+    {
+        $PayExtendModel = new PayExtendModel;
+        $this->Export($PayExtendModel->setPay($request));
+    }
+
 }

app/Http/Controllers/OrderController.php

@@ -19,6 +19,8 @@ use App\Model\OrderReturnModel;
 use App\Model\OrderItemsTrackModel;
 use App\Model\CmsModel;
 use App\Model\QueuedModel;
+use App\Model\ErpPayLogModel;
+use App\Model\PayExtendModel;
 use Session;
 use Hprose\Http\Client;
 
@@ -1564,6 +1566,7 @@ Class OrderController extends Controller
         // 获取操作记录
         $actionLog = DB::connection('order')->table('lie_order_action_log')->where('order_id', $id)->orderBy('create_time', 'DESC')->orderBy('log_id', 'DESC')->get();
 
+        // 获取ERP支付记录
         $erpPayLog = DB::connection('order')->table('lie_erp_pay_log')->where('order_id', $id)->orderBy('create_time', 'DESC')->orderBy('log_id', 'DESC')->get();
 
         $response = [
@@ -1587,6 +1590,12 @@ Class OrderController extends Controller
             'order_refund_items'          => $temp['data']['order_refund_items'],
         ];
 
+        // 获取收款信息
+        if ($response['order_info']['order_goods_type'] == 2 && in_array($response['order_info']['status'], [2, 3])) {
+            $PayExtendModel = new PayExtendModel;
+            $response['pay_extend_info'] = $PayExtendModel->where('order_id', $id)->first();
+        }
+
         $response = array_merge($response, $info);
 
         // 获取数组中的采购人id的名字

app/Model/PayExtendModel.php

+<?php
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+use Request;
+
+class PayExtendModel extends Model
+{
+    protected $connection = 'order';
+    protected $table      = 'lie_pay_extend';
+    protected $primaryKey = 'id';
+    protected $guarded    = ['id'];
+    public $timestamps    = true;
+    const CREATED_AT      = 'create_time';
+    const UPDATED_AT      = 'update_time';
+
+    public $pay_type = [1 => '线下微信', 2 => '线下支付宝', 3 => '交通银行'];
+
+    public function fromDateTime($value)
+    {
+        return strtotime(parent::fromDateTime($value));
+    }
+
+    // 设置支付记录
+    public function setPay($request)
+    {
+        $id                 = $request->input('id', 0);
+        $data['order_id']   = $request->input('order_id', 0);
+        $data['type']       = $request->input('pay_type', 0);
+        $data['file_name']  = $request->input('file_name', '');
+        $data['remark']     = $request->input('remarks', '');   
+
+        $event = '申请收款';
+
+        $pay_extend = $this->where('order_id', $data['order_id'])->first();
+
+        if ($pay_extend) { // 更新
+            $data['update_uid'] = $request->user->userId;
+
+            $pay_extend_info = $this->find($pay_extend->id);
+            $event .= '，修改前：支付方式 - '.$this->pay_type[$pay_extend_info['type']].'；转账凭证 - '.$pay_extend_info['file_name'].'，备注：'.$pay_extend_info['remark'];
+
+            $res = $this->where('id', $pay_extend->id)->update($data);
+
+            if ($res === false) return [-1, '申请收款更新失败'];
+        } else { // 新增
+            $data['create_uid'] = $request->user->userId;
+
+            $res = $this->create($data);
+
+            if ($res === false) return [-1, '申请收款新增失败'];
+        }
+
+        $OrderActionLogModel = new OrderActionLogModel;
+        $OrderActionLogModel->addLog($data['order_id'], $request->user->userId, 2, $event);
+
+        return [0, '操作成功'];
+    }
+
+}
\ No newline at end of file

public/js/md5.js

+/*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002.
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info.
+ */
+
+/*
+ * Configurable variables. You may need to tweak these to be compatible with
+ * the server-side, but the defaults work in most cases.
+ */
+var hexcase = 0;  /* hex output format. 0 - lowercase; 1 - uppercase        */
+var b64pad  = ""; /* base-64 pad character. "=" for strict RFC compliance   */
+var chrsz   = 8;  /* bits per input character. 8 - ASCII; 16 - Unicode      */
+
+/*
+ * These are the functions you'll usually want to call
+ * They take string arguments and return either hex or base-64 encoded strings
+ */
+function hex_md5(s){ return binl2hex(core_md5(str2binl(s), s.length * chrsz));}
+function b64_md5(s){ return binl2b64(core_md5(str2binl(s), s.length * chrsz));}
+function str_md5(s){ return binl2str(core_md5(str2binl(s), s.length * chrsz));}
+function hex_hmac_md5(key, data) { return binl2hex(core_hmac_md5(key, data)); }
+function b64_hmac_md5(key, data) { return binl2b64(core_hmac_md5(key, data)); }
+function str_hmac_md5(key, data) { return binl2str(core_hmac_md5(key, data)); }
+
+/*
+ * Perform a simple self-test to see if the VM is working
+ */
+function md5_vm_test()
+{
+  return hex_md5("abc") == "900150983cd24fb0d6963f7d28e17f72";
+}
+
+/*
+ * Calculate the MD5 of an array of little-endian words, and a bit length
+ */
+function core_md5(x, len)
+{
+  /* append padding */
+  x[len >> 5] |= 0x80 << ((len) % 32);
+  x[(((len + 64) >>> 9) << 4) + 14] = len;
+
+  var a =  1732584193;
+  var b = -271733879;
+  var c = -1732584194;
+  var d =  271733878;
+
+  for(var i = 0; i < x.length; i += 16)
+  {
+    var olda = a;
+    var oldb = b;
+    var oldc = c;
+    var oldd = d;
+
+    a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936);
+    d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586);
+    c = md5_ff(c, d, a, b, x[i+ 2], 17,  606105819);
+    b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330);
+    a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897);
+    d = md5_ff(d, a, b, c, x[i+ 5], 12,  1200080426);
+    c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341);
+    b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983);
+    a = md5_ff(a, b, c, d, x[i+ 8], 7 ,  1770035416);
+    d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417);
+    c = md5_ff(c, d, a, b, x[i+10], 17, -42063);
+    b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162);
+    a = md5_ff(a, b, c, d, x[i+12], 7 ,  1804603682);
+    d = md5_ff(d, a, b, c, x[i+13], 12, -40341101);
+    c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290);
+    b = md5_ff(b, c, d, a, x[i+15], 22,  1236535329);
+
+    a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510);
+    d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
+    c = md5_gg(c, d, a, b, x[i+11], 14,  643717713);
+    b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302);
+    a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691);
+    d = md5_gg(d, a, b, c, x[i+10], 9 ,  38016083);
+    c = md5_gg(c, d, a, b, x[i+15], 14, -660478335);
+    b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848);
+    a = md5_gg(a, b, c, d, x[i+ 9], 5 ,  568446438);
+    d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690);
+    c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961);
+    b = md5_gg(b, c, d, a, x[i+ 8], 20,  1163531501);
+    a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467);
+    d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784);
+    c = md5_gg(c, d, a, b, x[i+ 7], 14,  1735328473);
+    b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734);
+
+    a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558);
+    d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463);
+    c = md5_hh(c, d, a, b, x[i+11], 16,  1839030562);
+    b = md5_hh(b, c, d, a, x[i+14], 23, -35309556);
+    a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
+    d = md5_hh(d, a, b, c, x[i+ 4], 11,  1272893353);
+    c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632);
+    b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640);
+    a = md5_hh(a, b, c, d, x[i+13], 4 ,  681279174);
+    d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222);
+    c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979);
+    b = md5_hh(b, c, d, a, x[i+ 6], 23,  76029189);
+    a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487);
+    d = md5_hh(d, a, b, c, x[i+12], 11, -421815835);
+    c = md5_hh(c, d, a, b, x[i+15], 16,  530742520);
+    b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651);
+
+    a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844);
+    d = md5_ii(d, a, b, c, x[i+ 7], 10,  1126891415);
+    c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905);
+    b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055);
+    a = md5_ii(a, b, c, d, x[i+12], 6 ,  1700485571);
+    d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606);
+    c = md5_ii(c, d, a, b, x[i+10], 15, -1051523);
+    b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799);
+    a = md5_ii(a, b, c, d, x[i+ 8], 6 ,  1873313359);
+    d = md5_ii(d, a, b, c, x[i+15], 10, -30611744);
+    c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380);
+    b = md5_ii(b, c, d, a, x[i+13], 21,  1309151649);
+    a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070);
+    d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379);
+    c = md5_ii(c, d, a, b, x[i+ 2], 15,  718787259);
+    b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551);
+
+    a = safe_add(a, olda);
+    b = safe_add(b, oldb);
+    c = safe_add(c, oldc);
+    d = safe_add(d, oldd);
+  }
+  return Array(a, b, c, d);
+
+}
+
+/*
+ * These functions implement the four basic operations the algorithm uses.
+ */
+function md5_cmn(q, a, b, x, s, t)
+{
+  return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b);
+}
+function md5_ff(a, b, c, d, x, s, t)
+{
+  return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
+}
+function md5_gg(a, b, c, d, x, s, t)
+{
+  return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
+}
+function md5_hh(a, b, c, d, x, s, t)
+{
+  return md5_cmn(b ^ c ^ d, a, b, x, s, t);
+}
+function md5_ii(a, b, c, d, x, s, t)
+{
+  return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
+}
+
+/*
+ * Calculate the HMAC-MD5, of a key and some data
+ */
+function core_hmac_md5(key, data)
+{
+  var bkey = str2binl(key);
+  if(bkey.length > 16) bkey = core_md5(bkey, key.length * chrsz);
+
+  var ipad = Array(16), opad = Array(16);
+  for(var i = 0; i < 16; i++)
+  {
+    ipad[i] = bkey[i] ^ 0x36363636;
+    opad[i] = bkey[i] ^ 0x5C5C5C5C;
+  }
+
+  var hash = core_md5(ipad.concat(str2binl(data)), 512 + data.length * chrsz);
+  return core_md5(opad.concat(hash), 512 + 128);
+}
+
+/*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+function safe_add(x, y)
+{
+  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+  return (msw << 16) | (lsw & 0xFFFF);
+}
+
+/*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+function bit_rol(num, cnt)
+{
+  return (num << cnt) | (num >>> (32 - cnt));
+}
+
+/*
+ * Convert a string to an array of little-endian words
+ * If chrsz is ASCII, characters >255 have their hi-byte silently ignored.
+ */
+function str2binl(str)
+{
+  var bin = Array();
+  var mask = (1 << chrsz) - 1;
+  for(var i = 0; i < str.length * chrsz; i += chrsz)
+    bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (i%32);
+  return bin;
+}
+
+/*
+ * Convert an array of little-endian words to a string
+ */
+function binl2str(bin)
+{
+  var str = "";
+  var mask = (1 << chrsz) - 1;
+  for(var i = 0; i < bin.length * 32; i += chrsz)
+    str += String.fromCharCode((bin[i>>5] >>> (i % 32)) & mask);
+  return str;
+}
+
+/*
+ * Convert an array of little-endian words to a hex string.
+ */
+function binl2hex(binarray)
+{
+  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+  var str = "";
+  for(var i = 0; i < binarray.length * 4; i++)
+  {
+    str += hex_tab.charAt((binarray[i>>2] >> ((i%4)*8+4)) & 0xF) +
+           hex_tab.charAt((binarray[i>>2] >> ((i%4)*8  )) & 0xF);
+  }
+  return str;
+}
+
+/*
+ * Convert an array of little-endian words to a base-64 string
+ */
+function binl2b64(binarray)
+{
+  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  var str = "";
+  for(var i = 0; i < binarray.length * 4; i += 3)
+  {
+    var triplet = (((binarray[i   >> 2] >> 8 * ( i   %4)) & 0xFF) << 16)
+                | (((binarray[i+1 >> 2] >> 8 * ((i+1)%4)) & 0xFF) << 8 )
+                |  ((binarray[i+2 >> 2] >> 8 * ((i+2)%4)) & 0xFF);
+    for(var j = 0; j < 4; j++)
+    {
+      if(i * 8 + j * 6 > binarray.length * 32) str += b64pad;
+      else str += tab.charAt((triplet >> 6*(3-j)) & 0x3F);
+    }
+  }
+  return str;
+}

public/js/order.js

@@ -1267,6 +1267,114 @@
                     $('.layui-layer-content').css('overflow', 'visible');
                 })
 
+                // 自营申请收款 --- 2020.4.21
+                $('.selfcheckpay').click(function() {
+                    var order_id = $('#order_id').val();
+                    var content = $('.apply-paid:hidden').html();
+
+                    layer.open({
+                        area: ['500px'],
+                        title:'申请收款信息',
+                        content: content,
+                        btn:['确认', '取消'],
+                        btn1: function() {
+                            var id        = $('.layui-layer-content').find('input[name=pay_id]').val();
+                            var pay_type  = $('.layui-layer-content').find('input[name=pay_type]:checked').val();
+                            var file_name = $('.layui-layer-content').find('input[name=file_name]').val();
+                            var remarks   = $('.layui-layer-content').find('textarea[name=remarks]').val();
+
+                            if (!pay_type) {
+                                layer.tips('请选择付款方式', $('.layui-layer-content').find('.chekck-pay-type'));
+                                return false;
+                            }
+
+                            if (!file_name) {
+                                layer.tips('请上传转账凭证', $('.layui-layer-content').find('.chekck-img-url'));
+                                return false;
+                            }
+
+                            $.ajax({
+                                url: '/api/ajaxApplyPaid',
+                                data: {id: id, order_id: order_id, pay_type: pay_type, file_name: file_name, remarks: remarks},
+                                type:'post',
+                                dataType: 'json',
+                                success:function(resp){
+                                    if(resp.errcode == 0){
+                                        layer.msg(resp.errmsg || '操作成功');
+                                        setTimeout(function(){
+                                            location.reload();
+                                        }, 1000);
+                                        return false;
+                                    } else {
+                                        layer.alert(resp.errmsg || '网络异常');
+                                    }
+                                },
+                                error:function(){
+                                    layer.alert('网络异常');
+                                }
+                            });
+                        },
+                        btn2: function(index) {
+                            layer.close(index)
+                        }
+                    })
+                })
+
+                // 申请收款 --- 转账凭证图片上传
+                $('body').delegate('#preview', 'click', function(){
+                    var form = $('<form id="formUpload" enctype="multipart/form-data" style="display:none;">\
+                            <input type="file" name="upload" accept="image/jpeg, image/jpg, image/png, image/gif">\
+                        </form>');
+
+                    form.find('input').change(function(){
+                        // 上传图片到OSS
+                        var url = URL_api+'oss/upload';
+
+                        var formData = new FormData();
+                        formData.append('upload', this.files[0]);
+                        formData.append('source', 1); //内部调用接口
+
+                        var times = Math.round(new Date().getTime()/1000);
+                        formData.append('k1', times);
+                        formData.append('k2', hex_md5(hex_md5(String(times))+'fh6y5t4rr351d2c3bryi'));
+
+                        //上传图片
+                        $.ajax({
+                            url : url, 
+                            type : 'post',
+                            data : formData,
+                            dataType : 'json',
+                            cache : false,
+                            processData: false,
+                            contentType: false,
+                            xhrFields: {withCredentials: true},
+
+                            success : function(res){
+                                console.log(res)
+                                if(res.code == 200){
+                                    var data = res.data;
+
+                                    $('.layui-layer-content').find('#imgUrl').val(data[0]); // 将图片URL添加到隐藏域
+                                    $('.layui-layer-content').find('#imghead').attr('src', data[0]);
+
+                                    layer.tips(res.message, $('.layui-layer-content').find('.chekck-img-url'));
+                                }else{
+                                    var errMsg = res.err_msg ? res.err_msg : res.message;
+                                    layer.tips(errMsg, $('.layui-layer-content').find('.chekck-img-url'));
+                                }
+
+                                return false;
+                            },
+
+                            error : function(err){
+                                console.log(err);
+                            }
+                        }) 
+                    })
+
+                    form.find('input[type="file"]').trigger('click');   
+                })
+
 			},
 
             //物流信息

resources/views/detail/content.blade.php

@@ -893,7 +893,8 @@
                 @endif
 
                 @if ($order_info['status'] == 2 && in_array('self_check_pay', $userPerms)) 
-                    <a href="/self_check_pay/{{$order_info['order_id']}}?tags=self" class="btn btn-success">对账</a>
+                    <!-- <a href="/self_check_pay/{{$order_info['order_id']}}?tags=self" class="btn btn-success">对账</a> -->
+                    <a href="javascript:;" class="btn btn-success selfcheckpay">申请收款</a>
                 @endif
 
                 @if ($order_info['status'] == 4 && in_array('self_order_express', $userPerms))
@@ -1106,6 +1107,58 @@
     </form>
 </div>
 
+<!-- 申请收款 -->
+@if ($order_info['order_goods_type'] == 2 && in_array($order_info['status'], [2, 3]))
+<style>
+    .apply-paid{ display: none; }
+    .img-area{ float: left; width: 98px; height: 98px; border: 1px solid #d9d9d9; }
+    #preview{ float: left; margin-top: 62px; margin-left: 10px; }
+</style>
+<div class="apply-paid">
+    <form class="form-horizontal applyPaidForm">
+        <input type="hidden" name="pay_id" value="{{ $pay_extend_info ? $pay_extend_info['id'] : '' }}">
+
+        <div class="form-group">
+            <label class="col-sm-3 control-label"><i class="error">*</i> 付款方式</label>
+            <div class="col-sm-9 chekck-pay-type">
+                <label class="radio-inline">
+                    <input type="radio" name="pay_type" value="1" >线下微信
+                </label>
+                <label class="radio-inline">
+                    <input type="radio" name="pay_type" value="2" >线下支付宝
+                </label>
+                <label class="radio-inline">
+                    <input type="radio" name="pay_type" value="3" >交通银行
+                </label>
+            </div>
+        </div>
+        <div class="form-group chekck-img-url">
+            <label class="col-sm-3 control-label"><i class="error">*</i> 转账凭证</label>
+            <div class="col-sm-9">
+                <input type="hidden" name="file_name" id="imgUrl" value="{{ $pay_extend_info ? $pay_extend_info['file_name'] : '' }}">
+                <div class="img-area">
+                    <img alt="未加载成功" id="imghead"  src="{{ $pay_extend_info && $pay_extend_info['file_name'] ? $pay_extend_info['file_name'] : '/img/up_img.jpg' }}" class="firm-img" width="90" height="90">
+                </div>
+                <a class="btn btn-info" id="preview">点击上传</a>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">备注</label>
+            <div class="col-sm-9">
+                <textarea class="form-control" name="remarks" placeholder="请填写备注" style="width:280px;">{{ $pay_extend_info ? $pay_extend_info['remark'] : '' }}</textarea>
+            </div>
+        </div>
+    </form>
+</div>
+<script>
+    var pay_type = '{{ $pay_extend_info ? $pay_extend_info["type"] : "" }}';
+
+    if (pay_type) {
+        $('input:radio[value='+pay_type+']').attr('checked', true);
+    }
+</script>
+@endif
+
 <script>
     // 退款申请已处理或已拒绝，则隐藏退款按钮
     var refund = "{{!empty($order_refund_info) && ($order_refund_info['status'] == -1 || $order_refund_info['status'] == 10) ? false : true}}";
@@ -1117,7 +1170,7 @@
 
     var buyers = eval('{!! isset($buyers) ? json_encode($buyers) : '' !!}'); // 采购员集合
     var cc_sales = eval('{!! isset($cc_sales) ? json_encode($cc_sales) : '' !!}'); // 抄送人集合
-
+    var URL_api = '{{ Config("website.api_domain") }}';
     $.lie.order.details();
     $.lie.goods.add();
 
@@ -1185,41 +1238,4 @@
 
         $('.layui-layer-content').css('overflow', 'visible');
     })
-
-    //供使用者调用  
-function trim(s){  
-    return trimRight(trimLeft(s));  
-}  
-//去掉左边的空白  
-function trimLeft(s){  
-    if(s == null) {  
-        return "";  
-    }  
-    var whitespace = new String(" \t\n\r");  
-    var str = new String(s);  
-    if (whitespace.indexOf(str.charAt(0)) != -1) {  
-        var j=0, i = str.length;  
-        while (j < i && whitespace.indexOf(str.charAt(j)) != -1){  
-            j++;  
-        }  
-        str = str.substring(j, i);  
-    }  
-    return str;  
-}  
-
-//去掉右边的空白 www.2cto.com   
-function trimRight(s){  
-    if(s == null) return "";  
-    var whitespace = new String(" \t\n\r");  
-    var str = new String(s);  
-    if (whitespace.indexOf(str.charAt(str.length-1)) != -1){  
-        var i = str.length - 1;  
-        while (i >= 0 && whitespace.indexOf(str.charAt(i)) != -1){  
-           i--;  
-        }  
-        str = str.substring(0, i+1);  
-    }  
-    return str;  
-}
-
 </script>    
\ No newline at end of file

resources/views/orderlist/js.blade.php

@@ -8,6 +8,7 @@
 <script src="/js/inspinia.min.js"></script>
 
 <script src="/js/common.js"></script>
+<script src="/js/md5.js"></script>
 <script src="/js/layui/layui.js"></script>
 <script src="/js/order.js?v=<?= time() ?>"></script>
 <script src="/js/orderamount.js"></script>