From ee15dec5d91adbd1bdf15b26915b79751c17e481 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 22 三月 2022 09:39:17 +0800
Subject: [PATCH] 解决冲突
---
web/web/GwProduct.aspx | 479 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 479 insertions(+), 0 deletions(-)
diff --git a/web/web/GwProduct.aspx b/web/web/GwProduct.aspx
new file mode 100644
index 0000000..f68d735
--- /dev/null
+++ b/web/web/GwProduct.aspx
@@ -0,0 +1,479 @@
+锘�<%@ Page Language="C#" masterpagefile="~/Main.master" AutoEventWireup="true" CodeFile="GwProduct.aspx.cs" Inherits="_GwProduct" %>
+<asp:Content runat="server" ID="Content1" ContentPlaceHolderID="head">
+ <script type="text/javascript" language="javascript">
+ $(document).ready(function() {
+
+ //$(document).on("click", "[data-toggle='popover']", function () {
+ // $("[data-toggle='popover']").popover();
+ //})
+ var pagination = new Pagination();
+ pagination.setPageIndex(1);
+ pagination.setPageSize(50);
+
+ function loadPageList() {
+ var name = $("#Name").val();
+ var classes = $("#Classes").val();
+ $.ajax({
+ url: "GwProduct.ashx",
+ type: "POST",
+ data: { action: "list", name: name, classes: classes, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize() },
+ success: function(result) {
+ if (result.OK) {
+ $("#productTable tbody").html(result.Message.Table);
+ pagination.setRecordCount(result.Message.TotalCount);
+ $("#pagination").html(pagination.getHtml());
+ $("[data-toggle='popover']").popover();
+ } else {
+ mytek.alert(result.Message, result.OK);
+ }
+ }
+ });
+ }
+
+ $(document).on("click", ".action-modal-add", function() {
+ $("#productDialog .modal-title").text("娣诲姞浜у搧鎴栦骇鍝佸垎绫�");
+ $("#productDialog #action").val("add");
+ $("#productDialog #id").val("").attr("readonly", false);
+ $("#productDialog #name").val("");
+ $("#productDialog #icon").val("");
+ $("#productDialog #instructions").val("");
+ $("#productDialog #classes").val("");
+ $("#productDialog #parentId").val("");
+ //$("#productDialog #path").val("");
+ $("#productDialog #isDefault").val("");
+ $("#productDialog #isDnable").val(1);
+ $("#productDialog #sort").val(1);
+ $("#productDialog #routerType").val(1);
+ $("#productDialog #cmOpId").val("");
+ $("#productDialog #cuOpId").val("");
+ $("#productDialog #ctOpId").val("");
+ $("#productDialog #cmGroupid").val("");
+ $("#productDialog #cuGroupid").val("");
+ $("#productDialog #ctGroupid").val("");
+ $("#productDialog #cmExtParams").val("");
+ $("#productDialog #cuExtParams").val("");
+ $("#productDialog #ctExtParams").val("");
+ $("#productDialog #price").val(0.00);
+ $("#productDialog #givingNum").val(0);
+ $("#productDialog #remark").val("");
+
+ $("#productDialog").modal("show");
+ });
+
+ $("#productForm").ajaxForm({
+ success: function(r) {
+ if (r.OK) {
+ mytek.alert(r.Message, r.OK, function() {
+ $("#productDialog").modal("hide");
+ loadPageList();
+ });
+ } else {
+ mytek.alert(r.Message, r.OK);
+ }
+ }
+ });
+
+ //閫夋嫨鍥炬爣涓嬫媺妗�
+ $("#icon").on("change", function () {
+ console.log("icon:" + $(this).val());
+ if ($(this).val() != "") {
+ document.getElementById('showImg').src = "../static/images/productIcon/" + $(this).val();
+ }
+ });
+
+ $("#icon").trigger("change");
+
+ //閫夋嫨绫诲埆涓嬫媺妗嗭紝鎺у埗鐩稿叧杈撳叆椤规樉绀�
+ $("#classes").on("change", function () {
+ $(".classes-span").hide();
+ $(".classes-span-" + $(this).val()).show();
+ });
+
+ $("#classes").trigger("change");
+
+ //閫夋嫨璺敱绫诲瀷涓嬫媺妗嗭紝鎺у埗鐩稿叧杈撳叆椤规樉绀�
+ $("#RouterType").on("change", function () {
+ $(".router-type-span").hide();
+ $(".router-type-span-" + $(this).val()).show();
+ });
+
+ $("#RouterType").trigger("change");
+
+ $(document).on("click", ".action-modal-edit", function() {
+ var id = $(this).data("id");
+ $("#productDialog .modal-title").text("缂栬緫浜у搧鎴栦骇鍝佸垎绫�");
+ $("#productDialog #id").val(id).attr("readonly", true);
+
+ $.get("gwProduct.ashx", { "action": "get", id: id }, function(r) {
+ if (r.OK) {
+ $("#productDialog #action").val("update");
+ $("#productDialog #id").val(r.Message.Id).attr("readonly", false);
+ $("#productDialog #name").val(r.Message.Name);
+ $("#productDialog #classes").val(r.Message.Classes);
+ $("#productDialog #parentId").val(r.Message.ParentId);
+ //$("#productDialog #path").val(r.Message.Path);
+ $("#productDialog #isDnable").val(r.Message.IsDnable);
+ $("#productDialog #remark").val(r.Message.Remark);
+ //浜у搧
+ if (r.Message.Classes == 1) {
+ $("#productDialog #icon").val(r.Message.Icon);
+ $("#productDialog #instructions").val(r.Message.Instructions);
+ $("#productDialog #isDefault").val(r.Message.IsDefault);
+ $("#productDialog #sort").val(r.Message.Sort);
+ $("#productDialog #routerType").val(r.Message.RouterType);
+ $("#productDialog #price").val(r.Message.Price/1000); //鍏冩潯鎹㈢畻鍗曚綅涓哄帢鏉�
+ $("#productDialog #givingNum").val(r.Message.GivingNum);
+ if (r.Message.RouterType == 1) {
+ $("#productDialog #cmOpId").val(r.Message.CmOpId);
+ $("#productDialog #cuOpId").val(r.Message.CuOpId);
+ $("#productDialog #ctOpId").val(r.Message.CtOpId);
+ $("#productDialog #cmExtParams").val(r.Message.CmExtParams);
+ $("#productDialog #cuExtParams").val(r.Message.CuExtParams);
+ $("#productDialog #ctExtParams").val(r.Message.CtExtParams);
+ }
+ else {
+ $("#productDialog #cmGroupid").val(r.Message.CmGroupid);
+ $("#productDialog #cuGroupid").val(r.Message.CuGroupid);
+ $("#productDialog #ctGroupid").val(r.Message.CtGroupid);
+
+ }
+ }
+ //浜у搧鍒嗙被
+ else {
+
+ }
+
+ //璁剧疆绫诲埆
+ $("#classes").trigger("change");
+
+ //璁剧疆鍥炬爣
+ $("#icon").trigger("change");
+
+ $("#productDialog").modal("show");
+ }
+ else {
+ mytek.alert(r.Message, r.OK);
+ }
+ }, "json");
+ });
+
+ $(document).on("click", ".action-update-status", function () {
+ //data鐨勫睘鎬у弬鏁颁笉鑳藉惈鏈夊ぇ鍐欏瓧姣嶃��
+ var id = $(this).data("id");
+ var isEnable = $(this).data("is_enable");
+ $.post("gwProduct.ashx", { "action": "updateStatus", id: id, isEnable: isEnable }, function (r) {
+ mytek.alert(r.Message, r.OK, function () {
+ loadPageList();
+ });
+ });
+ });
+
+ $(document).on("click", ".action-delete", function() {
+ var id = $(this).data("id");
+ mytek.confirm("鏄惁闇�瑕佸垹闄よ淇℃伅锛�", "鏁版嵁鍒犻櫎鍚庡皢鏃犳硶鎭㈠锛岃璋ㄦ厧鎿嶄綔锛�", function(b) {
+ if (b) {
+ $.post("gwProduct.ashx", { "action": "delete", id: id }, function(result) {
+ mytek.alert(result.Message, result.OK, function() {
+ loadPageList();
+ });
+ },
+ "json");
+ }
+ });
+ });
+
+ $(document).on("click", ".action-btn-GwProductQuery", function() {
+ pagination.setPageIndex(1);
+ loadPageList();
+ });
+
+ $(document).on("click", "a[data-index]", function() {
+ pagination.setPageIndex($(this).attr("data-index"));
+ loadPageList();
+ });
+
+ //杩涘叆椤甸潰鏃舵墽琛屾煡璇�
+ loadPageList();
+
+ });
+ </script>
+ </asp:Content>
+<asp:Content runat="server" ID="Content2" ContentPlaceHolderID="title">浜у搧鎴栦骇鍝佸垎绫荤鐞�</asp:Content>
+<asp:Content ID="Content3" ContentPlaceHolderID="content" runat="Server">
+
+ <form name="queryForm" method="get" action="GwProduct.aspx" id="queryForm" class="form-inline"
+ id="gwProductTable">
+ <div class="m-b">
+ <div class="form-group">
+ <div class="input-group">
+ <span class="input-group-addon">浜у搧鍚嶇О</span>
+ <input type="text" name="Name" id="Name" class="form-control" />
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="input-group">
+ <select name="Classes" id="Classes" class="form-control">
+ <option value="-1">--璇烽�夋嫨绫诲埆--</option>
+ <option value="0">浜у搧鍒嗙被</option>
+ <option value="1">浜у搧</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="input-group">
+ <input type="button" value="鏌ヨ" class="btn btn-primary action-btn-GwProductQuery" />
+ <input class=" btn btn-warning action-modal-add" value="娣诲姞浜у搧" type="button" />
+ </div>
+ </div>
+ </div>
+ <table class="table table-striped table-bordered table-hover" id="productTable">
+ <thead>
+ <tr class="header">
+ <th>鍥炬爣
+ </th>
+ <th>鍚嶇О
+ </th>
+ <th>浣跨敤璇存槑
+ </th>
+ <th>绫诲埆
+ </th>
+ <th>閫氶亾
+ </th>
+ <th>鐖剁骇浜у搧鍒嗙被ID
+ </th>
+ <th>鏄惁榛樿
+ </th>
+ <th>鏄惁鍚敤
+ </th>
+ <th>鎺掑簭
+ </th>
+ <th>璧犻�佹潯鏁�
+ </th>
+ <th>鍙傝�冨崟浠�
+ </th>
+ <th>鍒涘缓鏃堕棿
+ </th>
+ <th class="text-right">鎿嶄綔
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
+ </form>
+ <div id="pagination">
+ </div>
+ <div class="footBar">
+
+ </div>
+
+ <div class="modal inmodal fade" id="productDialog" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-dialog modal-lg">
+ <form class="form-horizontal" id="productForm" name="productForm" method="post" action="gwProduct.ashx">
+ <div class="modal-content ">
+ <div class="modal-header">
+ <input type="hidden" class="form-control" name="action" id="action" value="update" />
+ <input type="hidden" class="form-control" name="id" id="id" value="" />
+ <button type="button" class="close" data-dismiss="modal">
+ <span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
+ <h4 class="modal-title">缂栬緫浜у搧璧勬枡</h4>
+ </div>
+ <div class="modal-body">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">
+ 绫诲埆</label>
+ <div class="col-sm-4 ">
+ <select id="classes" name="classes" class="form-control">
+ <option value="-1">--璇烽�夋嫨绫诲埆--</option>
+ <option value="0" >浜у搧鍒嗙被</option>
+ <option value="1" selected>浜у搧</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">
+ 鐖剁骇鍒嗙被ID</label>
+ <div class="col-sm-4 ">
+ <select name="parentId" id="parentId">
+ <%=GetProductClassOptions("0")%>
+ </select>
+ </div>
+ </div>
+ <div class="form-group classes-span classes-span-1 ">
+ <label class="col-sm-2 control-label">
+ 鍥炬爣</label>
+ <div class="col-sm-4 ">
+ <div><img id="showImg" name="showImg" src=""></div>
+ <select id="icon" name="icon" class="form-control" >
+ <option value="">--璇烽�夋嫨鍥炬爣--</option>
+ <option value="marketingSMS-32.png" >marketingSMS-32.png</option>
+ <option value="noticeSMS-32.png" >noticeSMS-32.png</option>
+ <option value="VerificationCodeSMS-32.png" >VerificationCodeSMS-32.png</option>
+ </select>
+ </div>
+ <span class="help-block m-b-none">绫诲埆涓轰骇鍝佹椂锛屼骇鍝佺殑鍥炬爣鏍囪瘑銆�
+ </span>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">
+ 鍚嶇О</label>
+ <div class="col-sm-4 ">
+ <input type="text" class="form-control" name="name" id="name" value="" />
+ </div>
+ </div>
+ <div class="form-group classes-span classes-span-1">
+ <label class="col-sm-2 control-label">
+ 浣跨敤璇存槑</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" name="instructions" id="instructions" value=""/>
+ </div>
+ </div>
+ <!--
+ <div class="form-group">
+ <label class="col-sm-2 control-label">
+ 浜у搧璺緞</label>
+ <div class="col-sm-4 ">
+ <input type="text" class="form-control" name="path" id="path" value="" />
+ </div>
+ </div>
+ -->
+ <div class="form-group classes-span classes-span-1">
+ <label class="col-sm-2 control-label">
+ 鎺ㄥ箍鏂瑰紡</label>
+ <div class="col-sm-4 ">
+ <select id="isDefault" name="isDefault" class="form-control">
+ <option value="0" >涓�у鎴�</option>
+ <option value="1" >绯荤粺榛樿</option>
+ </select>
+ </div>
+ <span class="help-block m-b-none">涓�у寲瀹㈡埛鏄寚鐗规畩鎺ㄩ�佺粰瀹㈡埛锛涚郴缁熼粯璁ゆ槸鎸囩郴缁熼粯璁ゅ彲鎺ㄩ�佹墍鏈夊鎴枫��</span>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">
+ 鏄惁鍚敤</label>
+ <div class="col-sm-4 ">
+ <select id="isEnable" name="isEnable" class="form-control">
+ <option value="0" >鍋滅敤</option>
+ <option value="1" selected>鍚敤</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group classes-span classes-span-1">
+ <label class="col-sm-2 control-label">
+ 鎺掑簭</label>
+ <div class="col-sm-4">
+ <div class="input-group">
+ <input type="text" class="form-control" name="sort" id="sort" value=""
+ maxlength="5" onkeyup="value=value.replace(/[^\d]/g,'')" onpaste="value=value.replace(/[^\d]/g,'')"
+ oncontextmenu="return false" />
+ </div>
+ </div>
+ </div>
+ <div class="form-group classes-span classes-span-1">
+ <label class="col-sm-2 control-label">
+ 閫氶亾璺敱</label>
+ <div class="col-sm-10">
+ <select name="RouterType" id="RouterType">
+ <option value="1" >鎸囧畾閫氶亾璺敱</option>
+ <option value="3" >閫氶亾缁勮矾鐢辨ā寮�</option>
+ </select>
+
+
+ <div class="router-type-span router-type-span-1">
+ <div style="padding: 5px">
+ 绉诲姩锛�<select name="cmOpId" id="cmOpId">
+ <%=GetOpOptions(0)%>
+ </select> 鎵╁睍鍙傛暟锛�<input type="text" name="cmExtParams" id="cmExtParams" maxlength="600"
+ value="" style="width: 50%;" placeholder="绉诲姩鎵╁睍鍙傛暟" />
+ </div>
+ <div style="padding: 5px">
+ 鑱旈�氾細<select name="cuOpId" id="cuOpId">
+ <%=GetOpOptions(0)%>
+ </select> 鎵╁睍鍙傛暟锛�<input type="text" name="cuExtParams" id="cuExtParams" maxlength="600"
+ value="" style="width: 50%;" placeholder="鑱旈�氭墿灞曞弬鏁�" />
+ </div>
+ <div style="padding: 5px">
+ 鐢典俊锛�<select name="ctOpId" id="ctOpId">
+ <%=GetOpOptions(0)%>
+ </select> 鎵╁睍鍙傛暟锛�<input type="text" name="ctExtParams" id="ctExtParams" maxlength="600"
+ value="" style="width: 50%;" placeholder="鐢典俊鎵╁睍鍙傛暟" />
+ </div>
+ <span class="help-block m-b-none">CMPP2.0,CMPP3.0鍗忚鏀寔鎵╁睍鍙傛暟鏈夛細SERVICEID(鏈嶅姟浠ｇ爜/涓氬姟浠ｇ爜(鏈�闀�10浣�)),FEECODE(璐圭敤浠ｇ爜(鏈�闀�6浣�)),FEETYPE(璐圭敤绫诲瀷),FEEUSERTYPE,FEETERMINALID(璁¤垂鍙风爜)
+ SGIP鏀寔鎵╁睍鍙傛暟鏈夛細SERVICETYPE(涓氬姟浠ｇ爜(鏈�闀�10浣�)),CHARGENUMBER(璁¤垂鍙风爜(鏈�闀�21浣�)),FEEVALUE(鏀惰垂鍊�(鏈�闀�6浣�)),GIVENVALUE,NODEID(鑺傜偣(鏈�闀�6浣�)),CONNTIMEOUT(杩炴帴瓒呮椂)
+ SMGP鏀寔鎵╁睍鍙傛暟鏈夛細SERVICEID(鏈嶅姟浠ｇ爜/涓氬姟浠ｇ爜(鏈�闀�10浣�)),FIXEDFEE(鍖呮湀璐�/灏侀《璐�(鏈�闀�6浣�)),FEECODE(璐圭敤浠ｇ爜/璧勮垂浠ｇ爜(鏈�澶�6浣�));</span>
+ </div>
+ <div class="router-type-span router-type-span-3">
+ <div style="padding: 5px">
+ <label class="control-label ">
+ 绉诲姩閫氶亾缁�</label>
+ <select name="cmGroupid" id="cmGroupid">
+
+ <%=GetOpGroupOptions(0) %>
+ </select></div>
+ <div style="padding: 5px">
+ <label class="control-label ">
+ 鑱旈�氶�氶亾缁�</label>
+ <select name="cuGroupid" id="cuGroupid">
+
+ <%=GetOpGroupOptions(0)%>
+ </select></div>
+ <div style="padding: 5px">
+ <label class="control-label">
+ 鐢典俊閫氶亾缁�</label>
+ <select name="ctGroupid" id="ctGroupid">
+ <%=GetOpGroupOptions(0)%>
+ </select></div>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group classes-span classes-span-1">
+ <label class="col-sm-2 control-label">
+ 鍙傝�冨崟浠�</label>
+ <div class="col-sm-4">
+ <div class="input-group">
+ <input type="text" class="form-control" name="price" id="price" value="" maxlength="5"
+ onkeyup="value=value.replace(/[^\d\.]/g,'')" onpaste="value=value.replace(/[^\d\.]/g,'')"
+ oncontextmenu="return false" /><span class="input-group-addon">鍏�/鏉� </span>
+ </div>
+ </div>
+ </div>
+ <div class="form-group classes-span classes-span-1">
+ <label class="col-sm-2 control-label">
+ 榛樿璧犻�佹潯鏁�</label>
+ <div class="col-sm-4">
+ <div class="input-group">
+ <input type="text" class="form-control" name="givingNum" id="givingNum" value="" maxlength="5"
+ onkeyup="value=value.replace(/[^\d\.]/g,'')" onpaste="value=value.replace(/[^\d\.]/g,'')"
+ oncontextmenu="return false" /><span class="input-group-addon">鏉� </span>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">
+ 澶囨敞</label>
+ <div class="col-sm-10 input-group m-b">
+ <input type="text" class="form-control" name="remark" id="remark" value="" />
+ </div>
+ </div>
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">
+ 鍙栨秷</button>
+ <button class="btn btn-primary">
+ 淇濆瓨</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+
+ <!-- footBar -->
+ <div id="mask" class="mask">
+ <span></span>
+ <img src="img/spinning-circles.svg" alt="杞藉叆涓�..." />
+ </div>
+ </asp:Content>
+
+
+
--
Gitblit v1.9.1