1.线下报名信息列表修改

2.线下报名信息驳回功能
3.拍卖商品管理列表增加出价记录入口

krock-api/krock-api-all/src/main/java/com/ydw/yunbuyer/api/pm/api/PmItemApi.java

@@ -610,5 +610,12 @@ public interface PmItemApi {
 	
 	@RequestMapping("/set_script")
 	public void set_script(@RequestParam("kid") String kid,@RequestParam("script_pm") String script_pm);
+
+	/**
+	 * 拍卖详情
+	 * @return
+	 */
+	@RequestMapping("/pm_record_info")
+	PagePackage pm_record_info(@RequestBody PagePackage pagePackage);
 	// ----------------------- 通用copy End ---------------------------------------
 }

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/PmUnLineController.java

@@ -1,5 +1,6 @@
 package com.ydw.yunbuyer.web.cp.business.pm;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ydw.yunbuyer.api.pm.api.PmItemApi;
 import com.ydw.yunbuyer.api.pm.entity.PmItem;
 import com.ydw.yunbuyer.common.utils.json.JsonTools;
@@ -72,4 +73,19 @@ public class PmUnLineController extends ProjBaseAction {
 		pmItemApi.set_script(pmItem.getKid(),pmItem.getScript_pm());
 	}
 
+	/**
+	 * 拍卖详情
+	 * @return
+	 */
+	@ApiOperation("拍卖详情")
+	@RequestMapping("/pm_record_info")
+	public String pm_record_info() {
+		JSONObject srh = super.pagePackage.getSrh();
+		if (srh.getString("pm_item_id") == "" || srh.getString("pm_item_id").length()<1){
+			return super.getPageResult(pagePackage);
+		}
+		PagePackage pagePackage = pmItemApi.pm_record_info(super.pagePackage);
+		pagePackage.getPage().setList(pagePackage.getData());
+		return super.getPageResult(pagePackage);
+	}
 }

krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line/list.html

@@ -94,7 +94,7 @@
                             },
                             {
                                 xtype : "textfield",
-                                fieldLabel : "标段名称",
+                                fieldLabel : "标的名称",
                                 name : "srh.item_name",
                                 labelAlign : 'right'
                             }
@@ -166,12 +166,27 @@
                         dataIndex : 'id_card',
                         flex : 1
                     },{
-                        text : '标段名称',
-                        tooltip : '标段名称',
+                        text : '标的名称',
+                        tooltip : '标的名称',
                         align : 'center',
                         dataIndex : 'item_name',
                         flex : 1
-                    },{
+                    },
+                    {
+                        text : '竞买号',
+                        tooltip : '竞买号',
+                        align : 'center',
+                        dataIndex : 'code',
+                        flex : 1,
+                        renderer : function(val){
+                            if(val == undefined || val == '' ){
+                                return '';
+                            }else{
+                                return val;
+                            }
+                        }
+                    },
+                    {
                         text : '支付凭证',
                         topTip : '支付凭证',
                         align : 'center',
@@ -217,12 +232,11 @@
                                 icon : jcapp.getIcon("user_tick.png"),
                                 handler : function(grid, rowIndex, colIndex) {
                                     var rec = grid.getStore().getAt(rowIndex);
-                                    myPass(rec.get('kid'));
-                                    /*if(rec.get('is_pay') == '2'){
+                                    if(rec.get('is_pay') == '2'){
                                         Ext.Msg.alert("提示", "已驳回不能确认支付!");
                                     }else{
                                         myPass(rec.get('kid'));
-                                    }*/
+                                    }
 
                                 }
                             },{
@@ -231,11 +245,13 @@
                                 icon : jcapp.getIcon("user_cross.png"),
                                 handler : function(grid, rowIndex, colIndex) {
                                     var rec = grid.getStore().getAt(rowIndex);
-                                    if(rec.get('is_pay') == '1'){
+                                    myReject(rec.get('kid'));
+
+                                    /*if(rec.get('is_pay') == '1'){
                                         Ext.Msg.alert("提示", "已支付不能驳回!");
                                     }else{
                                         myReject(rec.get('kid'));
-                                    }
+                                    }*/
                                 }
                             }
                         ]

krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line_item/list.html

@@ -32,6 +32,7 @@
                 listeners : {
                     'beforeload' : function(store, op, options) {
                         var params = searchFormPanel.getForm().getValues();
+                        console.log(params);
                         Ext.apply(dataStore.proxy.extraParams, params);
                     }
                 }
@@ -175,8 +176,6 @@
                                 }
                                 set_item(rec.get('kid'));
                             }
-                        },{
-                            xtype : ""
                         },
                         {
                             xtype : 'button',
@@ -196,8 +195,6 @@
                                 set_price(rec.get('kid'));
                             }
                         },{
-                            xtype : ""
-                        },{
                             xtype : 'button',
                             tooltip : '进入',
                             icon : jcapp.getIcon("bullet_go.png"),
@@ -205,6 +202,14 @@
                                 var rec = grid.getStore().getAt(rowIndex);
                                 window.open(getServer() +"/web-pm/pm/auctioSystemPC/index.html?kid="+rec.get('kid'));
                             }
+                        },{
+                            xtype : 'button',
+                            tooltip : '出价记录入口',
+                            icon : jcapp.getIcon("bullet_go.png"),
+                            handler : function(grid, rowIndex, colIndex) {
+                                var rec = grid.getStore().getAt(rowIndex);
+                                window.open(getServer() +"/web-cp-all/view_cp_pm/pm/un_line_item/pm_info.html?kid="+rec.get('kid'));
+                            }
                         }
                     ]
                 } ],

krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line_item/pm_info.html

@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>线下拍卖商品管理</title>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="https://yun.eqbidding.com/extjs/extjs6.0/classic/theme-crisp/resources/theme-crisp-all.css"></link>
+    <script src="https://yun.eqbidding.com/extjs/extjs6.0/ext-all.js"></script>
+    <script src="https://yun.eqbidding.com/extjs/extjs6.0/classic/locale/locale-zh_CN.js"></script>
+    <script type="text/javascript" src="/web-cp-all/resource/js/app.js"></script>
+    <script type="text/javascript" src="/web-cp-all/resource/js/jquery.js"></script>
+
+    <script type="text/javascript">
+        function getUrlParam(name) {
+            var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); // 构造一个含有目标参数的正则表达式对象
+            var r = window.location.search.substr(1).match(reg); // 匹配目标参数
+            if (r != null) {
+                return decodeURIComponent(r[2]);
+            }
+            return null; //返回参数值
+        }
+        var kid = getUrlParam('kid');
+        Ext.onReady(function() {
+            //初始化列表数据
+            var dataStore = Ext.create('Ext.data.Store', {
+                remoteSort : true,
+                autoLoad : true,
+                pageSize : 20,
+                sorters : {
+                    property : 'created',
+                    direction : 'DESC'
+                },
+                proxy : {
+                    type : "ajax",
+                    url : "/web-cp-all/cp/pm/item_unLine/pm_record_info",
+                    reader : {
+                        type : 'json',
+                        root : 'page.list',
+                        totalProperty : 'page.totalRow'
+                    }
+                },
+                listeners : {
+                    'beforeload' : function(store, op, options) {
+                        var params = {"srh.pm_item_id":""+kid};
+                        console.log(params);
+                        Ext.apply(dataStore.proxy.extraParams, params);
+                    }
+                }
+            }); //#dataStore
+
+            var listGridPanel = Ext.create('Ext.grid.Panel', {
+                title : '线下拍卖商品出价记录列表',
+                dockedItems : [ {
+                    xtype : 'pagingtoolbar',
+                    store : dataStore,
+                    dock : 'bottom',
+                    displayInfo : true
+                } ],
+                store : dataStore,
+                columns : [ {
+                    text : '公司名称',
+                    align : 'center',
+                    dataIndex : 'company_name',
+                    flex : 1
+                },{
+                    text : '用户名称',
+                    align : 'center',
+                    dataIndex : 'receive_name',
+                    flex : 1
+                },{
+                    text : '手机号',
+                    align : 'center',
+                    dataIndex : 'receive_mobile',
+                    flex : 1
+                },{
+                    text : '身份证号',
+                    align : 'center',
+                    dataIndex : 'id_card',
+                    flex : 1
+                },{
+                    text : '竞买号',
+                    align : 'center',
+                    dataIndex : 'code',
+                    flex : 1
+                },{
+                    text : '报价时间',
+                    align : 'center',
+                    dataIndex : 'created',
+                    flex : 1,
+                    renderer : function(val){
+                        if(val != ''){
+                            return Ext.Date.format(new Date(val), "Y-m-d H:i:s");
+                        }
+                    }
+                },{
+                    text : '报价（人民币元）',
+                    align : 'center',
+                    dataIndex : 'price_bidder',
+                    flex : 1
+                }],
+                viewConfig:{
+                    enableTextSelection:true
+                }
+            }); //#listGridPanel
+
+            listGridPanel.render(Ext.getBody());
+        });
+
+    </script>
+    <script type="text/javascript" src="edit.js"></script>
+    <script type="text/javascript" src="setitem.js"></script>
+</head>
+<body>
+</body>
+</html>

krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/verify/bdw_verify.html

@@ -1,237 +1,313 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>标的物审批</title>
-<meta charset="UTF-8">
-<link rel="stylesheet" href="https://yun.eqbidding.com/extjs/extjs6.0/classic/theme-crisp/resources/theme-crisp-all.css"></link>
-<script src="https://yun.eqbidding.com/extjs/extjs6.0/ext-all.js"></script>
-<script src="https://yun.eqbidding.com/extjs/extjs6.0/classic/locale/locale-zh_CN.js"></script>
-<script type="text/javascript" src="/web-cp-all/resource/js/app.js"></script>
-<script type="text/javascript" src="/web-cp-all/resource/js/time/time.js"></script>
-<script type="text/javascript" src="select.js"></script>
-<script type="text/javascript">
-	var verify_id;
+    <title>标的物审批</title>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="https://yun.eqbidding.com/extjs/extjs6.0/classic/theme-crisp/resources/theme-crisp-all.css"></link>
+    <script src="https://yun.eqbidding.com/extjs/extjs6.0/ext-all.js"></script>
+    <script src="https://yun.eqbidding.com/extjs/extjs6.0/classic/locale/locale-zh_CN.js"></script>
+    <script type="text/javascript" src="/web-cp-all/resource/js/app.js"></script>
+    <script type="text/javascript" src="/web-cp-all/resource/js/time/time.js"></script>
+    <script type="text/javascript" src="select.js"></script>
+    <script type="text/javascript">
+        var verify_id;
 
-	//初始化列表数据
-	dataStore = Ext.create('Ext.data.Store', {
-		remoteSort : true,
-		autoLoad : true,
-		pageSize : 20,
-		sorters : {
-			property : 'created',
-			direction : 'DESC'
-		},
-		proxy : {
-			type : "ajax",
-			url : "/web-cp-all/cp/pm/verify/list_data_pm",
-			reader : {
-				type : 'json',
-				root : 'list',
-				totalProperty : 'page.totalRow'
-			}
-		},
-		listeners : {
-			'beforeload' : function(store, op, options) {
-				var params = searchFormPanel.getForm().getValues();
-				Ext.apply(dataStore.proxy.extraParams, params);
-			}
-		}
-	}); //#dataStore 
-console.log(dataStore);
-	var searchFormPanel = Ext.create('Ext.form.Panel', {
-		frame : true,
-		title : "搜索条件",
-		style : {
-			marginBottom : '5px'
-		},
-		bodyStyle : {
-			padding : '10px'
-		},
-		buttonAlign : "center",
-		collapsible : true,
-		defaultType : "textfield",
-		items : [ {
-			xtype : "container",
-			layout : "hbox",
-			items : [ {
-				xtype : "textfield",
-				fieldLabel : "标的物名称",
-				name : "srh.notice_title"
-			}]
-		} ],
-		buttons : [ {
-			text : "搜索",
-			icon : jcapp.getIcon("magnifier.png"),
-			handler : function() {
-				dataStore.load({
-				//params:params()
-				});
-				dataStore.sync();
-			}
-		}, {
-			text : "重置",
-			icon : jcapp.getIcon("arrow_refresh.png"),
-			handler : function() {
-				this.up('form').getForm().reset();
-				dataStore.load({});
-				dataStore.sync();
-			}
-		} ]
-	}); //#searchFormPanel
-	
-	var listGridPanel = Ext.create('Ext.grid.Panel', {
-		title : '标的物列表',
-		dockedItems : [ {
-			xtype : 'pagingtoolbar',
-			store : dataStore, 
-			dock : 'bottom',
-			displayInfo : true
-		} ],
-		store : dataStore,
-		columns : [ 
-			{
-				text : 'kid',
-				name : 'kid',
-				hidden : true
-			},{
-				text : '标的物名称',
-				dataIndex : 'item_name',
-				flex : 1,
-				align : 'center'
-			},{
-				text : '标的物类型',
-				dataIndex : 'bid_type',
-				flex : 1,
-				align : 'center'
-			},{
-				text : '拍卖方式',
-				dataIndex : 'auction_way',
-				flex : 1,
-				align : 'center'
-			},{
-				text : '联系人',
-				dataIndex : 'auctioneer',
-				flex : 1,
-				align : 'center'
-			},{
-				text : '审批状态',
-				dataIndex : 'verify_status',
-				flex : 0.4,
-				align : 'center'
-			},{
-				text : '创建时间',
-				dataIndex : 'created',
-				flex : 1,
-				align : 'center'
-			},{
-				xtype : "actioncolumn",
-				align : "center",
-				text : '操作',
-				flex :	1,
-				items : [ 
-					{
-						xtype : 'button',
-						tooltip : '通过',
-						renderer : function(value, row, column, rowIndex, data, table){
-							return "审核通过";
-					    },
-						icon : jcapp.getIcon("user_tick.png"),
-						handler : function(grid, rowIndex, colIndex) {
-							var rec = grid.getStore().getAt(rowIndex);
-							myPass(rec.get('kid'),'审核通过');
-						}
-					},{
-						xtype:"container"
-					},{
-						xtype : 'button',
-						tooltip : '不通过',
-						icon : jcapp.getIcon("user_cross.png"),
-						handler : function(grid, rowIndex, colIndex) {
-							var rec = grid.getStore().getAt(rowIndex);
-							myNotPass(rec.get('kid'),'未通过');
-						}
-					},{
-						xtype:"container"
-					},{
-						xtype : 'button',
-						tooltip : '查看详情',
-						icon : jcapp.getIcon("user_magnify.png"),
-						handler : function(grid, rowIndex, colIndex) {
-							var rec = grid.getStore().getAt(rowIndex);
-							var kid = rec.get('kid');
-							details(kid);
-						}
-					},{
-						xtype:"container"
-					},{
-						xtype : 'button',
-						tooltip : '查看标的物上传图片',
-						icon : jcapp.getIcon("vcard.png"),
-						handler : function(grid, rowIndex, colIndex) {
-							var rec = grid.getStore().getAt(rowIndex);
-							var bid_file_id = rec.get('bid_file_id');
-							
-							if(bid_file_id == undefined){
-								Ext.Msg.alert("提示", "没有相关信息!");
-							}else{
-								var array = bid_file_id.split(",");
-								var nums = [];
-								for(var i = 0 ; i < array.length ;i++){
-									nums.push(parseInt(array[i]));
-									window.open(getServerHttp()+"/img_pm/img/"+array[i]);
-								}
-							}
-						}
-					}
-				]
-			} 
-		],
-		viewConfig:{
-			enableTextSelection:true
-		}
-	}); 
-		
-	Ext.onReady(function() {
-	 	searchFormPanel.render(Ext.getBody());
-		listGridPanel.render(Ext.getBody()); 
-	});
-	
-	function myPass(kid,verify_status){
-		Ext.Msg.confirm("提示:", "是否通过该标的物的审核?", function(e) {
-			if (e == "yes") {
-				Ext.Ajax.request({
-					url : "/web-cp-all/cp/pm/verify/pm_verify?kid=" + kid + "&verify_status=" + verify_status,
-					success : function(response) {
-						Ext.Msg.alert("操作","通过成功");
-						dataStore.load();
-					},
-					failure : function(response) {
-						Ext.Msg.alert("提示", "操作失败!");
-					}
-				});
-			}
-		});
-	}
-	
-	function myNotPass(kid,verify_status){
-		Ext.Msg.confirm("提示:", "是否拒绝该标的物的审核?", function(e) {
-			if (e == "yes") {
-				Ext.Ajax.request({
-					url : "/web-cp-all/cp/pm/verify/pm_verify?kid=" + kid + "&verify_status=" + verify_status,
-					success : function(response) {
-						Ext.Msg.alert("操作","拒绝成功");
-						dataStore.load();
-					},
-					failure : function(response) {
-						Ext.Msg.alert("提示", "操作失败!");
-					}
-				});
-			}
-		});
-	}
-	
-	
-</script>
+        //初始化列表数据
+        dataStore = Ext.create('Ext.data.Store', {
+            remoteSort : true,
+            autoLoad : true,
+            pageSize : 20,
+            sorters : {
+                property : 'created',
+                direction : 'DESC'
+            },
+            proxy : {
+                type : "ajax",
+                url : "/web-cp-all/cp/pm/verify/list_data_pm",
+                reader : {
+                    type : 'json',
+                    root : 'list',
+                    totalProperty : 'page.totalRow'
+                }
+            },
+            listeners : {
+                'beforeload' : function(store, op, options) {
+                    var params = searchFormPanel.getForm().getValues();
+                    Ext.apply(dataStore.proxy.extraParams, params);
+                }
+            }
+        }); //#dataStore
+        console.log(dataStore);
+        var searchFormPanel = Ext.create('Ext.form.Panel', {
+            frame : true,
+            title : "搜索条件",
+            style : {
+                marginBottom : '5px'
+            },
+            bodyStyle : {
+                padding : '10px'
+            },
+            buttonAlign : "center",
+            collapsible : true,
+            defaultType : "textfield",
+            items : [ {
+                xtype : "container",
+                layout : "hbox",
+                items : [ {
+                    xtype : "textfield",
+                    fieldLabel : "标的物名称",
+                    name : "srh.notice_title"
+                }]
+            } ],
+            buttons : [ {
+                text : "搜索",
+                icon : jcapp.getIcon("magnifier.png"),
+                handler : function() {
+                    dataStore.load({
+                        //params:params()
+                    });
+                    dataStore.sync();
+                }
+            }, {
+                text : "重置",
+                icon : jcapp.getIcon("arrow_refresh.png"),
+                handler : function() {
+                    this.up('form').getForm().reset();
+                    dataStore.load({});
+                    dataStore.sync();
+                }
+            } ]
+        }); //#searchFormPanel
+
+        var listGridPanel = Ext.create('Ext.grid.Panel', {
+            title : '标的物列表',
+            dockedItems : [ {
+                xtype : 'pagingtoolbar',
+                store : dataStore,
+                dock : 'bottom',
+                displayInfo : true
+            } ],
+            store : dataStore,
+            columns : [
+                {
+                    text : 'kid',
+                    name : 'kid',
+                    hidden : true
+                },{
+                    text : '标的物名称',
+                    dataIndex : 'item_name',
+                    flex : 1,
+                    align : 'center'
+                },{
+                    text : '标的物类型',
+                    dataIndex : 'bid_type',
+                    flex : 1,
+                    align : 'center'
+                },{
+                    text : '拍卖方式',
+                    dataIndex : 'auction_way',
+                    flex : 1,
+                    align : 'center'
+                },{
+                    text : '联系人',
+                    dataIndex : 'auctioneer',
+                    flex : 1,
+                    align : 'center'
+                },{
+                    text : '审批状态',
+                    dataIndex : 'verify_status',
+                    flex : 0.4,
+                    align : 'center'
+                },{
+                    text : '创建时间',
+                    dataIndex : 'created',
+                    flex : 1,
+                    align : 'center'
+                },{
+                    xtype : "actioncolumn",
+                    align : "center",
+                    text : '操作',
+                    flex :	1,
+                    items : [
+                        {
+                            xtype : 'button',
+                            tooltip : '通过',
+                            renderer : function(value, row, column, rowIndex, data, table){
+                                return "审核通过";
+                            },
+                            icon : jcapp.getIcon("user_tick.png"),
+                            handler : function(grid, rowIndex, colIndex) {
+                                var rec = grid.getStore().getAt(rowIndex);
+                                myPass(rec.get('kid'),'审核通过');
+                            }
+                        },{
+                            xtype:"container"
+                        },{
+                            xtype : 'button',
+                            tooltip : '不通过',
+                            icon : jcapp.getIcon("user_cross.png"),
+                            handler : function(grid, rowIndex, colIndex) {
+                                var rec = grid.getStore().getAt(rowIndex);
+                                myNotPass(rec.get('kid'),'未通过');
+                            }
+                        },{
+                            xtype:"container"
+                        },{
+                            xtype : 'button',
+                            tooltip : '查看详情',
+                            icon : jcapp.getIcon("user_magnify.png"),
+                            handler : function(grid, rowIndex, colIndex) {
+                                var rec = grid.getStore().getAt(rowIndex);
+                                var kid = rec.get('kid');
+                                details(kid);
+                            }
+                        },{
+                            xtype:"container"
+                        },{
+                            xtype : 'button',
+                            tooltip : '查看标的物上传图片',
+                            icon : jcapp.getIcon("vcard.png"),
+                            handler : function(grid, rowIndex, colIndex) {
+                                var rec = grid.getStore().getAt(rowIndex);
+                                var bid_file_id = rec.get('bid_file_id');
+
+                                if(bid_file_id == undefined){
+                                    Ext.Msg.alert("提示", "没有相关信息!");
+                                }else{
+                                    /*var array = bid_file_id.split(",");
+                                    var nums = [];
+                                    for(var i = 0 ; i < array.length ;i++){
+                                        nums.push(parseInt(array[i]));
+                                        window.open(getServerHttp()+"/img_pm/img/"+array[i]);
+                                    }*/
+                                    enlarge(bid_file_id);
+                                }
+                            }
+                        }
+                    ]
+                }
+            ],
+            viewConfig:{
+                enableTextSelection:true
+            }
+        });
+
+        Ext.onReady(function() {
+            searchFormPanel.render(Ext.getBody());
+            listGridPanel.render(Ext.getBody());
+        });
+
+        function myPass(kid,verify_status){
+            Ext.Msg.confirm("提示:", "是否通过该标的物的审核?", function(e) {
+                if (e == "yes") {
+                    Ext.Ajax.request({
+                        url : "/web-cp-all/cp/pm/verify/pm_verify?kid=" + kid + "&verify_status=" + verify_status,
+                        success : function(response) {
+                            Ext.Msg.alert("操作","通过成功");
+                            dataStore.load();
+                        },
+                        failure : function(response) {
+                            Ext.Msg.alert("提示", "操作失败!");
+                        }
+                    });
+                }
+            });
+        }
+
+        function myNotPass(kid,verify_status){
+            Ext.Msg.confirm("提示:", "是否拒绝该标的物的审核?", function(e) {
+                if (e == "yes") {
+                    Ext.Ajax.request({
+                        url : "/web-cp-all/cp/pm/verify/pm_verify?kid=" + kid + "&verify_status=" + verify_status,
+                        success : function(response) {
+                            Ext.Msg.alert("操作","拒绝成功");
+                            dataStore.load();
+                        },
+                        failure : function(response) {
+                            Ext.Msg.alert("提示", "操作失败!");
+                        }
+                    });
+                }
+            });
+        }
+
+        var imgIndex = 0;
+        var operationIndex = ''; //up 上一页 down 下一页
+        var imgSize = 0;
+        function enlarge(bid_file_id){
+            var array = bid_file_id.split(",");
+            var html = '<div style="width:100%;height:100%;">' ;
+            imgSize = array.length-1;
+            for(var i = 0 ; i < array.length ;i++){
+                var str = getServerHttp()+"/img_pm/img/"+array[i];
+                html += '<img id="videoSource'+i+'" style="width:100%;height:100%;display:none;"  src="'+str+'" />' ;
+            }
+            html += '<div>';
+            songPlayer.show();
+            Ext.getCmp("playerPanel").body.update(html);
+            showIndex();
+        }
+        function showIndex(){
+            if(operationIndex == 'down'){
+                if(imgIndex == imgSize){
+                    Ext.Msg.alert("操作","最后一张无法下一页");
+                    return;
+                }
+                document.getElementById("videoSource"+imgIndex).style.display="none";
+                imgIndex++;
+                console.log(imgIndex);
+                document.getElementById("videoSource"+imgIndex).style.display="block";
+            }else if(operationIndex == 'up'){
+                if(imgIndex == 0){
+                    Ext.Msg.alert("操作","第一张无法上一页");
+                    return;
+                }
+                document.getElementById("videoSource"+imgIndex).style.display="none";
+                imgIndex--;
+                console.log(imgIndex);
+                document.getElementById("videoSource"+imgIndex).style.display="block";
+            }else{
+                document.getElementById("videoSource"+imgIndex).style.display="block";
+            }
+        }
+        var playerForm=new Ext.Panel({
+            xtype : 'panel',
+            id : 'playerPanel',
+            width:600,
+            height:600,
+            html:""
+        })
+        var songPlayer = new Ext.Window({
+            layout : 'fit',
+            width:600,
+            height:600,
+            modal : true,
+            frame: true,
+            closable : false,
+            items : [playerForm]  ,
+            buttons: [{
+                text: '上一页',
+                handler: function() {
+                    operationIndex = 'up';
+                    showIndex();
+                }
+            },{
+                text: '下一页',
+                handler: function() {
+                    operationIndex = 'down';
+                    showIndex();
+                }
+            },{
+                text: '关闭',
+                handler: function() {
+                    Ext.getCmp('playerPanel').html ="";
+                    Ext.getCmp("playerPanel").body.update("");
+                    songPlayer.hide();
+                }
+            }]
+        });
+
+    </script>
 </head>
 <body>
 </body>

krock-pm/krock-api-pm/src/main/java/com/ydw/yunbuyer/api/pm/api/PmItemApi.java

@@ -605,6 +605,13 @@ public interface PmItemApi<T> {
 	 */
 	@RequestMapping("/get")
 	public PmItem get(@RequestParam("kid") String kid);
+
+	/**
+	 * 拍卖详情
+	 * @return
+	 */
+	@RequestMapping("/pm_record_info")
+	PagePackage pm_record_info(@RequestBody PagePackage pagePackage);
 	// ----------------------- 通用copy End ---------------------------------------
 
 

krock-pm/krock-service-pm/src/main/java/com/ydw/yunbuyer/serv_pm/service/PmItemServiceApiImpl.java

@@ -1009,4 +1009,20 @@ public class PmItemServiceApiImpl extends BaseApiImpl<PmItem> implements PmItemA
 	public PmItem get(String kid) {
 		return null;
 	}
+
+	@Override
+	public PagePackage pm_record_info(@RequestBody PagePackage pagePackage) {
+		JSONObject srh = pagePackage.getSrh();
+		Map<String, String> sort_param = pagePackage.getSort_param();
+		Page page = pagePackage.getPage();
+		String sql ="select t1.company_name,t1.receive_name,t1.receive_mobile,t1.id_card,t2.kid pm_item_submit_id,t.created,t.price_bidder,t2.code  "+
+				"from t_pm_item_submit_offer t  "+
+				"left join t_pm_offline_apply t1 on t1.pm_item_id = t.pm_item_id and t1.pm_user_id = t.pm_user_id  "+
+				"left join t_pm_item_submit t2 on t2.pm_item_id=t.pm_item_id and t2.pm_user_id = t.pm_user_id "+
+				"where t.pm_item_id = '"+srh.getString("pm_item_id")+"' ORDER BY t.created desc  ";;
+		NeParamList params = NeParamList.makeParams();
+		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
+		pagePackage.setData(list);
+		return pagePackage;
+	}
 }

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/action_api/IPmItemController.java

@@ -430,6 +430,11 @@ public class IPmItemController implements PmItemApi {
 	}
 
 	@Override
+	public PagePackage pm_record_info(@RequestBody PagePackage pagePackage) {
+		return pmItemService.pm_record_info(pagePackage);
+	}
+
+	@Override
 	public List<Map<String, Object>> list_slideshow() {
 		return null;
 	}

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller/api/PmController.java

@@ -6,11 +6,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ydw.yunbuyer.common.base.enums.TimeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.tmsps.ne4spring.page.PagePackage;
 import org.tmsps.ne4spring.utils.ChkUtil;
 
 import com.ydw.yunbuyer.api.user.entity.Persion;
@@ -108,6 +111,10 @@ public class PmController extends ProjBaseAction {
 		}
 	}
 
+	/**
+	 * 拍卖详情
+	 * @return
+	 */
 	@RequestMapping("/pm_record")
 	public String pm_record(String kid) {
 
@@ -129,6 +136,23 @@ public class PmController extends ProjBaseAction {
 		}
 	}
 
+	/**
+	 * 拍卖详情
+	 * @return
+	 */
+	@RequestMapping("/pm_record_info")
+	public String pm_record_info(String kid) {
+		if (ChkUtil.isNull(kid)) {
+			super.setTipMsg(false, "商品不存在", Tip.Type.error);
+			return result.toJSONString();
+		} else {
+			// 竞价记录
+			List<Map<String, Object>> list = wxPmService.pm_record_info(kid);
+			result.put("data", list);
+			return result.toJSONString();
+		}
+	}
+
 	@RequestMapping("/bid_start")
 	public String bid_start(String kid) {
 		t_pm_item item = pmItemService.get(kid);

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/BiddingPayController.java

@@ -1,16 +1,5 @@
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
 
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSONObject;
 import com.ydw.yunbuyer.common.utils.ChkTools;
 import com.ydw.yunbuyer.web.pm.base.ProjBaseAction;
@@ -19,6 +8,15 @@ import com.ydw.yunbuyer.web.pm.entity.t_pm_item_submit;
 import com.ydw.yunbuyer.web.pm.entity.t_pm_item_submit_offer;
 import com.ydw.yunbuyer.web.pm.service.PmItemService;
 import com.ydw.yunbuyer.web.pm.web.SessionPersionService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/dao/PmItemDao.java

@@ -483,5 +483,6 @@ public interface PmItemDao extends BaseDao<t_pm_item>{
 	 * @return
 	 */
 	public PagePackage list_offline_data(@RequestBody PagePackage pagePackage);
-	
+
+    PagePackage pm_record_info(@RequestBody PagePackage pagePackage);
 }

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/dao/WxPmDao.java

@@ -9,6 +9,7 @@ import com.ydw.yunbuyer.web.pm.entity.t_pay_no;
 import com.ydw.yunbuyer.web.pm.entity.t_pm_item;
 import com.ydw.yunbuyer.web.pm.entity.t_pm_item_submit;
 import com.ydw.yunbuyer.web.pm.entity.user.t_receive_address;
+import org.tmsps.ne4spring.page.PagePackage;
 
 /**
  * 小程序商品接口
@@ -182,4 +183,6 @@ public interface WxPmDao {
 	 * @return
 	 */
 	public List<Map<String, Object>> list_bank();
+
+	List<Map<String, Object>> pm_record_info(String kid);
 }

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/PmItemDaoImpl.java

@@ -93,6 +93,22 @@ public class PmItemDaoImpl extends BaseDaoImpl<t_pm_item> implements PmItemDao {
 	}
 
 	@Override
+	public PagePackage pm_record_info(@RequestBody PagePackage pagePackage) {
+		JSONObject srh = pagePackage.getSrh();
+		Map<String, String> sort_param = pagePackage.getSort_param();
+		Page page = pagePackage.getPage();
+		String sql ="select t1.company_name,t1.receive_name,t1.receive_mobile,t1.id_card,t2.kid pm_item_submit_id,t.created,t.price_bidder,t2.code  "+
+				"from t_pm_item_submit_offer t  "+
+				"left join t_pm_offline_apply t1 on t1.pm_item_id = t.pm_item_id and t1.pm_user_id = t.pm_user_id  "+
+				"left join t_pm_item_submit t2 on t2.pm_item_id=t.pm_item_id and t2.pm_user_id = t.pm_user_id "+
+				"where t.pm_item_id = '"+srh.getString("pm_item_id")+"' ORDER BY t.created desc  ";;
+		NeParamList params = NeParamList.makeParams();
+		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
+		pagePackage.setData(list);
+		return pagePackage;
+	}
+
+	@Override
 	public List<Map<String, Object>> list_item() {
 		String sql = "select t.*,t1.name from t_pm_item t left outer join t_shop t1 on t.shop_id=t1.kid "
 				+ " where t.status=0 order by t.time_opening limit 0,6 ";

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/WxPmDaoImpl.java

@@ -5,6 +5,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
@@ -16,6 +18,9 @@ import com.ydw.yunbuyer.web.pm.entity.t_pay_no;
 import com.ydw.yunbuyer.web.pm.entity.t_pm_item;
 import com.ydw.yunbuyer.web.pm.entity.t_pm_item_submit;
 import com.ydw.yunbuyer.web.pm.entity.user.t_receive_address;
+import org.tmsps.ne4spring.orm.param.NeParamList;
+import org.tmsps.ne4spring.page.Page;
+import org.tmsps.ne4spring.page.PagePackage;
 
 /**
  * 
@@ -241,4 +246,15 @@ public class WxPmDaoImpl implements WxPmDao {
 		return list;
 	}
 
+	@Override
+	public List<Map<String, Object>> pm_record_info(String kid) {
+		String sql ="select t1.company_name,t1.receive_name,t1.receive_mobile,t1.id_card,t2.kid pm_item_submit_id,t2.code,t.created,t.price_bidder  "+
+						"from t_pm_item_submit_offer t  "+
+						"left join t_pm_offline_apply t1 on t1.pm_item_id = t.pm_item_id and t1.pm_user_id = t.pm_user_id  "+
+						"left join t_pm_item_submit t2 on t2.pm_item_id=t.pm_item_id and t2.pm_user_id = t.pm_user_id "+
+						"where t.pm_item_id = '"+kid+"' ORDER BY t.created desc  ";;
+		List<Map<String, Object>> list = bs.findList(sql);
+		return list;
+	}
+
 }

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/WxSubmitDaoImpl.java

@@ -47,7 +47,10 @@ public class WxSubmitDaoImpl extends BaseDaoImpl<t_pm_offline_apply> implements
 		JSONObject srh = pagePackage.getSrh();
 		Map<String, String> sort_param = pagePackage.getSort_param();
 		Page page = pagePackage.getPage();
-		String sql = "select t.*,t1.item_name from t_pm_offline_apply t left join t_pm_item t1 on t.pm_item_id=t1.kid where t.status=0 and (t.is_pay like ? ) and t.pm_item_id is not null ";
+		String sql = "select t.*,t1.item_name,t2.kid pm_item_submit_id,t2.code from t_pm_offline_apply t " +
+				" left join t_pm_item t1 on t.pm_item_id=t1.kid " +
+				" left join t_pm_item_submit t2 on t.pm_item_id=t2.pm_item_id and t.pm_user_id = t2.pm_user_id and t.is_pay = 1 " +
+				" where t.status=0 and (t.is_pay like ? ) and t.pm_item_id is not null ";
 		NeParamList params = NeParamList.makeParams();
 		params.addLike(srh.getString("is_pay"));
 		if(StringUtils.isNotBlank(srh.getString("receive_name"))){

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/service/PmItemService.java

@@ -468,4 +468,5 @@ public interface PmItemService extends BaseService<t_pm_item> {
 
 	public void set_price(t_pm_item pm_item);
 
+    PagePackage pm_record_info(@RequestBody PagePackage pagePackage);
 }

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/service/WxPmService.java

@@ -7,6 +7,8 @@ import com.ydw.yunbuyer.web.pm.entity.user.t_receive_address;
 import com.ydw.yunbuyer.web.pm.entity.t_pay_no;
 import com.ydw.yunbuyer.web.pm.entity.t_pm_item;
 import com.ydw.yunbuyer.web.pm.entity.t_pm_item_submit;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.tmsps.ne4spring.page.PagePackage;
 
 /**
  * 小程序商品接口
@@ -176,4 +178,6 @@ public interface WxPmService {
 	 * @return
 	 */
 	public List<Map<String, Object>> list_bank();
+
+	List<Map<String, Object>> pm_record_info(String kid);
 }

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/serviceImpl/PmItemServiceImpl.java

@@ -349,6 +349,11 @@ public class PmItemServiceImpl extends BaseServiceImpl<t_pm_item> implements PmI
 		pmItemDao.set_price(pm_item);
 	}
 
+	@Override
+	public PagePackage pm_record_info(@RequestBody PagePackage pagePackage) {
+		return pmItemDao.pm_record_info(pagePackage);
+	}
+
 	public static void main(String[] args) {
 		List<String> list = new ArrayList<String>();
 		list.add("1");

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/serviceImpl/WxPmServiceImpl.java

@@ -1,8 +1,11 @@
 package com.ydw.yunbuyer.web.pm.serviceImpl;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Map;
+
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -13,6 +16,9 @@ import com.ydw.yunbuyer.web.pm.entity.t_pm_item;
 import com.ydw.yunbuyer.web.pm.entity.t_pm_item_submit;
 import com.ydw.yunbuyer.web.pm.entity.user.t_receive_address;
 import com.ydw.yunbuyer.web.pm.service.WxPmService;
+import org.tmsps.ne4spring.orm.param.NeParamList;
+import org.tmsps.ne4spring.page.Page;
+import org.tmsps.ne4spring.page.PagePackage;
 
 /**
  * 
@@ -129,4 +135,9 @@ public class WxPmServiceImpl implements WxPmService {
 		return wxPmDao.list_bank();
 	}
 
+	@Override
+	public List<Map<String, Object>> pm_record_info(String kid) {
+		return wxPmDao.pm_record_info(kid);
+	}
+
 }