合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen



查看合并请求 !46

@@ -54,9 +54,12 @@ class OrderDetail extends Backend
             {
             {
                 return $this->selectpage();
                 return $this->selectpage();
             }
             }
-            $where_store = [
-                'order_detail.store_id' => session('admin.store_id')
-            ];
+            $where_store = [];
+            if(!$this->auth->isSuperAdmin()) {
+                $where_store = [
+                    'order_detail.store_id' => session('admin.store_id')
+                ];
+            }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $total = $this->model
             $total = $this->model
                     ->with(['user','store'])
                     ->with(['user','store'])

@@ -117,7 +117,7 @@ class Member extends Frontend
             ];
             ];
             foreach ($list as $k=>$v) {
             foreach ($list as $k=>$v) {
                 $order[$k]['store_name'] = $store_model->where('id',$v['store_id'])->value('name');
                 $order[$k]['store_name'] = $store_model->where('id',$v['store_id'])->value('name');
-                $order[$k]['goods'] = $order_info_model->where('order_id',$v['id'])->select();
+                $order[$k]['goods'] = $order_info_model->where('order_detail_id',$v['id'])->select();
                 $order[$k]['operate'] = $this->get_operate($v['status']);
                 $order[$k]['operate'] = $this->get_operate($v['status']);
                 $order[$k]['status'] = $status[$v['status']];
                 $order[$k]['status'] = $status[$v['status']];
             }
             }

@@ -420,9 +420,11 @@
         var src = $(this).prev().attr('src');
         var src = $(this).prev().attr('src');
         var pos = $.inArray(src,img);
         var pos = $.inArray(src,img);
         img.splice(pos,1);
         img.splice(pos,1);
+        $('#refundBox').val('');
         console.log(img);
         console.log(img);
     });
     });
     // 提交退款申请
     // 提交退款申请
+    var is_allow = true;
     $('.refundBtn').click(function () {
     $('.refundBtn').click(function () {
         var content = $('.refundReasonTextarea').val();
         var content = $('.refundReasonTextarea').val();
         var images = img.join(',');
         var images = img.join(',');
@@ -437,23 +439,29 @@
             content: content,
             content: content,
             images: images
             images: images
         };
         };
-        $.ajax({
-            type: "post",
-            url: "{:url('refund_submit')}",
-            data: data,
-            dataType: "json",
-            success: function (e) {
-                if(e.code == 1) {
-                    toast(e.msg);
-                } else {
-                    toast(e.msg);
+        if(is_allow) {
+            is_allow = false;
+            $.ajax({
+                type: "post",
+                url: "{:url('refund_submit')}",
+                data: data,
+                dataType: "json",
+                success: function (e) {
+                    if(e.code == 1) {
+                        toast(e.msg);
+                    } else {
+                        toast(e.msg);
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    toast('网络错误，请重试');
+                },
+                complete: function () {
+                    is_allow = true;
                 }
                 }
-            },
-            error: function (e) {
-                console.log(e);
-                toast('网络错误，请重试');
-            }
-        });
+            });
+        }
     });
     });
     //提示弹层
     //提示弹层
     function toast(msg='玩命加载中~',time=2000, location = 0){
     function toast(msg='玩命加载中~',time=2000, location = 0){