update

GuangZuan/miniprogram/app.json

@@ -49,7 +49,11 @@
         "pages/msg/msgdetail/index",
         "pages/goodsdetail/index",
         "pages/cerserach/index",
-        "pages/jewelry/list/index"
+        "pages/jewelry/list/index",
+        "pages/inspection/prepayment/index",
+        "pages/inspection/payment/index",
+        "pages/bond/payment/index",
+        "pages/bond/prepayment/index"
       ]
     },
     {

GuangZuan/miniprogram/components/nav-bar/nav-bar.wxml

@@ -1,4 +1,4 @@
-<van-nav-bar custom-style="background-color: #E92020">
-  <van-icon wx:if="{{left}}" slot="left" name="arrow-left" size="25px" color="white"/>
-  <text slot="title" style="color: white;">{{title}}</text>
+<van-nav-bar custom-style="background-color: #fff">
+  <van-icon wx:if="{{left}}" slot="left" name="arrow-left" size="25px" color="#333"/>
+  <text slot="title" style="color: #333;">{{title}}</text>
 </van-nav-bar>

GuangZuan/miniprogram/config/index.ts

@@ -1,4 +1,7 @@
 export const appConfig = {
   version: '1.0.0',
-  apiUrl: 'http://218.17.158.45:23015/cfg?key=test_201'
+  apiUrl: 'http://218.17.158.45:23015/cfg?key=test_201',
+  aes_des_key: 'F7A72DE7D6264530F01BA49BC73EB873',
+  macKey: 'B0FB83E39A5EBFAABE471362A58393FF',
+  macIV: 'D951DBE037C82325'
 }

GuangZuan/miniprogram/config/proto/mtp.proto

@@ -1563,20 +1563,20 @@ message ErmcpSpotGoodsPriceRsp {
 message QHJAgreementConfigOperateReq {
 	optional MessageHead Header = 1; // MessageHead
 	optional uint32 operatetype = 2; // uint32 操作类型-1:新增 2:修改 3:停用 4:恢复 5:注销
-		optional uint64 agreementid = 3; // uint64 协议ID（操作类型为2,3,4,5时必填）
-		optional string agreementno = 4; // string 协议编号
-		optional string agreementname = 5; // string 协议名称
-		optional uint32 agreementtype = 6; // uint32 协议类型 - 1:注册 2:登录 3:交易
-		optional string agreementcontent = 7; // string 协议内容
-		optional uint32 operatesrc = 8; // uint32 操作来源 - 1:管理端 2:终端
-		optional uint64 operateid = 9; // uint64 操作人
+  optional uint64 agreementid = 3; // uint64 协议ID（操作类型为2,3,4,5时必填）
+  optional string agreementno = 4; // string 协议编号
+  optional string agreementname = 5; // string 协议名称
+  optional uint32 agreementtype = 6; // uint32 协议类型 - 1:注册 2:登录 3:交易
+  optional string agreementcontent = 7; // string 协议内容
+  optional uint32 operatesrc = 8; // uint32 操作来源 - 1:管理端 2:终端
+  optional uint64 operateid = 9; // uint64 操作人
 }
 // 协议操作响应 0 29 190
 message QHJAgreementConfigOperateRsp {
 	optional MessageHead Header = 1; // MessageHead 消息头
 	optional int32 RetCode = 2; // int32 返回码
 	optional string RetDesc = 3; // string 描述信息
-		optional uint64 agreementid = 4; // uint64 协议ID
+  optional uint64 agreementid = 4; // uint64 协议ID
 }
 
 // 持仓单挂牌请求 0 22 15
@@ -1659,7 +1659,7 @@ message HdWRDealOrderReq {
 	optional string DeliveryMonth = 18; // string 交收月
 	optional uint32 HasWr = 19; // uint32 是否有仓单-0:没有仓单 1:有仓单
 	optional uint32 IsFinancing = 20; // uint32 是否融资购买(买摘牌时有效)-0:否 1:是
-    optional uint64 ProductDetailID = 21; // uint64 金融机构产品组合ID(融资购买时有效)
+  optional uint64 ProductDetailID = 21; // uint64 金融机构产品组合ID(融资购买时有效)
 }
 // 持仓单摘牌应答 0 22 18
 message HdWRDealOrderRsp {
@@ -1692,15 +1692,15 @@ message DGFactoryItems {
 
 // 仓单出库申请 0 29 113
 message WROutApplyReq {
- optional MessageHead Header = 1; // MessageHead
- optional uint64 ClientSerialID = 2; // uint64 客户端唯一ID
- optional uint64 WRStandardID = 3; // uint64 仓单标准ID
- optional uint64 WarehouseID = 4; // uint64 仓库ID
- optional uint64 UserID = 5; // uint64 申请人ID
- optional uint64 AccountID = 6; // uint64 申请人账户ID
- optional string Mobile = 7; // string 申请人手机号
- optional string AppointmentDate = 8; // string 预约出库时间（格式：20200101）
- optional uint32 AppointmentModel = 9; // uint32 预约方式:1-物流,2-自送，3-自提
+  optional MessageHead Header = 1; // MessageHead
+  optional uint64 ClientSerialID = 2; // uint64 客户端唯一ID
+  optional uint64 WRStandardID = 3; // uint64 仓单标准ID
+  optional uint64 WarehouseID = 4; // uint64 仓库ID
+  optional uint64 UserID = 5; // uint64 申请人ID
+  optional uint64 AccountID = 6; // uint64 申请人账户ID
+  optional string Mobile = 7; // string 申请人手机号
+  optional string AppointmentDate = 8; // string 预约出库时间（格式：20200101）
+  optional uint32 AppointmentModel = 9; // uint32 预约方式:1-物流,2-自送，3-自提
   optional uint64 CountryID = 10; // uint64 国家
   optional uint64 ProvinceID = 11; // uint64 省
   optional uint64 DistrictID = 12; // uint64 区
@@ -1709,15 +1709,15 @@ message WROutApplyReq {
   optional string ContactName = 15; // string 收货人提货人
   optional string ContactNum = 16; // string 收货人提货人手机
   optional string AppointmentRemark = 17; // string 预约备注
- optional uint64 CreatorID = 18; // uint64 创建人ID
- repeated WROutInDetail WROutInDetails = 19; // WROutInDetail 仓单出库提单明细数据
+  optional uint64 CreatorID = 18; // uint64 创建人ID
+  repeated WROutInDetail WROutInDetails = 19; // WROutInDetail 仓单出库提单明细数据
 }
 // 仓单出库申请响应 0 29 114
 message WROutApplyRsp {
- optional MessageHead Header = 1; // MessageHead 消息头
- optional int32 RetCode = 2; // int32 返回码
- optional string RetDesc = 3; // string 描述信息
- optional uint64 ClientSerialID = 4; // uint64 客户端唯一ID
+  optional MessageHead Header = 1; // MessageHead 消息头
+  optional int32 RetCode = 2; // int32 返回码
+  optional string RetDesc = 3; // string 描述信息
+  optional uint64 ClientSerialID = 4; // uint64 客户端唯一ID
 }
 
 // 仓单出库提单明细数据 0 29 112
@@ -1730,30 +1730,30 @@ message WROutInDetail {
 
 // 挂牌撤单请求 0 22 4
 message WRListingCancelOrderReq {
- optional MessageHead Header = 1; // MessageHead
- optional uint32 UserID = 2; // uint32 用户ID
- optional uint64 AccountID = 3; // uint64 资金账号
- optional uint64 OldWRTradeOrderID = 4; // uint64 目标仓单贸易委托单ID
- optional uint32 OrderSrc = 5; // uint32 委托来源
- optional string ClientSerialNo = 6; // string 客户端流水号
- optional string ClientOrderTime = 7; // string 客户端委托时间
- optional uint32 ClientType = 8; // uint32 终端类型
- optional uint64 OperatorID = 9; // uint64 操作员账号ID
- optional uint32 BuyOrSell = 10; // uint32 买卖方向
- optional uint64 WRID = 11; // uint64 仓单ID,卖的时候填写
+  optional MessageHead Header = 1; // MessageHead
+  optional uint32 UserID = 2; // uint32 用户ID
+  optional uint64 AccountID = 3; // uint64 资金账号
+  optional uint64 OldWRTradeOrderID = 4; // uint64 目标仓单贸易委托单ID
+  optional uint32 OrderSrc = 5; // uint32 委托来源
+  optional string ClientSerialNo = 6; // string 客户端流水号
+  optional string ClientOrderTime = 7; // string 客户端委托时间
+  optional uint32 ClientType = 8; // uint32 终端类型
+  optional uint64 OperatorID = 9; // uint64 操作员账号ID
+  optional uint32 BuyOrSell = 10; // uint32 买卖方向
+  optional uint64 WRID = 11; // uint64 仓单ID,卖的时候填写
 }
 // 挂牌撤单应答 0 22 5
 message WRListingCancelOrderRsp {
- optional MessageHead Header = 1; // MessageHead 消息头
- optional int32 RetCode = 2; // int32 返回码
- optional string RetDesc = 3; // string 描述信息
- optional uint64 WRTradeCancelID = 4; // uint64 仓单贸易撤单号
- optional uint64 OldWRTradeOrderID = 5; // uint64 目标仓单贸易委托单ID
- optional uint32 UserID = 6; // uint32 用户ID
- optional uint64 AccountID = 7; // uint64 资金账号
- optional uint64 CancelQty = 8; // uint64 撤单数量
- optional string OrderTime = 9; // string 接受撤单的时间
- optional string ClientSerialNo = 10; // string 客户端流水号
+  optional MessageHead Header = 1; // MessageHead 消息头
+  optional int32 RetCode = 2; // int32 返回码
+  optional string RetDesc = 3; // string 描述信息
+  optional uint64 WRTradeCancelID = 4; // uint64 仓单贸易撤单号
+  optional uint64 OldWRTradeOrderID = 5; // uint64 目标仓单贸易委托单ID
+  optional uint32 UserID = 6; // uint32 用户ID
+  optional uint64 AccountID = 7; // uint64 资金账号
+  optional uint64 CancelQty = 8; // uint64 撤单数量
+  optional string OrderTime = 9; // string 接受撤单的时间
+  optional string ClientSerialNo = 10; // string 客户端流水号
 }
 // 违约申请请求 0 20 9
 message PerformanceContractedApplyReq {
@@ -1875,50 +1875,50 @@ message WRTradeFinanceBuyCancelRsp {
 }
 // 履约激活请求 0 20 21
 message PerformanceActivateReq {
- optional MessageHead Header = 1; // MessageHead
- optional uint64 PerformancePlanID = 2; // uint64 履约计划ID
- optional uint64 ApplyAccountID = 3; // uint64 发起方账号ID
+  optional MessageHead Header = 1; // MessageHead
+  optional uint64 PerformancePlanID = 2; // uint64 履约计划ID
+  optional uint64 ApplyAccountID = 3; // uint64 发起方账号ID
 }
 // 履约激活应答 0 20 22
 message PerformanceActivateRsp {
- optional MessageHead Header = 1; // MessageHead 消息头
- optional int32 RetCode = 2; // int32 返回码
- optional string RetDesc = 3; // string 描述信息
- optional uint64 PerformancePlanID = 4; // uint64 履约计划ID
+  optional MessageHead Header = 1; // MessageHead 消息头
+  optional int32 RetCode = 2; // int32 返回码
+  optional string RetDesc = 3; // string 描述信息
+  optional uint64 PerformancePlanID = 4; // uint64 履约计划ID
 }
 // 仓单出入库注销请求 0 29 110
 message WROutApplyCancelReq {
- optional MessageHead Header = 1; // MessageHead
- optional uint64 ClientSerialID = 2; // uint64 客户端唯一ID
- optional string ApplyID = 3; // string 申请ID
- optional uint32 Type = 4; // uint32 类型：1-入库预约注销，2-入库注册注销，3-出库预约注销,4-出库注销注销
+  optional MessageHead Header = 1; // MessageHead
+  optional uint64 ClientSerialID = 2; // uint64 客户端唯一ID
+  optional string ApplyID = 3; // string 申请ID
+  optional uint32 Type = 4; // uint32 类型：1-入库预约注销，2-入库注册注销，3-出库预约注销,4-出库注销注销
 }
 // 仓单出入库注销响应 0 29 111
 message WROutApplyCancelRsp {
- optional MessageHead Header = 1; // MessageHead 消息头
- optional int32 RetCode = 2; // int32 返回码
- optional string RetDesc = 3; // string 描述信息
- optional uint64 ClientSerialID = 4; // uint64 客户端唯一ID
+  optional MessageHead Header = 1; // MessageHead 消息头
+  optional int32 RetCode = 2; // int32 返回码
+  optional string RetDesc = 3; // string 描述信息
+  optional uint64 ClientSerialID = 4; // uint64 客户端唯一ID
 }
 // 仓单出库确认请求 0 29 195
 message WROutConfirmReq {
- optional MessageHead Header = 1; // MessageHead
- optional uint64 applyid = 2; // uint64 申请Id
+  optional MessageHead Header = 1; // MessageHead
+  optional uint64 applyid = 2; // uint64 申请Id
   optional uint32 operatesrc = 3; // uint32 操作来源 - 1:管理端 2:终端
   optional uint64 operateid = 4; // uint64 操作人
 }
 // 仓单出库确认响应 0 29 196
 message WROutConfirmRsp {
- optional MessageHead Header = 1; // MessageHead 消息头
- optional int32 RetCode = 2; // int32 返回码
- optional string RetDesc = 3; // string 描述信息
+  optional MessageHead Header = 1; // MessageHead 消息头
+  optional int32 RetCode = 2; // int32 返回码
+  optional string RetDesc = 3; // string 描述信息
   optional uint64 applyid = 4; // uint64 协议ID
 }
 
 // 仓单出库撤回请求 0 29 199
 message WROutCancelReq {
- optional MessageHead Header = 1; // MessageHead
- optional uint64 applyid = 2; // uint64 申请Id
+  optional MessageHead Header = 1; // MessageHead
+  optional uint64 applyid = 2; // uint64 申请Id
   optional uint32 operatesrc = 3; // uint32 操作来源 - 1:管理端 2:终端
   optional uint64 operateid = 4; // uint64 操作人
 }
@@ -1932,50 +1932,50 @@ message WROutCancelRsp {
 
 // 交割申报请求 0 6 1
 message DeliveryOrderReq {
-        optional MessageHead Header = 1; // MessageHead
-        optional string ClientSerialNo = 2; // string 客户端流水号
-        optional string ClientOrderTime = 3; // string 客户端委托时间
-        optional uint32 ClientType = 4; // uint32 终端类型
-        optional uint64 AccountID = 5; // uint64 交易账号
-        optional uint32 XGoodsID = 6; // uint32 主商品ID（交割合约）
-        optional uint32 PGoodsID = 7; // uint32 辅助商品ID（辅助合约）
-        optional uint32 P2GoodsID = 8; // uint32 辅助商品ID（辅助合约2）
-        optional uint32 DeliveryGoodsID = 9; // uint32 交割商品ID
-        optional uint64 XQty = 10; // uint64 交割合约数量
-        optional uint64 PQty = 11; // uint64 辅助合约数量
-        optional uint64 P2Qty = 12; // uint64 辅助合约2数量
-        optional uint64 DeliveryQty = 13; // uint64 交割商品仓单数量
-        optional uint32 OperateType = 14; // uint32 操作类型:
-        optional uint32 OrderSrc = 15; // uint32 单据来源
-        optional uint32 OperatorID = 16; // uint32 操作员账号ID
-        optional DeliveryOrderDetail DeliveryOrderDetail = 17; // DeliveryOrderDetail 关联仓单头寸
-        optional uint32 TakeMode = 18; // uint32 提货方式
-        optional string ReceiverAddress = 19; // string 提货地址
+  optional MessageHead Header = 1; // MessageHead
+  optional string ClientSerialNo = 2; // string 客户端流水号
+  optional string ClientOrderTime = 3; // string 客户端委托时间
+  optional uint32 ClientType = 4; // uint32 终端类型
+  optional uint64 AccountID = 5; // uint64 交易账号
+  optional uint32 XGoodsID = 6; // uint32 主商品ID（交割合约）
+  optional uint32 PGoodsID = 7; // uint32 辅助商品ID（辅助合约）
+  optional uint32 P2GoodsID = 8; // uint32 辅助商品ID（辅助合约2）
+  optional uint32 DeliveryGoodsID = 9; // uint32 交割商品ID
+  optional uint64 XQty = 10; // uint64 交割合约数量
+  optional uint64 PQty = 11; // uint64 辅助合约数量
+  optional uint64 P2Qty = 12; // uint64 辅助合约2数量
+  optional uint64 DeliveryQty = 13; // uint64 交割商品仓单数量
+  optional uint32 OperateType = 14; // uint32 操作类型:
+  optional uint32 OrderSrc = 15; // uint32 单据来源
+  optional uint32 OperatorID = 16; // uint32 操作员账号ID
+  optional DeliveryOrderDetail DeliveryOrderDetail = 17; // DeliveryOrderDetail 关联仓单头寸
+  optional uint32 TakeMode = 18; // uint32 提货方式
+  optional string ReceiverAddress = 19; // string 提货地址
 }
 // 交割申报应答 0 6 2
 message DeliveryOrderRsp {
-        optional MessageHead Header = 1; // MessageHead 消息头
-        optional int32 RetCode = 2; // int32 返回码
-        optional string RetDesc = 3; // string 描述信息
-        optional string ClientSerialNo = 4; // string 客户端流水号
-        repeated DeliveryOrderDetail DeliveryOrderDetails = 5; // DeliveryOrderDetail 一级生成的订单号
-        optional string OrderTime = 6; // string 接收委托交易的时间
+    optional MessageHead Header = 1; // MessageHead 消息头
+    optional int32 RetCode = 2; // int32 返回码
+    optional string RetDesc = 3; // string 描述信息
+    optional string ClientSerialNo = 4; // string 客户端流水号
+    repeated DeliveryOrderDetail DeliveryOrderDetails = 5; // DeliveryOrderDetail 一级生成的订单号
+    optional string OrderTime = 6; // string 接收委托交易的时间
 }
 
 // 交割申报单明细 0 6 4
 message DeliveryOrderDetail {
-     optional uint64 AccountID = 1; // uint64 对手方账号
-     optional uint64 Qty = 2; // uint64 点选数量
-     optional uint32 BrandID = 3; // uint32 品牌
-     optional uint32 QualityID = 4; // uint32 品质
-     optional uint32 StandardID = 5; // uint32 规格
-     optional uint32 WarehouseID = 6; // uint32 仓库
-     optional uint32 DeliveryMonthID = 7; // uint32 月份
-     optional string ReceiverAddress = 8; // string 提货地址
-     optional uint32 TakeMode = 9; // uint32 提货方式
-     optional uint64 LadingBillID = 10; // uint64 提单ID
-     optional uint64 SubNum = 11; // uint64 提单子单号
-     optional uint64 WRFactorTypeID = 12; // uint64 仓单要素类型ID
+  optional uint64 AccountID = 1; // uint64 对手方账号
+  optional uint64 Qty = 2; // uint64 点选数量
+  optional uint32 BrandID = 3; // uint32 品牌
+  optional uint32 QualityID = 4; // uint32 品质
+  optional uint32 StandardID = 5; // uint32 规格
+  optional uint32 WarehouseID = 6; // uint32 仓库
+  optional uint32 DeliveryMonthID = 7; // uint32 月份
+  optional string ReceiverAddress = 8; // string 提货地址
+  optional uint32 TakeMode = 9; // uint32 提货方式
+  optional uint64 LadingBillID = 10; // uint64 提单ID
+  optional uint64 SubNum = 11; // uint64 提单子单号
+  optional uint64 WRFactorTypeID = 12; // uint64 仓单要素类型ID
 }
 
 // 议价申请审核请求 0 29 59
@@ -2028,15 +2028,15 @@ message WrBargainBackRsp {
 message FriendOperateReq {
 	optional MessageHead Header = 1; // MessageHead
 	optional uint32 operatetype = 2; // uint32 操作类型-1:申请 2:审核通过 3：审核拒绝 4: 删除
-		optional uint64 friendapplyid = 3; // uint64 申请ID
-		optional uint64 userid = 4; // uint64 申请人用户ID
-		optional uint64 frienduserid = 5; // uint64 好友用户ID
-		optional uint32 applysrc = 6; // uint32 申请来源 - 1:管理端 2:终端
-		optional uint64 applicantid = 7; // uint64 申请人登录ID
-		optional string remark = 8; // string 备注
-		optional uint64 auditorid = 9; // uint64 审核人用户ID
-		optional uint32 auditsrc = 10; // uint32 审核来源 - 1:管理端 2:终端
-		optional string auditremark = 11; // string 审核备注
+  optional uint64 friendapplyid = 3; // uint64 申请ID
+  optional uint64 userid = 4; // uint64 申请人用户ID
+  optional uint64 frienduserid = 5; // uint64 好友用户ID
+  optional uint32 applysrc = 6; // uint32 申请来源 - 1:管理端 2:终端
+  optional uint64 applicantid = 7; // uint64 申请人登录ID
+  optional string remark = 8; // string 备注
+  optional uint64 auditorid = 9; // uint64 审核人用户ID
+  optional uint32 auditsrc = 10; // uint32 审核来源 - 1:管理端 2:终端
+  optional string auditremark = 11; // string 审核备注
 }
 // 好友操作响应 0 29 198
 message FriendOperateRsp {
@@ -2088,26 +2088,26 @@ message PerformancePlanTemplateRsp {
 }
 // 按单平仓请求 0 3 105
 message HolderCloseReq {
-        optional MessageHead Header = 1; // MessageHead
-        optional uint64 TradeID = 2; // uint64 持仓单号
-        optional string ClientSerialNo = 3; // string 客户端流水号
-        optional string ClientOrderTime = 4; // string 客户端委托时间
-        optional uint32 ClientType = 5; // uint32 终端类型
-        optional uint64 LoginID = 6; // uint64 登陆账号
-        optional uint64 AccountID = 7; // uint64 交易账号
-        optional uint32 GoodsID = 8; // uint32 商品ID
-        optional uint32 BuyOrSell = 9; // uint32 买卖方向
-        optional uint32 MarketID = 10; // uint32 市场ID
-        optional uint32 OrderSrc = 11; // uint32 单据来源
-        optional uint64 OperatorID = 12; // uint64 操作员账号ID
+  optional MessageHead Header = 1; // MessageHead
+  optional uint64 TradeID = 2; // uint64 持仓单号
+  optional string ClientSerialNo = 3; // string 客户端流水号
+  optional string ClientOrderTime = 4; // string 客户端委托时间
+  optional uint32 ClientType = 5; // uint32 终端类型
+  optional uint64 LoginID = 6; // uint64 登陆账号
+  optional uint64 AccountID = 7; // uint64 交易账号
+  optional uint32 GoodsID = 8; // uint32 商品ID
+  optional uint32 BuyOrSell = 9; // uint32 买卖方向
+  optional uint32 MarketID = 10; // uint32 市场ID
+  optional uint32 OrderSrc = 11; // uint32 单据来源
+  optional uint64 OperatorID = 12; // uint64 操作员账号ID
 }
 // 按单平仓应答 0 3 106
 message HolderCloseRsp {
-        optional MessageHead Header = 1; // MessageHead 消息头
-        optional int32 RetCode = 2; // int32 返回码
-        optional string RetDesc = 3; // string 描述信息
-        optional uint64 OrderID = 4; // uint64 一级生成的订单号
-        optional string OrderTime = 5; // string 接收委托交易的时间
+  optional MessageHead Header = 1; // MessageHead 消息头
+  optional int32 RetCode = 2; // int32 返回码
+  optional string RetDesc = 3; // string 描述信息
+  optional uint64 OrderID = 4; // uint64 一级生成的订单号
+  optional string OrderTime = 5; // string 接收委托交易的时间
 }
 
 // 交易委托请求 0 3 31
@@ -2172,17 +2172,17 @@ message CJJCMemberOperateRsp {
 // 保税服务会员操作请求
 message BSFWMemberOperateReq {
 	optional MessageHead Header = 1;
-		optional uint32 UserID = 2; // 用户ID,必填
-		optional uint64 OperateID = 3; // 操作人ID,必填，LoginAccount的LoginID
-		optional string OperateAccount = 4; // 操作人账户，LoginAccount的LoginCode,LoginCode为空则填LoginID,必
-		optional uint64 OrderID = 5; // 单据ID,必填
-		optional uint32 OperateType = 6; // 操作类型,必填,1:上传发货单2：上传盖章单据3：确认预付款
-		repeated FileDetail FileDetails = 7; // 文件列表
-		optional string Remark = 8; // 备注
-		optional uint32 GZBSDeliveryType = 9; // 收货方式，OperateType=1:上传发货单时必填，枚举“GZBSDeliveryType”
-		optional string OtherLogistics = 10; // 指定其它物流，OperateType=1:上传发货单时填写
-    optional uint32 ClientType = 11; // 终端类型
-    optional string ClientSerialNo = 12; // 客户端流水号
+  optional uint32 UserID = 2; // 用户ID,必填
+  optional uint64 OperateID = 3; // 操作人ID,必填，LoginAccount的LoginID
+  optional string OperateAccount = 4; // 操作人账户，LoginAccount的LoginCode,LoginCode为空则填LoginID,必
+  optional uint64 OrderID = 5; // 单据ID,必填
+  optional uint32 OperateType = 6; // 操作类型,必填,1:上传发货单2：上传盖章单据3：确认预付款
+  repeated FileDetail FileDetails = 7; // 文件列表
+  optional string Remark = 8; // 备注
+  optional uint32 GZBSDeliveryType = 9; // 收货方式，OperateType=1:上传发货单时必填，枚举“GZBSDeliveryType”
+  optional string OtherLogistics = 10; // 指定其它物流，OperateType=1:上传发货单时填写
+  optional uint32 ClientType = 11; // 终端类型
+  optional string ClientSerialNo = 12; // 客户端流水号
 }
 // 保税服务会员操作响应
 message BSFWMemberOperateRsp {
@@ -2192,4 +2192,229 @@ message BSFWMemberOperateRsp {
   optional uint32 UserID = 4; // 用户ID
   optional uint64 AccountID = 5; // 资金账号
   optional string ClientSerialNo = 6; // 客户端流水号
+}
+// 买摘牌询价操作接口请求
+message ZSBuyOrderDestingNegPriceOperateReq {
+	optional MessageHead Header = 1;
+  optional uint32 UserID = 2; // 用户ID，必填
+  optional uint64 AccountID = 3; // 资金账号，必填
+  optional uint64 WRBargainID = 4; // 议价申请单ID，必填
+  optional string AuditRemark = 5; // 备注
+  optional uint32 OperateType = 6; // 操作类型，1：撤销2:拒绝
+  optional uint32 MarketID = 7; // 市场ID,必填
+  optional uint32 ClientType = 8; // 终端类型
+  optional uint32 OrderSrc = 9; // 委托来源
+  optional string ClientSerialNo = 10; // 客户端流水号
+}
+// 买摘牌询价操作接口应答
+message ZSBuyOrderDestingNegPriceOperateRsp {
+	optional MessageHead Header = 1; // 消息头
+	optional int32 RetCode = 2; // 返回码
+	optional string RetDesc = 3; // 描述信息
+  optional uint32 UserID = 4; // 用户ID
+  optional uint64 AccountID = 5; // 资金账号
+  optional uint64 WRBargainID = 6; // 卖委托单号
+  optional string ClientSerialNo = 7; // 客户端流水号
+}
+
+// 钻石卖摘牌申请接口请求
+message ZSSellOrderDestingApplyReq {
+	optional MessageHead Header = 1;
+  optional uint64 UserID = 2; // 用户ID，必填
+  optional uint64 AccountID = 3; // 资金账户ID，必填
+  optional uint64 BuyWRTradeOrderID = 4; // 买挂牌委托单ID,必填
+  optional uint64 WRStandardID = 5; // 现货商品ID，必填
+  optional uint64 WRFactorTypeID = 6; // 仓单要素类型ID，必填
+  optional double ApplyQty = 7; // 申请数量,必填，2位小数
+  optional double ApplyPrice = 8; // 申请价格，必填，2位小数
+  optional uint64 LadingBillID = 9; // 提单ID,必填
+  optional uint32 SubNum = 10; // 提单子单号,必填
+  optional string ApplyRemark = 11; // 备注
+  optional uint32 ClientType = 12; // 终端类型
+  optional string ClientSerialNo = 13; // 客户端流水号
+  optional uint64 MarketID = 14; // 市场ID,必填
+}
+// 钻石卖摘牌申请接口响应
+message ZSSellOrderDestingApplyRsp {
+	optional MessageHead Header = 1; // 消息头
+	optional int32 RetCode = 2; // 返回码
+	optional string RetDesc = 3; // 描述信息
+  optional uint32 UserID = 4; // 用户ID
+  optional uint64 AccountID = 5; // 资金账号
+  optional uint64 ApplyID = 6; // 仓单贸易委托单ID
+  optional string ClientSerialNo = 7; // 客户端流水号
+}
+// 买摘牌询价接口请求
+message ZSBuyOrderDestingNegPriceReq {
+	optional MessageHead Header = 1;
+  optional uint32 UserID = 2; // 用户ID，必填
+  optional uint64 AccountID = 3; // 资金账号，必填
+  optional uint64 RelatedOrderID = 4; // 卖委托单号，必填
+  optional double OrderQty = 5; // 议价数量，2位小数，必填
+  optional double ApplyPrice = 6; // 协议价格，2位小数，必填
+  optional uint32 OrderSrc = 7; // 委托来源
+  optional string ClientSerialNo = 8; // 客户端流水号
+  optional string ClientOrderTime = 9; // 客户端委托时间
+  optional uint32 ClientType = 10; // 终端类型
+  optional uint64 OperatorID = 11; // 操作员账号ID
+  optional uint32 MarketID = 12; // 市场ID,必填
+  optional string ApplyRemark = 13; // 申请备注
+}
+// 买摘牌询价接口应答
+message ZSBuyOrderDestingNegPriceRsp {
+	optional MessageHead Header = 1; // 消息头
+	optional int32 RetCode = 2; // 返回码
+	optional string RetDesc = 3; // 描述信息
+  optional uint32 UserID = 4; // 用户ID
+  optional uint64 AccountID = 5; // 资金账号
+  optional uint64 WRTradeOrderID = 6; // 摘牌委托单ID
+  optional uint64 WRBargainID = 7; // 议价申请单ID
+  optional string OrderTime = 8; // 接收委托交易的时间
+  optional string ClientSerialNo = 9; // 客户端流水号
+}
+
+// 钻石卖摘牌申请操作接口请求
+message ZSSellOrderDestingApplyOperateReq {
+	optional MessageHead Header = 1;
+  optional uint32 UserID = 2; // 用户ID，必填
+  optional uint64 AccountID = 3; // 资金账号
+  optional uint64 SellDelistingApplyID = 4; // 卖摘牌申请ID，必填
+  optional string AuditRemark = 5; // 备注
+  optional uint32 OperateType = 6; // 操作类型，1：撤销2:拒绝
+  optional uint32 MarketID = 7; // 市场ID,必填
+  optional uint32 ClientType = 8; // 终端类型
+  optional uint32 OrderSrc = 9; // 委托来源
+  optional string ClientSerialNo = 10; // 客户端流水号
+}
+// 钻石卖摘牌申请操作接口应答
+message ZSSellOrderDestingApplyOperateRsp {
+	optional MessageHead Header = 1; // 消息头
+	optional int32 RetCode = 2; // 返回码
+	optional string RetDesc = 3; // 描述信息
+  optional uint32 UserID = 4; // 用户ID
+  optional uint64 AccountID = 5; // 资金账号
+  optional uint64 SellDelistingApplyID = 6; // 卖摘牌申请ID
+  optional uint64 WRTradeOrderID = 7; // 仓单贸易委托单ID
+  optional double FreezeAmount = 8; // 冻结货款
+  optional string OrderTime = 9; // 接收委托交易的时间
+  optional string ClientSerialNo = 10; // 客户端流水号
+}
+
+// 钻石买摘牌接口请求
+message ZSBuyOrderDestingReq {
+	optional MessageHead Header = 1;
+  optional uint32 UserID = 2; // 用户ID，必填
+  optional uint64 AccountID = 3; // 资金账号，必填
+  optional uint64 RelatedWRTradeOrderID = 4; // 卖委托单号，必填
+  optional double OrderQty = 5; // 委托数量,必填2位小数，为WeigthAvg的整数倍
+  optional uint32 OrderSrc = 6; // 委托来源
+  optional string ClientSerialNo = 7; // 客户端流水号
+  optional string ClientOrderTime = 8; // 客户端委托时间
+  optional uint32 ClientType = 9; // 终端类型
+  optional uint64 OperatorID = 10; // 操作员账号ID
+  optional uint64 MarketID = 11; // 市场ID,必填
+}
+// 钻石买摘牌接口响应
+message ZSBuyOrderDestingRsp {
+	optional MessageHead Header = 1; // 消息头
+	optional int32 RetCode = 2; // 返回码
+	optional string RetDesc = 3; // 描述信息
+  optional uint32 UserID = 4; // 用户ID
+  optional uint64 AccountID = 5; // 资金账号
+  optional uint64 WRTradeOrderID = 6; // 仓单贸易委托单ID
+  optional uint64 RelatedWRTradeOrderID = 7; // 关联委托单号(摘牌委托关联挂牌委托单ID)
+  optional double FreezeAmount = 8; // 冻结货款
+  optional string OrderTime = 9; // 接收委托交易的时间
+  optional string ClientSerialNo = 10; // 客户端流水号
+}
+// 钻石出库申请接口请求
+message ReceiptZSOutApplyReq {
+	optional MessageHead Header = 1;
+  optional WRCommon Common = 2; // 
+  optional uint64 UserID = 3; // 用户ID，必填
+  optional uint64 AccountID = 4; // 用户帐户ID
+  optional uint64 WRStandardID = 5; // 现货品种ID
+  optional uint32 WarehouseID = 6; // 仓库ID
+  optional string Mobile = 7; // 申请人手机号
+  optional string AppointmentDate = 8; // 预约日期
+  optional int32 AppointmentModel = 9; // 预约方式:1-物流3-自提
+  optional uint64 CountryID = 10; // 国家
+  optional uint64 ProvinceID = 11; // 省
+  optional uint64 DistrictID = 12; // 区
+  optional uint64 CityID = 13; // 市
+  optional string Address = 14; // 详细地址
+  optional string ContactName = 15; // 收货人提货人
+  optional string ContactNum = 16; // 收货人提货人手机
+  optional string AppointmentRemark = 17; // 预约备注
+  optional uint64 LadingBillID = 18; // 提单ID，必填
+  optional uint32 SubNum = 19; // 提单子单号，必填
+  optional double Qty = 20; // 出库数量，两位小数，必填
+  optional string Remark = 21; // 备注
+  optional uint32 ApplyType = 22; // 申请类型1:会员申请2：平台申请
+  optional uint32 ClientType = 23; // 终端类型
+  optional string ClientTicket = 24; // 客户端流水号
+}
+// 钻石出库申请接口响应
+message ReceiptZSOutApplyRsp {
+	optional MessageHead Header = 1; // 消息头
+	optional int32 RetCode = 2; // 返回码
+	optional string RetDesc = 3; // 描述信息
+  optional WRCommon Common = 4; // 
+  optional uint64 ApplyID = 5; // 申请ID
+  optional string ClientTicket = 6; // 客户端流水号
+}
+// 钻石买挂牌接口请求
+message ZSBuyOrderListingReq {
+	optional MessageHead Header = 1;
+  optional uint32 UserID = 2; // 用户ID，必填
+  optional uint64 AccountID = 3; // 资金账号，必填
+  optional GZBuyOrderDetailExInfo GZ_BuyOrderDetailExInfo = 4; // 钻石买挂牌属性
+  optional int64 PerformanceTemplateID = 5; // 履约计划模板ID
+  optional uint32 MarketID = 6; // 市场ID,必填
+  optional uint32 OrderSrc = 7; // 委托来源
+  optional string ClientOrderTime = 8; // 客户端委托时间
+  optional uint32 ClientType = 9; // 终端类型
+  optional string ClientSerialNo = 10; // 客户端流水号
+}
+// 钻石买挂牌接口应答
+message ZSBuyOrderListingRsp {
+	optional MessageHead Header = 1; // 消息头
+	optional int32 RetCode = 2; // 返回码
+	optional string RetDesc = 3; // 描述信息
+  optional uint32 UserID = 4; // 用户ID
+  optional uint64 AccountID = 5; // 资金账号
+  optional uint64 WRTradeOrderID = 6; // 仓单贸易委托单ID
+  optional string OrderTime = 7; // 接收委托交易的时间
+  optional string ClientSerialNo = 8; // 客户端流水号
+}
+// 钻石卖挂牌接口请求
+message ZSSellOrderListingReq {
+	optional MessageHead Header = 1;
+  optional uint64 UserID = 2; // 用户ID，必填
+  optional uint64 AccountID = 3; // 资金账户ID，必填
+  optional uint64 WRStandardID = 4; // 现货商品ID，必填
+  optional uint64 WRFactorTypeID = 5; // 仓单要素类型ID，必填
+  optional double OrderQty = 6; // 挂牌数量,必填2位小数，为WeigthAvg的整数倍
+  optional uint64 LadingBillID = 7; // 提单ID,必填
+  optional uint32 SubNum = 8; // 提单子单号,必填
+  optional int64 PerformanceTemplateID = 9; // 履约计划模板ID
+  optional uint32 TimevalidType = 10; // 时间有效类型
+  optional string ValidTime = 11; // 有效期限
+  optional uint32 OrderSrc = 12; // 委托来源
+  optional string ClientSerialNo = 13; // 客户端流水号
+  optional string ClientOrderTime = 14; // 客户端委托时间
+  optional uint32 ClientType = 15; // 终端类型
+  optional uint64 MarketID = 16; // 市场ID,必填
+}
+// 钻石卖挂牌接口响应
+message ZSSellOrderListingRsp {
+	optional MessageHead Header = 1; // 消息头
+	optional int32 RetCode = 2; // 返回码
+	optional string RetDesc = 3; // 描述信息
+  optional uint32 UserID = 4; // 用户ID
+  optional uint64 AccountID = 5; // 资金账号
+  optional uint64 WRTradeOrderID = 6; // 仓单贸易委托单ID
+  optional uint64 FreezeQty = 7; // 冻结数量
+  optional string OrderTime = 8; // 接收委托交易的时间
+  optional string ClientSerialNo = 9; // 客户端流水号
 }

GuangZuan/miniprogram/constants/enum/echarts.ts

@@ -20,7 +20,4 @@ export enum EChartsSeriesType {
     VOL,
     KDJ,
     CCI,
-}
-
-/// 按钮背景色
-export const color_btn_bg = "226FD9"
+}

GuangZuan/miniprogram/constants/enum/index.ts

@@ -23,6 +23,32 @@ export enum ZSCategory {
   Fancy = 5,    // 单颗彩钻
 }
 
+/// 委托来源
+export enum EOrderSrc {
+  /// 客户端
+  ORDERSRC_CLIENT = 1,
+  /// 管理端
+  ORDERSRC_MANAGE = 2,
+  /// 风控服务
+  ORDERSRC_RISK = 3,
+  /// 交割服务
+  ORDERSRC_DELIVERY = 4,
+  /// 交易服务
+  ORDERSRC_TRADE = 5,
+  /// 交易日结
+  ORDERSRC_DAYEND = 6,
+  /// 商品强平
+  ORDERSRC_EXPIREFORCECLOSE = 7,
+  /// 管理端商品退市强平
+  ORDERSRC_MANAGEFORCECLOSE = 8,
+  /// 交易接口
+  ORDERSRC_TRADEINTERFACE = 9,
+  /// 交收服务商被动
+  ORDERSRC_ENTRUSACCEPT = 10,
+  /// 预埋触发
+  ORDERSRC_PREPOSORDER = 11,
+}
+
 /**
  * 货币类型
  */

GuangZuan/miniprogram/constants/enum/theme.ts

@@ -5,4 +5,7 @@ export enum AppTheme {
     default = 'light',
     dark = 'light',
     light = 'dark'
-}
+}
+
+/// 按钮背景色
+export const color_btn_bg = "#fff"

GuangZuan/miniprogram/mCircle/pages/contrast/index.wxml

@@ -1,9 +1,9 @@
 <!-- top-view -->
 <view class="top-view">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">钻石比对</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">钻石比对</text>
   </van-nav-bar>
 
   <!-- 图片区域 -->

GuangZuan/miniprogram/mHome/pages/bond/detail/index.ts

@@ -1,6 +1,6 @@
-import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { queryGZBSFWOrderDetail } from "../../../../services/api/trade/index"
 import { userid } from "../../../../services/utils"
+import { hideLoading, showLoading } from "../../../../utils/message/index"
 import { isnullstr } from "../../../../utils/util"
 
 Page({
@@ -39,44 +39,47 @@ Page({
   /// 查询保税服务单据明细
   queryGZBSFWOrderDetail () {
     /// loding.....
-    Toast.loading({message: '加载中...'})
-    /// 发送查询请求
-    queryGZBSFWOrderDetail({
-      data: {
-        /// 模糊搜索
-        userid: userid()
-      }, 
-      /// 加载成功
-      success: (res) => {
-        if (res.code != 200) {
-          /// 加载失败
-          Toast.success({ message: '加载失败...'});
-          return
-        }
-        /// 数据赋值
-        this.setData({ 
-          bonds: res.data,
-          /// 显示的值
-          values: res.data.map(obj => {
-            return {up: [obj.netweigthct.toString()+' | '+ 
-                         obj.netweigthgm.toString()+' | '+
-                         obj.grossweightgm.toString()+' | '+'--'+' | '+
-                         obj.perprice.toString()], 
-                    dwn: [isnullstr(obj.ordercontent)+' | '+ isnullstr(obj.remark)+' | '+ obj.colorinfo]}
+    showLoading(() => {
+      /// 发送查询请求
+      queryGZBSFWOrderDetail({
+        data: {
+          /// 模糊搜索
+          userid: userid()
+        }, 
+        /// 加载成功
+        success: (res) => {
+          if (res.code != 200) {
+            /// 加载失败
+            hideLoading(() => {}, '加载失败...', 'error')
+            return
+          }
+          hideLoading(() => {
+            /// 数据赋值
+            this.setData({ 
+              bonds: res.data,
+              isEmpty: res.data.length === 0,
+              /// 显示的值
+              values: res.data.map(obj => {
+                return {up: [obj.netweigthct.toString()+' | '+ 
+                            obj.netweigthgm.toString()+' | '+
+                            obj.grossweightgm.toString()+' | '+'--'+' | '+
+                            obj.perprice.toString()], 
+                        dwn: [isnullstr(obj.ordercontent)+' | '+ isnullstr(obj.remark)+' | '+ obj.colorinfo]}
+              })
+            })
           })
-        })
-      },
-      fail: (emsg) => {
-        /// 加载失败
-        Toast.fail({ message: '加载失败...'+emsg});
-      },
-      complete: () => {
-        /// 数据赋值
-        this.setData({  isEmpty: this.data.values.length == 0 })
-        /// 停止下拉刷新
-        wx.stopPullDownRefresh()
-      }
+        },
+        fail: (emsg) => {
+          /// hideLoading
+          hideLoading(() => {}, '加载失败，原因：'+emsg)
+        },
+        complete: () => {
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
+        }
+      })
     })
+    
   },
 
   /**

GuangZuan/miniprogram/mHome/pages/bond/detail/index.wxml

@@ -1,9 +1,9 @@
 <!-- top-view -->
 <view class="top-view">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">保税详情</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">保税详情</text>
   </van-nav-bar>
 
   <!-- 单据信息 --> 

GuangZuan/miniprogram/mHome/pages/bond/list/index.less

@@ -6,7 +6,7 @@
   .title-view {
     margin: 10px;
     background-color: #f0f0f0;
-    height: 80px;
+    height: 90px;
     border-radius: 10px;
     display: flex;
     align-items: center;

GuangZuan/miniprogram/mHome/pages/bond/list/index.ts

@@ -1,8 +1,8 @@
 import { FunCode } from "../../../../constants/enum/funcode"
-import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { sendMsgToMQ } from "../../../../services/api/common/index"
 import { queryGZBSFWOrder } from "../../../../services/api/trade/index"
 import { clientType, getExecutestatus, isEncrypted, loginCode, loginid, protoHeader, timetample, userid } from "../../../../services/utils"
+import { hideLoading, showLoading } from "../../../../utils/message/index"
 import { isnullstr } from "../../../../utils/util"
 
 Page({
@@ -41,8 +41,6 @@ Page({
     const ids = (<string> e.target.id).split(' ')
     let id = (<string> e.target.id).split(' ')[0]
     const index = <number> <unknown>ids[1]
-    /// 单号
-    const orderid = this.data.bonds[index].orderid
 
     switch (id) {
       case 'detail':     /// 详情
@@ -51,10 +49,14 @@ Page({
         })
         break;
       case 'confirmprepayment':  /// 确认预付款
-        this.doBSFWOperator(3, orderid)
+        wx.navigateTo({
+          url: '/mHome/pages/bond/prepayment/index?item='+JSON.stringify(this.data.bonds[index])
+        })
         break;
       case 'confirmpayment':     /// 确认付款
-        this.doBSFWOperator(4, orderid)
+        wx.navigateTo({
+          url: '/mHome/pages/bond/payment/index?item='+JSON.stringify(this.data.bonds[index])
+        })
         break;
       default:
         break;
@@ -76,48 +78,49 @@ Page({
    */
   queryGZBSFWOrder() {
     /// loding.....
-    Toast.loading({message: '加载中...'})
-    /// 发送查询
-    queryGZBSFWOrder({
-      data: {
-        /// 模糊搜索
-        userid: userid(),
-        executestatus: this.data.active+1
-      },
-      /// 加载成功
-      success: (res) => {
-        if (res.code != 200) {
-          /// 加载失败
-          Toast.success({ message: '加载失败...'});
-          return
-        }
-        /// 数据赋值
-        this.setData({ 
-          bonds: res.data,
-          /// 显示的值
-          values: res.data.map(obj => {
-            return {up: [obj.totalnetweigthct.toString()+' | '+ 
-                         obj.totalnetweightgm.toString()+' | '+
-                         obj.totalgrossweightgm.toString(),
-                        isnullstr(obj.orderno)], 
-                    mid:[obj.totalamount.toString(), 
-                         obj.priceper.toString(), 
-                         getExecutestatus(obj.executestatus)],
-                    dwn: [obj.contentrange.toString()+' | '+ '--',
-                          '']}
+    showLoading(() => {
+      /// 发送查询
+      queryGZBSFWOrder({
+        data: {
+          /// 模糊搜索
+          userid: userid(),
+          executestatus: this.data.active+1
+        },
+        /// 加载成功
+        success: (res) => {
+          if (res.code != 200) {
+            /// 加载失败
+            hideLoading(()=>{}, '加载失败...', 'error')
+            return
+          }
+          hideLoading(() => {
+            /// 数据赋值
+            this.setData({ 
+              bonds: res.data,
+              /// 显示的值
+              values: res.data.map(obj => {
+                return {up: [obj.totalnetweigthct.toString()+' | '+ 
+                            obj.totalnetweightgm.toString()+' | '+
+                            obj.totalgrossweightgm.toString(),
+                            isnullstr(obj.orderno)], 
+                        mid:[obj.totalamount.toString(), 
+                            obj.priceper.toString(), 
+                            getExecutestatus(obj.executestatus)],
+                        dwn: [obj.contentrange.toString()+' | '+ '--',
+                              '']}
+              }),
+              isEmpty: res.data.length === 0
+            })
           })
-        })
-      },
-      fail: (emsg) => {
-        /// 加载失败
-        Toast.fail({ message: '加载失败...'+emsg});
-      },
-      complete: () => {
-        /// 数据赋值
-        this.setData({  isEmpty: this.data.values.length == 0 })
-        /// 停止下拉刷新
-        wx.stopPullDownRefresh()
-      }
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, '加载失败...'+emsg, 'error')
+        },
+        complete: () => {
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
+        }
+      })
     })
   },
 
@@ -126,45 +129,43 @@ Page({
    */
   doBSFWOperator(operator: number, orderid: number) {
     /// loding.....
-    Toast.loading({ message: '操作请求中.....'})
-    /// 参数信息
-    const params = {
-      UserID: userid(),
-      OperateID: loginid(),
-      ClientType: clientType,
-      ClientSerialNo: timetample().toString,
-      OperateAccount: loginCode(),
-      OrderID: orderid,
-      OperateType: operator,
-      Header: protoHeader(FunCode.BSFWMemberOperateReq)
-    }
-
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        data: JSON.stringify(params),
-        funCodeReq: FunCode.BSFWMemberOperateReq,
-        funCodeRsp: FunCode.BSFWMemberOperateRsp,
-        isEncrypted: isEncrypted()
-      },
-      success: (res) => {
-        if (res.code != 0) {
-          Toast.fail({message: '操作申请失败， 原因：'+res.msg})
-          return
-        }
-        /// 操作成功
-        Toast.success('操作成功')
-        /// 重新获取数据
-        this.queryGZBSFWOrder()
-      },
-      fail: (emsg) => {
-        /// 操作失败
-        Toast.fail('操作失败，原因：'+emsg)
-      }, complete: () => {
-        /// hideLoading
-        Toast.clear()
+    showLoading(()=>{
+      /// 参数信息
+      const params = {
+        UserID: userid(),
+        OperateID: loginid(),
+        ClientType: clientType,
+        ClientSerialNo: timetample().toString,
+        OperateAccount: loginCode(),
+        OrderID: orderid,
+        OperateType: operator,
+        Header: protoHeader(FunCode.BSFWMemberOperateReq, 66201)
       }
-    })
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          data: JSON.stringify(params),
+          funCodeReq: FunCode.BSFWMemberOperateReq,
+          funCodeRsp: FunCode.BSFWMemberOperateRsp,
+          isEncrypted: isEncrypted()
+        },
+        success: (res) => {
+          if (res.code != 0) {
+            hideLoading(()=>{}, '操作申请失败， 原因：'+res.msg, 'error')
+            return
+          }
+          /// 操作成功
+          hideLoading(()=>{
+            /// 重新获取数据
+            this.queryGZBSFWOrder()
+          })
+        },
+        fail: (emsg) => {
+          /// 操作失败
+          hideLoading(()=>{}, '操作申请失败， 原因：'+emsg, 'error')
+        }
+      })
+    }, '操作请求中.....')
   },
 
   /**

GuangZuan/miniprogram/mHome/pages/bond/list/index.wxml

@@ -1,9 +1,9 @@
 <!-- top-view -->
 <view class="top-view">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">保税服务</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">保税服务</text>
   </van-nav-bar>
 
   <!-- tabs -->

GuangZuan/miniprogram/mHome/pages/bond/payment/index.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "enablePullDownRefresh": false
+}

GuangZuan/miniprogram/mHome/pages/bond/payment/index.less

@@ -0,0 +1,41 @@
+.container {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-content: center;
+  align-items: center;
+
+  .top-view {
+    position: sticky;
+    top: 0;
+    z-index: 999;
+    width: 100%;
+  }
+
+  &__content {
+    width: 100%;
+  }
+
+  &__notify {
+    width: 95%;
+    height: 30px;
+    color: #666;
+    font-size: 14px;
+    margin-top: 10px;
+  }
+
+  &__button-view {
+    border-radius: 10px;
+    width: 95%;
+    padding-top: 15px;
+    display: flex;
+    flex-direction: row;
+    align-content: center;
+    align-items: center;
+    justify-content: space-between;
+
+    van-button {
+      width: 45%;
+    }
+  }
+}

GuangZuan/miniprogram/mHome/pages/bond/payment/index.ts

@@ -0,0 +1,168 @@
+import { FunCode } from "../../../../constants/enum/funcode"
+import { sendMsgToMQ } from "../../../../services/api/common/index"
+import { queryFworderoperate } from "../../../../services/api/trade/index"
+import { userid, loginid, clientType, timetample, loginCode, protoHeader, isEncrypted, taAccount, accountid } from "../../../../services/utils"
+import { showModel, showLoading, hideLoading } from "../../../../utils/message/index"
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// 单据信息
+    order: <GuangZuan.GZBSFWOrder>({}),
+    /// 操作信息
+    operator: <GuangZuan.FworderoperateRsp>({}),
+    /// 资金账户信息
+    ta: <GuangZuan.TaAccount>({})
+  },
+
+  /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+  /// 查询保税服务单据操作
+  queryFworderoperate() {
+    /// loding...
+    showLoading(() => {
+      /// 发送查询请求
+      queryFworderoperate({
+        data: {
+          orderid: this.data.order.orderid.toString(),
+          status: this.data.order.gzbsstatus
+        },
+        success: (res) => {
+          /// hideLoading
+          hideLoading(() => { 
+            if (res.data.length != 0) {
+              this.setData({ operator: res.data[0] })
+            } 
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(() => {}, '加载失败，原因：'+emsg)
+        }
+      })
+    })
+  },
+
+   /**
+   * 保税服务操作
+   */
+  doBSFWOperator() {
+    /// showModel
+    showModel(()=> {
+      /// showLoading
+      showLoading(() => {
+        /// 参数信息
+        const params = {
+          UserID: userid(),
+          OperateID: loginid(),
+          ClientType: clientType,
+          ClientSerialNo: timetample().toString,
+          OperateAccount: loginCode(),
+          OrderID: this.data.order.orderid,
+          OperateType: 4,
+          Header: protoHeader(FunCode.BSFWMemberOperateReq, 66201)
+        }
+        /// 发送请求
+        sendMsgToMQ({
+          data: {
+            data: JSON.stringify(params),
+            funCodeReq: FunCode.BSFWMemberOperateReq,
+            funCodeRsp: FunCode.BSFWMemberOperateRsp,
+            isEncrypted: isEncrypted()
+          },
+          success: (res) => {
+            if (res.code != 0) {
+              hideLoading(() => {}, '请求失败，原因：'+res.msg)
+              return
+            }
+            hideLoading(() => {
+              /// 返回上层视图
+              wx.navigateBack()
+            }, '操作成功', 'success')
+          },
+          fail: (emsg) => {
+            /// 操作失败
+            hideLoading(() => {
+              /// 返回上层视图
+              wx.navigateBack()
+            }, '操作失败，原因：'+emsg, 'error')
+          }
+        })
+      },  '请求中.....')
+    }, '提示', '确认付款吗？', true)
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options: any) {
+    /// 数据解析
+    const obj = JSON.parse(options.item)
+    if (obj) {
+      this.setData({ 
+        order: obj,
+        /// 设置账户信息
+        ta: taAccount(accountid())
+      })
+    }
+    /// 查询保税服务单据操作
+    this.queryFworderoperate()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

GuangZuan/miniprogram/mHome/pages/bond/payment/index.wxml

@@ -0,0 +1,33 @@
+<view class="container">
+  <!-- top-view -->
+  <view class="top-view">
+    <!-- 导航栏 -->
+    <van-nav-bar custom-style="background-color: #fff">
+      <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+      <text slot="title" style="color: #333;">确认付款</text>
+    </van-nav-bar>
+  </view>
+
+  <view class="container__content" wx:if="{{ operator }}">
+    <van-cell-group>
+      <van-cell title="单据编号" value="{{ order.orderid }}"></van-cell>
+      <van-cell title="综合服务费" value="{{ operator.orderid }}"></van-cell>
+      <van-cell title="代缴物流保险费" value="{{ operator.orderid }}"></van-cell>
+      <van-cell title="税费保证金" value="{{ operator.orderid }}"></van-cell>
+      <van-cell title="汇款银行手续费" value="{{ operator.bankfee }}"></van-cell>
+      <van-cell title="其它费用" value="{{ operator.taxmargin }}"></van-cell>
+      <van-cell title="总共应收" value="{{ operator.totalfee }}"></van-cell>
+      <van-cell title="预收款" value="{{ operator.advanceamount }}"></van-cell>
+      <van-cell title="应收\应退" value="{{ operator.settleamount-operator.advanceamount }}"></van-cell>
+      <van-cell title="账户余额" value="{{ ta.currentbalance }}"></van-cell>
+    </van-cell-group>
+  </view>
+
+  <view class="container__notify">付款通知书(预付款).pdf</view>
+
+  <!-- 按钮 -->
+  <view class="container__button-view">
+    <van-button custom-class="confirm" id="confirm" round color="linear-gradient(to right, #4bb0ff, #666)" block bind:click="doCJJCOperator">确认</van-button>
+    <van-button custom-class="cancel" id="cancel" round color="linear-gradient(to right, #4bb0ff, #F7A657)" block bind:click="backToParent">取消</van-button>
+  </view>
+</view>

GuangZuan/miniprogram/mHome/pages/bond/prepayment/index.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "enablePullDownRefresh": false
+}

GuangZuan/miniprogram/mHome/pages/bond/prepayment/index.less

@@ -0,0 +1,41 @@
+.container {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-content: center;
+  align-items: center;
+
+  .top-view {
+    position: sticky;
+    top: 0;
+    z-index: 999;
+    width: 100%;
+  }
+
+  &__content {
+    width: 100%;
+  }
+
+  &__notify {
+    width: 95%;
+    height: 30px;
+    color: #666;
+    font-size: 14px;
+    margin-top: 10px;
+  }
+
+  &__button-view {
+    border-radius: 10px;
+    width: 95%;
+    padding-top: 15px;
+    display: flex;
+    flex-direction: row;
+    align-content: center;
+    align-items: center;
+    justify-content: space-between;
+
+    van-button {
+      width: 45%;
+    }
+  }
+}

GuangZuan/miniprogram/mHome/pages/bond/prepayment/index.ts

@@ -0,0 +1,168 @@
+import { FunCode } from "../../../../constants/enum/funcode"
+import { sendMsgToMQ } from "../../../../services/api/common/index"
+import { accountid, clientType, isEncrypted, loginCode, loginid, protoHeader, taAccount, timetample, userid } from "../../../../services/utils"
+import { hideLoading, showLoading, showModel } from "../../../../utils/message/index"
+import { queryFworderoperate } from "../../../../services/api/trade/index"
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// 单据信息
+    order: <GuangZuan.GZBSFWOrder>({}),
+    /// 操作信息
+    operator: <GuangZuan.FworderoperateRsp>({}),
+    /// 资金账户信息
+    ta: <GuangZuan.TaAccount>({})
+  },
+
+  /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+  /// 查询保税服务单据操作
+  queryFworderoperate() {
+    /// loding...
+    showLoading(() => {
+      /// 发送查询请求
+      queryFworderoperate({
+        data: {
+          orderid: this.data.order.orderid.toString(),
+          status: this.data.order.gzbsstatus
+        },
+        success: (res) => {
+          /// hideLoading
+          hideLoading(() => { 
+            if (res.data.length != 0) {
+              this.setData({ operator: res.data[0] })
+            } 
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(() => {}, '加载失败，原因：'+emsg)
+        }
+      })
+    })
+  },
+
+   /**
+   * 保税服务操作
+   */
+  doBSFWOperator() {
+    /// showModel
+    showModel(()=> {
+      /// showLoading
+      showLoading(() => {
+        /// 参数信息
+        const params = {
+          UserID: userid(),
+          OperateID: loginid(),
+          ClientType: clientType,
+          ClientSerialNo: timetample().toString,
+          OperateAccount: loginCode(),
+          OrderID: this.data.order.orderid,
+          OperateType: 3,
+          Header: protoHeader(FunCode.BSFWMemberOperateReq, 66201)
+        }
+        /// 发送请求
+        sendMsgToMQ({
+          data: {
+            data: JSON.stringify(params),
+            funCodeReq: FunCode.BSFWMemberOperateReq,
+            funCodeRsp: FunCode.BSFWMemberOperateRsp,
+            isEncrypted: isEncrypted()
+          },
+          success: (res) => {
+            if (res.code != 0) {
+              hideLoading(() => {}, '请求失败，原因：'+res.msg)
+              return
+            }
+            hideLoading(() => {
+              /// 返回上层视图
+              wx.navigateBack()
+            }, '操作成功', 'success')
+          },
+          fail: (emsg) => {
+            /// 操作失败
+            hideLoading(() => {
+              /// 返回上层视图
+              wx.navigateBack()
+            }, '操作失败，原因：'+emsg, 'error')
+          }
+        })
+      },  '请求中.....')
+    }, '提示', '确认要预付款吗？', true)
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options: any) {
+    /// 数据解析
+    const obj = JSON.parse(options.item)
+    if (obj) {
+      this.setData({ 
+        order: obj,
+        /// 设置账户信息
+        ta: taAccount(accountid()) 
+      })
+    }
+    /// 查询保税服务单据操作
+    this.queryFworderoperate()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

GuangZuan/miniprogram/mHome/pages/bond/prepayment/index.wxml

@@ -0,0 +1,31 @@
+<view class="container">
+  <!-- top-view -->
+  <view class="top-view">
+    <!-- 导航栏 -->
+    <van-nav-bar custom-style="background-color: #fff">
+      <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+      <text slot="title" style="color: #333;">确认预付款</text>
+    </van-nav-bar>
+  </view>
+
+  <view class="container__content" wx:if="{{ operator }}">
+    <van-cell-group>
+      <van-cell title="单据编号" value="{{ order.orderid }}"></van-cell>
+      <van-cell title="税费保证金" value="{{ operator.taxmargin }}"></van-cell>
+      <van-cell title="汇款银行手续费" value="{{ operator.bankfee }}"></van-cell>
+      <van-cell title="代缴物流保险费" value="{{ operator.logisticsfee }}"></van-cell>
+      <van-cell title="综合服务费" value="{{ operator.servicefee }}"></van-cell>
+      <van-cell title="其它费用" value="{{ operator.otherfee }}"></van-cell>
+      <van-cell title="总共" value="{{ operator.totalfee }}"></van-cell>
+      <van-cell title="账户可用余额" value="{{ ta.currentbalance }}"></van-cell>
+    </van-cell-group>
+  </view>
+
+  <view class="container__notify">付款通知书(预付款).pdf</view>
+
+  <!-- 按钮 -->
+  <view class="container__button-view">
+    <van-button custom-class="confirm" id="confirm" round color="linear-gradient(to right, #4bb0ff, #666)" block bind:click="doCJJCOperator">确认</van-button>
+    <van-button custom-class="cancel" id="cancel" round color="linear-gradient(to right, #4bb0ff, #F7A657)" block bind:click="backToParent">取消</van-button>
+  </view>
+</view>

GuangZuan/miniprogram/mHome/pages/calculator/index.ts

@@ -1,5 +1,5 @@
-import Toast from "../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { priceCalc } from "../../../services/api/orders/index"
+import { hideLoading, showLoading } from "../../../utils/message/index"
 
 // mHome/pages/calculator/index.ts
 Page({
@@ -62,30 +62,27 @@ Page({
   /// 钻石价格计算器
   priceCalc() {
     /// showLoding....
-    Toast.loading({ message: '计算中....'})
-    /// 进行查询
-    priceCalc({
-      data: {
-        zsshape: this.data.zsshape,
-        zscolor: 'D',
-        zsclarity: this.data.zsclarity,
-        weight: this.data.weight,
-        rate: this.data.dayrate,
-        discount: this.data.discount
-      },
-      /// 查询成功
-      success: (res) => {
-        console.log(res)
-      },
-      /// 查询失败
-      fail: (emsg) => {
-        Toast('请求失败，原因：' + emsg)
-      },
-      complete: () => {
-        /// 清除Toast
-        Toast.clear()
-      }
-    })
+    showLoading(()=>{
+      /// 进行查询
+      priceCalc({
+        data: {
+          zsshape: this.data.zsshape,
+          zscolor: 'D',
+          zsclarity: this.data.zsclarity,
+          weight: this.data.weight,
+          rate: this.data.dayrate,
+          discount: this.data.discount
+        },
+        /// 查询成功
+        success: () => {
+          hideLoading(()=>{})
+        },
+        /// 查询失败
+        fail: (emsg) => {
+          hideLoading(()=>{}, '计算失败，原因：' + emsg, 'error')
+        }
+      })
+    }, '计算中....')
   },
 
   /**
@@ -105,8 +102,7 @@ Page({
     const ids = (<string> e.target.id).split(' ')
     let id = (<string> e.target.id).split(' ')[0]
     const index = <number> <unknown>ids[1]
-    console.log(id, index)
-
+    
     switch (id) {
       case 'zsshape':   /// 形状
         this.setData({ 

GuangZuan/miniprogram/mHome/pages/calculator/index.wxml

@@ -1,7 +1,7 @@
 <!-- 导航栏 -->
-<van-nav-bar custom-style="background-color: #E92020">
-  <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-  <text slot="title" style="color: white;">钻石价格计算器</text>
+<van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">钻石价格计算器</text>
 </van-nav-bar>
 
 <view class="container" style="position: relative; height: {{windowHeight-safeBottom}}px;">

GuangZuan/miniprogram/mHome/pages/cerserach/index.ts

@@ -1,5 +1,6 @@
 import Toast from "../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { gzCertAddressConfig, gzCertAddressParam } from "../../../services/api/orders/index"
+import { hideLoading, showLoading, showToast } from "../../../utils/message/index"
 
 // mHome/pages/cerserach/index.ts
 Page({
@@ -69,32 +70,35 @@ Page({
    */
   gzCertAddressConfig() {
     /// loding.....
-    Toast.loading({message: '加载中...'})
-    /// 发送查询
-    gzCertAddressConfig({
-      success: (res) => {
-        if (res.code != 200) {
-          Toast.fail('参数加载失败，原因：'+res.msg)
-          return
-        }
-        /// 设置数据
-        this.setData({ 
-          /// 配置数据
-          configs: res.data,
-          /// 显示数据
-          datas: res.data.filter(itm => {
+    showLoading(()=>{
+      /// 发送查询
+      gzCertAddressConfig({
+        success: (res) => {
+          if (res.code != 200) {
+            hideLoading(()=>{}, '参数加载失败，原因：'+res.msg, 'error')
+            return
+          }
+          /// 加载成功
+          hideLoading(()=>{
+            /// 设置数据
+            this.setData({ 
+              /// 配置数据
+              configs: res.data,
+              /// 显示数据
+              datas: res.data.filter(itm => {
+                /// 默认选中第一个
+                if (itm.orderindex == 1) { itm.isCheck = true }
+                return itm.certregion == this.data.active+1
+              }),
+            })
             /// 默认选中第一个
-            if (itm.orderindex == 1) { itm.isCheck = true }
-            return itm.certregion == this.data.active+1
-          }),
-        })
-        /// 默认选中第一个
-        this.setData({ config: this.data.datas[0] })
-      },
-      fail: (emsg) => {
-        Toast.fail('参数加载失败，原因：'+emsg)
-      },
-      complete: () => {}
+            this.setData({ config: this.data.datas[0] })
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, '参数加载失败，原因：'+emsg, 'error')
+        }
+      })
     })
   },
 
@@ -102,23 +106,27 @@ Page({
    * 钻石证书地址参数
    */
   gzCertAddressParam() {
-    /// 发送查询
-    gzCertAddressParam({
-      success: (res) => {
-        if (res.code != 200) {
-          Toast.fail('证书地址参数加载失败，原因：'+res.msg)
-          return
+    /// showLoading
+    showLoading(()=>{
+      /// 发送查询
+      gzCertAddressParam({
+        success: (res) => {
+          if (res.code != 200) {
+            hideLoading(()=>{}, '证书地址参数加载失败，原因：'+res.msg, 'error')
+            return
+          }
+          hideLoading(()=>{
+            /// 设置数据
+            this.setData({ 
+              /// 配置数据
+              params: res.data,
+            })
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, '证书地址参数加载失败，原因：'+emsg, 'error')
         }
-        /// 设置数据
-        this.setData({ 
-          /// 配置数据
-          params: res.data,
-        })
-      },
-      fail: (emsg) => {
-        Toast.fail('证书地址参数加载失败，原因：'+emsg)
-      },
-      complete: () => {}
+      })
     })
   },
 
@@ -147,7 +155,7 @@ Page({
   },
 
   /// 形状按钮点击事件
-  onButtonPressed(e: any) {
+  onButtonClick(e: any) {
     const index = e.target.id
     /// 设置数据
     this.setData({
@@ -180,13 +188,13 @@ Page({
   check(): boolean {
     /// 请输入证书号
     if (this.data.certno.length == 0) {
-      Toast.fail('请输入证书号！')
+      showToast('请输入证书号！')
       return false
     }
 
     /// 请输入防伪码
     if (this.data.securityCode.length == 0) {
-      Toast.fail('请输入防伪码！')
+      showToast('请输入防伪码！')
       return false
     }
     return true

GuangZuan/miniprogram/mHome/pages/cerserach/index.wxml

@@ -1,7 +1,7 @@
 <!-- 导航栏 -->
-<van-nav-bar custom-style="background-color: #E92020">
-  <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-  <text slot="title" style="color: white;">钻石证书查询</text>
+<van-nav-bar custom-style="background-color: #fff">
+  <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+  <text slot="title" style="color: #333;">钻石证书查询</text>
 </van-nav-bar>
 
 <!-- tabs -->
@@ -13,8 +13,8 @@
 
 <!-- 证书 -->
 <view class="cers">
-    <button wx:for="{{datas}}" wx:for-item="itm" wx:for-index="idx" wx:key="certtype" class="cers-button {{itm.isCheck ? 'active' : ''}}" id="{{itm.orderindex}}" bindtap="onButtonPressed">{{itm.certtype}}</button>
-  </view>
+  <button wx:for="{{datas}}" wx:for-item="itm" wx:for-index="idx" wx:key="certtype" class="cers-button {{itm.isCheck ? 'active' : ''}}" id="{{itm.orderindex}}" bindtap="onButtonClick">{{itm.certtype}}</button>
+</view>
 
 <view class="container">
   <!-- 输入区域 -->
@@ -36,9 +36,9 @@
 
 <!-- 查询按钮 -->
 <view class="button-view">
-      <van-button custom-class="search" bind:click="certSearch" block color="linear-gradient(to right, #4bb0ff, #6149f6)">查询</van-button>
-      <van-button custom-class="clear" bind:click="clear" block color="linear-gradient(to right, #4bb0ff, #6149f6)">清空</van-button>
-    </view>
+  <van-button custom-class="search" round bind:click="certSearch" block color="linear-gradient(to right, #4bb0ff, #D91D34)">查询</van-button>
+  <van-button custom-class="clear" round bind:click="clear" block color="linear-gradient(to right, #4bb0ff, #6149f6)">清空</van-button>
+</view>
 
 <!-- toast --> 
 <van-toast id="van-toast" />

GuangZuan/miniprogram/mHome/pages/goodsdetail/index.ts

@@ -1,4 +1,10 @@
+import Long from "long"
+import { FunCode } from "../../../constants/enum/funcode"
+import { EOrderSrc } from "../../../constants/enum/index"
+import { sendMsgToMQ } from "../../../services/api/common/index"
 import { getGoods } from "../../../services/api/orders/index"
+import { accountid, clientType, isEncrypted, loginid, marketid, protoHeader, timetample, userid } from "../../../services/utils"
+import { hideLoading, showLoading, showModel, showToast } from "../../../utils/message/index"
 
 Page({
 
@@ -11,7 +17,9 @@ Page({
     /// 商品信息
     goods: <GuangZuan.GetGoods>({}),
     /// 商品编号
-    goodsno: ''
+    goodsno: '',
+    /// 卖单信息
+    order: <GuangZuan.SellOrder>({})
   },
 
   /**
@@ -26,31 +34,78 @@ Page({
    * 获取商品数据信息
    */
   getGoods() {
-    /// loding....
-    wx.showLoading({title: '加载中.....'})
-    /// 发送请求
-    getGoods({
-      data: {
-        goodsno: this.data.goodsno
-      },
-      success: (res) => {
-        this.setData({ goods: res.data })
-      },
-      fail: (emsg) => {
-        wx.showToast({title: '数据请求失败，原因：'+emsg})
-      },
-      complete: () => {
-        /// hideLoading
-        wx.hideLoading()
-      }
+    showLoading(() => {
+      /// 发送请求
+      getGoods({
+        data: {
+          goodsno: this.data.goodsno
+        },
+        success: (res) => {
+          hideLoading( ()=> {
+            this.setData({ goods: res.data })
+          })
+        },
+        fail: (emsg) => {
+          hideLoading( ()=> {}, '数据请求失败，原因：'+emsg)
+        }
+      })
     })
+    
+  },
+
+  /// 钻石买摘牌接口
+  doZSBuyOrderDesting() {
+    /// showModel
+    showModel(() => {
+      /// showLoding....
+      showLoading(() => {
+        /// 构建参数信息
+        const params = {
+          Header: protoHeader(FunCode.ZSBuyOrderDestingReq),
+          UserID: userid(),
+          AccountID: accountid(),
+          RelatedWRTradeOrderID: this.data.order.wrtradeorderid,
+          OrderQty: this.data.order.remainqty,
+          OrderSrc: EOrderSrc.ORDERSRC_CLIENT,
+          ClientSerialNo: timetample().toString(),
+          ClientType: clientType(),
+          OperatorID: loginid(),
+          MarketID: marketid()
+        }
+
+        /// 发送请求
+        sendMsgToMQ({
+          data: {
+            data: JSON.stringify(params),
+            funCodeReq: FunCode.ZSBuyOrderDestingReq,
+            funCodeRsp: FunCode.ZSBuyOrderDestingRsp,
+            isEncrypted: isEncrypted(),
+          },
+          success: () => {
+            /// 请求成功
+            hideLoading(() => {
+              wx.navigateBack()
+            }, '购买请求成功')
+          },
+          fail: (emsg) => {
+            hideLoading(() => {
+              showToast('购买操作请求失败，原因:'+emsg)
+            })
+          }
+        })
+      }, '请求中......')
+    }, '提示', '确定要购买吗？', true)
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options: any) {
-    console.log(options)
+    /// 单据信息
+    const item = JSON.parse(options.item)
+    if (item) {
+      this.setData({ order: item })
+    }
     /// 商品编号
     this.setData({ goodsno: options.goodsno })
     /// 获取商品数据

GuangZuan/miniprogram/mHome/pages/goodsdetail/index.wxml

@@ -1,9 +1,9 @@
 <view class="container">
   <view class="topView">
     <!-- 导航栏 -->
-    <van-nav-bar custom-style="background-color: #E92020">
-      <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-      <text slot="title" style="color: white;">商品详情</text>
+    <van-nav-bar custom-style="background-color: #fff">
+      <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+      <text slot="title" style="color: #333;">商品详情</text>
     </van-nav-bar>
   </view>
 
@@ -62,7 +62,7 @@
     <text class="title">【钻石属性】</text>
     <view class="attribute-info__item">
       <text class="title">形状：</text>
-      <text class="value">{{ goods.zspolishtype2display }}</text>
+      <text class="value">{{ goods.zsshapetypedisplay }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">颜色：</text>
@@ -96,11 +96,11 @@
       <text class="title">证书编号：</text>
       <text class="value">{{ goods.cerno }}</text>
     </view>
-    <view class="attribute-info__item">
+    <view class="attribute-info__item" wx:if="{{ goods.zscategory === 4 }}">
       <text class="title">镶嵌材料：</text>
       <text class="value">{{ goods.settingmaterial }}</text>
     </view>
-    <view class="attribute-info__item">
+    <view class="attribute-info__item" wx:if="{{ goods.zscategory === 4 }}">
       <text class="title">配石描述：</text>
       <text class="value">{{ goods.stonedesc }}</text>
     </view>
@@ -109,6 +109,11 @@
    <!-- 按钮 -->
    <view class="button-view">
     <van-icon name="star-o" size="20"/>
-    <van-button custom-class="excute" id="excute" round color="linear-gradient(to right, #4bb0ff, #F7A657)" block bind:click="onButtonPressed">立即购买</van-button>
+    <van-button custom-class="excute" id="excute" round color="linear-gradient(to right, #4bb0ff, #F7A657)" block bind:click="doZSBuyOrderDesting">立即购买</van-button>
   </view>
-</view>
+</view>
+
+<!-- toast --> 
+<van-toast id="van-toast" />
+<!-- 对话弹框  -->
+<van-dialog id="van-dialog" />

GuangZuan/miniprogram/mHome/pages/inspection/detail/index.ts

@@ -1,6 +1,6 @@
-import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { queryGZCJJCOrderDetail } from "../../../../services/api/trade/index"
 import { getExecutestatus, userid } from "../../../../services/utils"
+import { hideLoading, showLoading } from "../../../../utils/message/index"
 import { isnullstr } from "../../../../utils/util"
 
 Page({
@@ -36,44 +36,46 @@ Page({
    */
   queryGZCJJCOrderDetail() {
     /// loding.....
-    Toast.loading({message: '加载中...'})
-    /// 发送查询
-    queryGZCJJCOrderDetail({
-      data: {
-        /// 模糊搜索
-        userid: userid(),
-        orderid: this.data.order.orderid
-      },
-      /// 加载成功
-      success: (res) => {
-        if (res.code != 200) {
+    showLoading(()=>{
+      /// 发送查询
+      queryGZCJJCOrderDetail({
+        data: {
+          /// 模糊搜索
+          userid: userid(),
+          orderid: this.data.order.orderid
+        },
+        /// 加载成功
+        success: (res) => {
+          if (res.code != 200) {
+            /// 加载失败
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          hideLoading(()=>{
+            /// 数据赋值
+            this.setData({ 
+              orders: res.data,
+              isEmpty: res.data.length === 0,
+              /// 显示的值
+              values: res.data.map(obj => {
+                return {up: [obj.gzno, 
+                            obj.gzcjshapetypestring+' | '+obj.weight.toString()+' | '+obj.amount.toFixed(2)], 
+                        mid: [obj.gzcjmarktype+' | '+obj.gzcjpublishtypestring+' | '+obj.gzcjservicetypestring+' | '+obj.origincertno],
+                        dwn: [obj.colorinfo.toString()+' | '+
+                              isnullstr(obj.remark)]}
+              })
+            })
+          })
+        },
+        fail: (emsg) => {
           /// 加载失败
-          Toast.success({ message: '加载失败，原因：'+res.msg});
-          return
+          hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
+        },
+        complete: () => {
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
         }
-        /// 数据赋值
-        this.setData({ 
-          orders: res.data,
-          /// 显示的值
-          values: res.data.map(obj => {
-            return {up: [obj.gzno, 
-                         obj.gzcjshapetypestring+' | '+obj.weight.toString()+' | '+obj.amount.toFixed(2)], 
-                    mid: [obj.gzcjmarktype+' | '+obj.gzcjpublishtypestring+' | '+obj.gzcjservicetypestring+' | '+obj.origincertno],
-                    dwn: [obj.colorinfo.toString()+' | '+
-                          isnullstr(obj.remark)]}
-          })
-        })
-      },
-      fail: (emsg) => {
-        /// 加载失败
-        Toast.fail({ message: '加载失败...'+emsg});
-      },
-      complete: () => {
-        /// 数据赋值
-        this.setData({  isEmpty: this.data.values.length == 0 })
-        /// 停止下拉刷新
-        wx.stopPullDownRefresh()
-      }
+      })
     })
   },
 

GuangZuan/miniprogram/mHome/pages/inspection/detail/index.wxml

@@ -1,9 +1,9 @@
 <!-- top-view -->
 <view class="top-view">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">出境详情</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">出境详情</text>
   </van-nav-bar>
 
   <!-- 单据信息 -->

GuangZuan/miniprogram/mHome/pages/inspection/list/index.ts

@@ -1,11 +1,10 @@
 import { FunCode } from "../../../../constants/enum/funcode"
-import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { sendMsgToMQ } from "../../../../services/api/common/index"
 import { queryGZCJJCOrder } from "../../../../services/api/trade/index"
 import { userid, getExecutestatus, isEncrypted, protoHeader, loginid, clientType, timetample, loginCode } from "../../../../services/utils"
+import { hideLoading, showLoading } from "../../../../utils/message/index"
 import { isnullstr } from "../../../../utils/util"
 
-// mHome/pages/inspection/list/index.ts
 Page({
 
   /**
@@ -63,10 +62,14 @@ Page({
         this.doCJJCOperator(3, orderid)
         break;
       case 'confirmprepayment':  /// 确认预付款
-        this.doCJJCOperator(4, orderid)
+        wx.navigateTo({
+          url: "/mHome/pages/inspection/prepayment/index?item="+JSON.stringify(this.data.orders[index])
+        })
         break;
       case 'confirmpayment':     /// 确认付款
-        this.doCJJCOperator(5, orderid)
+        wx.navigateTo({
+          url: "/mHome/pages/inspection/payment/index?item="+JSON.stringify(this.data.orders[index])
+        })
         break;
       default:
         break;
@@ -86,46 +89,48 @@ Page({
    */
   queryGZCJJCOrder() {
     /// loding.....
-    Toast.loading({message: '加载中...'})
-    /// 发送查询
-    queryGZCJJCOrder({
-      data: {
-        /// 模糊搜索
-        userid: userid(),
-        executestatus: this.data.active+1
-      },
-      /// 加载成功
-      success: (res) => {
-        if (res.code != 200) {
+    showLoading(()=>{
+      /// 发送查询
+      queryGZCJJCOrder({
+        data: {
+          /// 模糊搜索
+          userid: userid(),
+          executestatus: this.data.active+1
+        },
+        /// 加载成功
+        success: (res) => {
+          if (res.code != 200) {
+            /// 加载失败
+            hideLoading(()=>{}, '加载失败，原因：'+res.msg, 'error')
+            return
+          }
+          hideLoading(()=>{
+            /// 数据赋值
+            this.setData({ 
+              orders: res.data,
+              /// 显示的值
+              values: res.data.map(obj => {
+                return {up: [obj.gzcjcategorytypedisplay, 
+                            obj.gzcjaccount, 
+                            isnullstr(obj.orderno)], 
+                        dwn: [obj.totalnumber.toString()+'(粒)'+' | '+
+                              obj.totalgrossweight.toString()+'(ct)'+' | '+
+                              obj.totalweightgm.toString()+'(USD)',
+                              getExecutestatus(obj.executestatus)]}
+              }),
+              isEmpty: res.data.length === 0
+            })
+          })
+        },
+        fail: (emsg) => {
           /// 加载失败
-          Toast.success({ message: '加载失败，原因：'+res.msg});
-          return
+          hideLoading(()=>{}, '加载失败，原因：'+emsg, 'error')
+        },
+        complete: () => {
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
         }
-        /// 数据赋值
-        this.setData({ 
-          orders: res.data,
-          /// 显示的值
-          values: res.data.map(obj => {
-            return {up: [obj.gzcjcategorytypedisplay, 
-                         obj.gzcjaccount, 
-                        isnullstr(obj.orderno)], 
-                    dwn: [obj.totalnumber.toString()+'(粒)'+' | '+
-                          obj.totalgrossweight.toString()+'(ct)'+' | '+
-                          obj.totalweightgm.toString()+'(USD)',
-                          getExecutestatus(obj.executestatus)]}
-          })
-        })
-      },
-      fail: (emsg) => {
-        /// 加载失败
-        Toast.fail({ message: '加载失败...'+emsg});
-      },
-      complete: () => {
-        /// 数据赋值
-        this.setData({  isEmpty: this.data.values.length == 0 })
-        /// 停止下拉刷新
-        wx.stopPullDownRefresh()
-      }
+      })
     })
   },
 
@@ -134,45 +139,43 @@ Page({
    */
   doCJJCOperator(operator: number, orderid: number) {
     /// loding.....
-    Toast.loading({ message: '操作请求中.....'})
-
-    /// 参数信息
-    const params = {
-      UserID: userid(),
-      OperateID: loginid(),
-      ClientType: clientType,
-      ClientSerialNo: timetample().toString,
-      OperateAccount: loginCode(),
-      OrderID: orderid,
-      OperateType: operator,
-      Header: protoHeader(FunCode.CJJCMemberOperateReq)
-    }
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        data: JSON.stringify(params),
-        funCodeReq: FunCode.CJJCMemberOperateReq,
-        funCodeRsp: FunCode.CJJCMemberOperateRsp,
-        isEncrypted: isEncrypted()
-      },
-      success: (res) => {
-        if (res.code != 0) {
-          Toast.fail({message: '操作申请失败， 原因：'+res.msg})
-          return
-        }
-        /// 操作成功
-        Toast.success('操作成功')
-        /// 重新获取数据
-        this.queryGZCJJCOrder()
-      },
-      fail: (emsg) => {
-        /// 操作失败
-        Toast.fail('操作失败，原因：'+emsg)
-      }, complete: () => {
-        /// hideLoading
-        Toast.clear()
+    showLoading(()=>{
+      /// 参数信息
+      const params = {
+        UserID: userid(),
+        OperateID: loginid(),
+        ClientType: clientType,
+        ClientSerialNo: timetample().toString(),
+        OperateAccount: loginCode().toString(),
+        OrderID: orderid.toString(),
+        OperateType: operator,
+        Header: protoHeader(FunCode.CJJCMemberOperateReq, 66201)
       }
-    })
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          data: JSON.stringify(params),
+          funCodeReq: FunCode.CJJCMemberOperateReq,
+          funCodeRsp: FunCode.CJJCMemberOperateRsp,
+          isEncrypted: isEncrypted()
+        },
+        success: (res) => {
+          if (res.code != 0) {
+            hideLoading(()=>{}, '操作申请失败， 原因：'+res.msg, 'error')
+            return
+          }
+          /// 操作成功
+          hideLoading(()=>{
+            /// 重新获取数据
+            this.queryGZCJJCOrder()
+          }, '操作成功', 'success')
+        },
+        fail: (emsg) => {
+          /// 操作失败
+          hideLoading(()=>{}, '操作申请失败， 原因：'+emsg, 'error')
+        }
+      })
+    }, '操作请求中.....')
   },
 
   /**

GuangZuan/miniprogram/mHome/pages/inspection/list/index.wxml

@@ -1,9 +1,9 @@
 <!-- top-view -->
 <view class="top-view">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">出境检测</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">出境检测</text>
   </van-nav-bar>
 
   <!-- tabs -->
@@ -49,6 +49,6 @@
 </scroll-view>
 
 <!-- 无数据 --> 
-<van-empty wx:if="{{isEmpty}}" class="custom-image" description="无数据"/>
+<van-empty wx:if="{{ isEmpty }}" class="custom-image" description="无数据"/>
 <!-- toast --> 
 <van-toast id="van-toast" />

GuangZuan/miniprogram/mHome/pages/inspection/payment/index.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "enablePullDownRefresh": false
+}

GuangZuan/miniprogram/mHome/pages/inspection/payment/index.less

@@ -0,0 +1,41 @@
+.container {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-content: center;
+  align-items: center;
+
+  .top-view {
+    position: sticky;
+    top: 0;
+    z-index: 999;
+    width: 100%;
+  }
+
+  &__content {
+    width: 100%;
+  }
+
+  &__notify {
+    width: 95%;
+    height: 30px;
+    color: #666;
+    font-size: 14px;
+    margin-top: 10px;
+  }
+
+  &__button-view {
+    border-radius: 10px;
+    width: 95%;
+    padding-top: 15px;
+    display: flex;
+    flex-direction: row;
+    align-content: center;
+    align-items: center;
+    justify-content: space-between;
+
+    van-button {
+      width: 45%;
+    }
+  }
+}

GuangZuan/miniprogram/mHome/pages/inspection/payment/index.ts

@@ -0,0 +1,163 @@
+import { FunCode } from "../../../../constants/enum/funcode"
+import { sendMsgToMQ } from "../../../../services/api/common/index"
+import { queryGzcjjcorderoperate } from "../../../../services/api/trade/index"
+import { userid, loginid, clientType, timetample, loginCode, protoHeader, isEncrypted, taAccount, accountid } from "../../../../services/utils"
+import { hideLoading, showLoading, showModel } from "../../../../utils/message/index"
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// 单据信息
+    order: <GuangZuan.GZCJJCOrder>({}),
+    /// 查询出境检测单据操作
+    operator: <GuangZuan.GzcjjcorderoperateRsp>({}),
+    /// 资金账户信息
+    ta: <GuangZuan.TaAccount>({})
+  },
+
+  /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+  /// 查询出境检测单据操作
+  queryGzcjjcorderoperate() {
+    /// loding...
+    showLoading(() => {
+      /// 发送查询请求
+      queryGzcjjcorderoperate({
+        data: {
+          orderid: this.data.order.orderid.toString(),
+          status: this.data.order.gzcjstatus
+        },
+        success: (res) => {
+          /// hideLoading
+          hideLoading(() => { 
+            if (res.data.length != 0) {
+              this.setData({ operator: res.data[0] })
+            } 
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(() => {}, '加载失败，原因：'+emsg)
+        }
+      })
+    })
+  },
+
+   /**
+   * 出境检测操作请求
+   */
+  doCJJCOperator() {
+    /// loding.....
+    showModel(() => {
+      showLoading(()=>{
+        /// 参数信息
+        const params = {
+          UserID: userid(),
+          OperateID: loginid(),
+          ClientType: clientType,
+          ClientSerialNo: timetample().toString,
+          OperateAccount: loginCode(),
+          OrderID: this.data.order.orderid,
+          OperateType: 5,
+          Header: protoHeader(FunCode.CJJCMemberOperateReq, 66201)
+        }
+        /// 发送请求
+        sendMsgToMQ({
+          data: {
+            data: JSON.stringify(params),
+            funCodeReq: FunCode.CJJCMemberOperateReq,
+            funCodeRsp: FunCode.CJJCMemberOperateRsp,
+            isEncrypted: isEncrypted()
+          },
+          success: (res) => {
+            if (res.code != 0) {
+              hideLoading(()=>{}, '操作申请失败， 原因：'+res.msg, 'error')
+              return
+            }
+            hideLoading(()=>{
+              /// 返回上层视图
+              wx.navigateBack()
+            }, '操作成功', 'success')
+          },
+          fail: (emsg) => {
+            hideLoading(()=>{}, '操作失败，原因：'+emsg, 'error')
+          }
+        })
+      })
+    }, '提示', '确认要付款吗？', true)
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options: any) {
+    /// 数据解析
+    const obj = JSON.parse(options.item)
+    if (obj) {
+      this.setData({ 
+        order: obj,
+        /// 设置账户信息
+        ta: taAccount(accountid()) 
+      })
+    }
+    /// 查询出境检测单据操作
+    this.queryGzcjjcorderoperate()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

GuangZuan/miniprogram/mHome/pages/inspection/payment/index.wxml

@@ -0,0 +1,36 @@
+<view class="container">
+  <!-- top-view -->
+  <view class="top-view">
+    <!-- 导航栏 -->
+    <van-nav-bar custom-style="background-color: #E92020">
+      <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
+      <text slot="title" style="color: white;">确认付款</text>
+    </van-nav-bar>
+  </view>
+
+  <view class="container__content" wx:if="{{ operator }}">
+    <van-cell-group>
+      <van-cell title="单据编号" value="{{ order.orderid }}"></van-cell>
+      <van-cell title="综合服务费" value="{{ operator.servicefee }}"></van-cell>
+      <van-cell title="代缴物流保险费" value="{{ operator.logisticsfee }}"></van-cell>
+      <van-cell title="GIA检测费" value="{{ operator.giarmbfee }}"></van-cell>
+      <van-cell title="海关税费" value="{{ operator.customsfee }}"></van-cell>
+      <van-cell title="汇款银行手续费" value="{{ operator.bankfee }}"></van-cell>
+      <van-cell title="其它费用" value="{{ operator.otherfee }}"></van-cell>
+      <van-cell title="总共" value="{{ operator.totalfee }}"></van-cell>
+      <van-cell title="预收款" value="{{ operator.advanceamount }}"></van-cell>
+      <van-cell title="应收\应退" value="{{ operator.settleamount-operator.advanceamount }}"></van-cell>
+      <van-cell title="账户余额" value="{{ ta.currentbalance }}"></van-cell>
+    </van-cell-group>
+  </view>
+
+  <view class="container__notify">付款通知书(预付款).pdf</view>
+
+  <!-- 按钮 -->
+  <view class="container__button-view">
+    <van-button custom-class="confirm" id="confirm" round color="linear-gradient(to right, #4bb0ff, #666)" block bind:click="doCJJCOperator">确认</van-button>
+    <van-button custom-class="cancel" id="cancel" round color="linear-gradient(to right, #4bb0ff, #F7A657)" block bind:click="backToParent">取消</van-button>
+  </view>
+</view>
+
+

GuangZuan/miniprogram/mHome/pages/inspection/prepayment/index.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "enablePullDownRefresh": false
+}

GuangZuan/miniprogram/mHome/pages/inspection/prepayment/index.less

@@ -0,0 +1,41 @@
+.container {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-content: center;
+  align-items: center;
+
+  .top-view {
+    position: sticky;
+    top: 0;
+    z-index: 999;
+    width: 100%;
+  }
+
+  &__content {
+    width: 100%;
+  }
+
+  &__notify {
+    width: 95%;
+    height: 30px;
+    color: #666;
+    font-size: 14px;
+    margin-top: 10px;
+  }
+
+  &__button-view {
+    border-radius: 10px;
+    width: 95%;
+    padding-top: 15px;
+    display: flex;
+    flex-direction: row;
+    align-content: center;
+    align-items: center;
+    justify-content: space-between;
+
+    van-button {
+      width: 45%;
+    }
+  }
+}

GuangZuan/miniprogram/mHome/pages/inspection/prepayment/index.ts

@@ -0,0 +1,163 @@
+import { FunCode } from "../../../../constants/enum/funcode"
+import { sendMsgToMQ } from "../../../../services/api/common/index"
+import { queryGzcjjcorderoperate } from "../../../../services/api/trade/index"
+import { userid, loginid, clientType, timetample, loginCode, protoHeader, isEncrypted, taAccount, accountid } from "../../../../services/utils"
+import { hideLoading, showLoading, showModel } from "../../../../utils/message/index"
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    /// 单据信息
+    order: <GuangZuan.GZCJJCOrder>({}),
+    /// 查询出境检测单据操作
+    operator: <GuangZuan.GzcjjcorderoperateRsp>({}),
+    /// 资金账户信息
+    ta: <GuangZuan.TaAccount>({})
+  },
+
+  /**
+   * 返回上层视图
+   */
+  backToParent() {
+    /// 返回上层视图
+    wx.navigateBack()
+  },
+
+  /// 查询出境检测单据操作
+  queryGzcjjcorderoperate() {
+    /// loding...
+    showLoading(() => {
+      /// 发送查询请求
+      queryGzcjjcorderoperate({
+        data: {
+          orderid: this.data.order.orderid.toString(),
+          status: this.data.order.gzcjstatus
+        },
+        success: (res) => {
+          /// hideLoading
+          hideLoading(() => { 
+            if (res.data.length != 0) {
+              this.setData({ operator: res.data[0] })
+            } 
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(() => {}, '加载失败，原因：'+emsg)
+        }
+      })
+    })
+  },
+
+  /**
+   * 出境检测操作请求
+   */
+  doCJJCOperator() {
+    /// loding.....
+    showModel(() => {
+      showLoading(()=>{
+        /// 参数信息
+        const params = {
+          UserID: userid(),
+          OperateID: loginid(),
+          ClientType: clientType,
+          ClientSerialNo: timetample().toString,
+          OperateAccount: loginCode(),
+          OrderID: this.data.order.orderid,
+          OperateType: 4,
+          Header: protoHeader(FunCode.CJJCMemberOperateReq, 66201)
+        }
+        /// 发送请求
+        sendMsgToMQ({
+          data: {
+            data: JSON.stringify(params),
+            funCodeReq: FunCode.CJJCMemberOperateReq,
+            funCodeRsp: FunCode.CJJCMemberOperateRsp,
+            isEncrypted: isEncrypted()
+          },
+          success: (res) => {
+            if (res.code != 0) {
+              hideLoading(()=>{}, '操作申请失败， 原因：'+res.msg, 'error')
+              return
+            }
+            hideLoading(()=>{
+              /// 返回上层视图
+              wx.navigateBack()
+            }, '操作成功', 'success')
+          },
+          fail: (emsg) => {
+            hideLoading(()=>{}, '操作失败，原因：'+emsg, 'error')
+          }
+        })
+      })
+    }, '提示', '确认要预付款吗？', true)
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options: any) {
+    /// 数据解析
+    const obj = JSON.parse(options.item)
+    if (obj) {
+      this.setData({ 
+        order: obj,
+        /// 设置账户信息
+        ta: taAccount(accountid()) 
+      })
+    }
+    /// 查询出境检测单据操作
+    this.queryGzcjjcorderoperate()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

GuangZuan/miniprogram/mHome/pages/inspection/prepayment/index.wxml

@@ -0,0 +1,36 @@
+<view class="container">
+  <!-- top-view -->
+  <view class="top-view">
+    <!-- 导航栏 -->
+    <van-nav-bar custom-style="background-color: #E92020">
+      <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
+      <text slot="title" style="color: white;">确认预付款</text>
+    </van-nav-bar>
+  </view>
+
+  <view class="container__content" wx:if="{{ operator}}">
+    <van-cell-group>
+      <van-cell title="单据编号" value="{{ order.orderid }}"></van-cell>
+      <van-cell title="GIA检测费" value="{{ operator.giarmbfee }}"></van-cell>
+      <van-cell title="折合人民币" value="{{ operator.giarmbfee*operator.exchangerate }}"></van-cell>
+      <van-cell title="海关税费" value="{{ operator.customsfee }}"></van-cell>
+      <van-cell title="汇款银行手续费" value="{{ operator.bankfee }}"></van-cell>
+      <van-cell title="代缴物流保险费" value="{{ operator.logisticsfee }}"></van-cell>
+      <van-cell title="综合服务费" value="{{ operator.servicefee }}"></van-cell>
+      <van-cell title="其它费用" value="{{ operator.otherfee }}"></van-cell>
+      <van-cell title="总共" value="{{ operator.totalfee }}"></van-cell>
+      <van-cell title="账户可用余额" value="{{ ta.currentbalance }}"></van-cell>
+    </van-cell-group>
+  </view>
+
+  <view class="container__notify">付款通知书(预付款).pdf</view>
+
+  <!-- 按钮 -->
+  <view class="container__button-view">
+    <van-button custom-class="confirm" id="confirm" round color="linear-gradient(to right, #4bb0ff, #666)" block bind:click="doCJJCOperator">确认</van-button>
+    <van-button custom-class="cancel" id="cancel" round color="linear-gradient(to right, #4bb0ff, #F7A657)" block bind:click="backToParent">取消</van-button>
+  </view>
+</view>
+
+
+ 

GuangZuan/miniprogram/mHome/pages/jewelry/list/index.less

@@ -15,7 +15,7 @@ Page {
   flex-wrap: wrap;
   align-items: center;
   align-content: center;
-  margin: 10px;
+  margin: 5px;
   
   .goodscard-item {
     width: 48%;
@@ -24,7 +24,7 @@ Page {
     justify-content: space-between;
     background-color: white;
     border-radius: 10px;
-    margin-top: 15px;
+    margin-top: 5px;
     box-shadow: 10px 10px 10px #ddd;
 
     .goods-icon {

GuangZuan/miniprogram/mHome/pages/jewelry/list/index.ts

@@ -1,5 +1,6 @@
-import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast";
 import { querySellOrder } from "../../../../services/api/orders/index";
+import { userid } from "../../../../services/utils";
+import { hideLoading, showLoading } from "../../../../utils/message/index";
 
 // mHome/pages/jewelry/index.ts
 Page({
@@ -34,9 +35,9 @@ Page({
    * 点击项选中
    */
   onItemClick(e: any) {
-    console.log(e)
+    const { num } = e.currentTarget.dataset
     wx.navigateTo({
-      url: "/mHome/pages/goodsdetail/index?goodsno="+this.data.sellOrders[e.currentTarget.dataset.num].goodsno
+      url: "/mHome/pages/goodsdetail/index?goodsno="+this.data.sellOrders[num].goodsno+'&item='+`${JSON.stringify(this.data.sellOrders[num])}`
     })
   },
 
@@ -53,39 +54,39 @@ Page({
   /// 查询出售大厅委托单
   queryDiamond() {
     /// loding.....
-    Toast.loading({message: '加载中...'});
-   
-    /// 钻石查询
-    querySellOrder({
-      data: {
-        /// 钻石分类
-        zscategorys: '4',
-        /// 商品(查询字段-模糊查询)
-        zsallproperties: this.data.result,
-        page: this.data.page,
-        pagesize: this.data.pagesize
-      },
-      /// 加载成功
-      success: (res) => {
-        if (res.code != 200) {
-          /// 加载失败
-          Toast.fail({ message: '加载失败，原因：'+res.msg});
-          return
+    showLoading(()=>{
+      /// 钻石查询
+      querySellOrder({
+        data: {
+          userid: userid(),
+          /// 钻石分类
+          zscategorys: '4',
+          /// 商品(查询字段-模糊查询)
+          zsallproperties: this.data.result,
+          page: this.data.page,
+          pagesize: this.data.pagesize,
+          ishis: false
+        },
+        /// 加载成功
+        success: (res) => {
+          if (res.code != 200) {
+            /// 加载失败
+            hideLoading(()=>{}, '加载失败，原因：'+res.msg)
+            return
+          }
+          /// 加载成功
+          hideLoading(()=>{
+            /// 数据赋值
+            this.setData({ 
+              sellOrders: this.data.page == 1 ? res.data : this.data.sellOrders.concat(res.data),
+            })
+            this.setData({ isEmpty: this.data.sellOrders.length === 0})
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, '加载失败，原因：'+emsg)
         }
-        /// 数据赋值
-        this.setData({ 
-          sellOrders: this.data.page == 1 ? res.data : this.data.sellOrders.concat(res.data)
-        })
-      },
-      fail: (emsg) => {
-        /// 加载失败
-        Toast.fail({ message: '加载失败，原因：'+emsg});
-      },
-      complete: () => {
-        this.setData({
-          isEmpty: this.data.sellOrders.length === 0
-        })
-      }
+      })
     })
   },
 

GuangZuan/miniprogram/mHome/pages/jewelry/list/index.wxml

@@ -1,13 +1,13 @@
  <!-- top-view -->
 <view class="top-view">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">钻石首饰</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">钻石首饰</text>
   </van-nav-bar>
 
   <!-- 搜索视图 -->
-  <van-search model:value="{{result}}" use-action-slot background="#2270D9" shape="round" placeholder="搜索首饰" bind:change="onChange">
+  <van-search model:value="{{result}}" use-action-slot background="#999" shape="round" placeholder="搜索首饰" bind:change="onChange">
     <view slot="action" bind:tap="onSearch" style="color: white;">搜索</view>
   </van-search> 
 </view>

GuangZuan/miniprogram/mHome/pages/msg/msgdetail/index.ts

@@ -21,7 +21,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options: any) {
-    console.log(options)
     /// 传参信息
     this.setData({
       msg: JSON.parse(options.id ?? '')

GuangZuan/miniprogram/mHome/pages/msg/msgdetail/index.wxml

@@ -1,7 +1,7 @@
 <!-- 导航栏 -->
-<van-nav-bar custom-style="background-color: #E92020">
-  <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-  <text slot="title" style="color: white;">详情</text>
+<van-nav-bar custom-style="background-color: #fff">
+  <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+  <text slot="title" style="color: #333;">详情</text>
 </van-nav-bar>
 
 <!-- title -->

GuangZuan/miniprogram/mHome/pages/msg/msglist/index.ts

@@ -1,6 +1,6 @@
-import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { queryNotice } from "../../../../services/api/common/index"
 import { loginid } from '../../../../services/utils'
+import { hideLoading, showLoading } from "../../../../utils/message/index"
 
 // pages/msg/msglist/index.ts
 Page({
@@ -41,32 +41,32 @@ Page({
   /// 查询公告消息信息
   queryNotice(msgtype: number){
     /// loding.....
-    Toast.loading({message: '加载中....'})
-    /// 发送查询请求
-    queryNotice({
-      data: {
-        msgType: msgtype,
-        loginID: loginid()
-      },
-      success:(res) => {
-        /// 加载失败
-        if (res.code != 200) {
-          Toast('请求失败，原因：'+res.msg)
-          return
+    showLoading(()=>{
+      /// 发送查询请求
+      queryNotice({
+        data: {
+          msgType: msgtype,
+          loginID: loginid()
+        },
+        success:(res) => {
+          /// 加载失败
+          if (res.code != 200) {
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg)
+            return
+          }
+          hideLoading(()=>{ 
+            /// 加载成功
+            this.setData({ 
+              msgs: res.data,
+              isEmpty: res.data.length === 0
+            }) 
+          })
+        },
+        fail: (emsg) => {
+          /// 加载失败
+          hideLoading(()=>{}, '请求失败, 原因：'+emsg)
         }
-        /// 加载成功
-        this.setData({ msgs: res.data })
-      },
-      fail: (emsg) => {
-        /// 加载失败
-        Toast('请求失败, 原因:：'+emsg)
-      },
-      complete: () => {
-        /// hide loding.....
-        Toast.clear()
-        /// 判断数据是否为空
-        this.setData({ isEmpty: this.data.msgs.length == 0 })
-      }
+      })
     })
   },
 

GuangZuan/miniprogram/mHome/pages/msg/msglist/index.wxml

@@ -1,7 +1,7 @@
 <!-- 导航栏 -->
-<van-nav-bar custom-style="background-color: #E92020">
-  <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-  <text slot="title" style="color: white;">公告消息</text>
+<van-nav-bar custom-style="background-color: #fff">
+  <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+  <text slot="title" style="color: #333;">公告消息</text>
 </van-nav-bar>
 
 <!-- tabs -->

GuangZuan/miniprogram/mHome/pages/search/index.ts

@@ -54,7 +54,7 @@ Page({
              {id: 23, name: 'Z', isCheck: false}, 
              {id: 24, name: '彩色', isCheck: false}],
     /// 选中形状
-    color: ['1'],
+    color: [1],
     /// 净度
     neatness: [{id: 1, name: 'FL', isCheck: true}, 
               {id: 2, name: 'IF', isCheck: false}, 
@@ -178,9 +178,7 @@ Page({
           return item
         }) })
         /// 赋值
-        this.setData({ color: this.data.colors.map(item => {
-          return item.id.toString()
-        }) })
+        this.setData({ color: this.data.colors.map(item => { return item.id }) })
         break;
       case 'neatness':   /// 净度
         this.setData({ neatness: this.data.neatness.map(item => {

GuangZuan/miniprogram/mHome/pages/search/index.wxml

@@ -3,9 +3,9 @@
   <!-- TopView -->
   <view class="top-view">
     <!-- 导航栏 -->
-    <van-nav-bar custom-style="background-color: #E92020">
-      <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-      <text slot="title" style="color: white;">钻石搜索</text>
+    <van-nav-bar custom-style="background-color: #fff">
+      <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+      <text slot="title" style="color: #333;">钻石搜索</text>
     </van-nav-bar>
 
     <!-- tabs -->

GuangZuan/miniprogram/mMine/pages/about/about/index.wxml

@@ -1,9 +1,9 @@
 <!-- top-view -->
 <view class="top-view">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">关于我们</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">关于我们</text>
   </van-nav-bar>
 </view>
 

GuangZuan/miniprogram/mMine/pages/address/list/index.ts

@@ -1,6 +1,6 @@
-import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
 import {queryUserReceiveInfo} from "../../../../services/api/common/index"
 import { userid } from "../../../../services/utils"
+import { hideLoading, showLoading } from "../../../../utils/message/index"
 
 Page({
 
@@ -21,32 +21,34 @@ Page({
    */
   queryUserReceiveInfo(){
     /// showLoading
-    Toast.loading({ message: '数据查询中.....'})
-    /// 发送查询请求
-    queryUserReceiveInfo({
-      data: { 
-        userid: userid() 
-      },
-      success: (res) => {
-        /// 加载失败
-        if (res.code != 200) {
-          Toast('数据加载失败，原因：'+res.msg)
-          return
+    showLoading(()=>{
+      /// 发送查询请求
+      queryUserReceiveInfo({
+        data: { 
+          userid: userid() 
+        },
+        success: (res) => {
+          /// 加载失败
+          if (res.code != 200) {
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          hideLoading(()=>{
+            /// 数据信息
+            this.setData({ 
+              infos: res.data,
+              isEmpty: res.data.length === 0
+             })
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
+        },
+        complete: () => {
+          /// 结束下拉刷新
+          wx.stopPullDownRefresh()
         }
-        /// 数据信息
-        this.setData({ infos: res.data })
-      },
-      fail: (emsg) => {
-        Toast('数据加载失败，原因：'+emsg)
-      },
-      complete: () => {
-        /// hideLoading
-        Toast.clear()
-        /// 结束下拉刷新
-        wx.stopPullDownRefresh()
-        /// 判断数据是否为空
-        this.setData({ isEmpty: this.data.infos.length == 0 })
-      }
+      })
     })
   },
 

GuangZuan/miniprogram/mMine/pages/address/operate/index.ts

@@ -3,6 +3,7 @@ import { sendMsgToMQ } from "../../../../services/api/common/index"
 import { divisions, isEncrypted, protoHeader, userid, timetample } from '../../../../services/utils'
 import { areaList } from '@vant/area-data';
 import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast";
+import { hideLoading, showLoading } from "../../../../utils/message/index";
 
 /// regions
 const regions = divisions()
@@ -138,39 +139,38 @@ Page({
    */
   deleteReciveInfoReq() {
     /// loding.....
-    Toast.loading({ message: '删除操作请求中.....'})
-    /// 参数信息
-    const userInfo = { 
-      ReceiveInfoId: this.data.autoid, 
-      Header: protoHeader(FunCode.DelUserReceiveInfoReq)  
-    }
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        data: JSON.stringify(userInfo),
-        funCodeReq: FunCode.DelUserReceiveInfoReq,
-        funCodeRsp: FunCode.DelUserReceiveInfoRsp,
-        isEncrypted: isEncrypted()
-      },
-      success: (res) => {
-        /// 操作失败
-        if (res.code != 0) {
-          Toast.fail({ message: '删除操作失败，原因：'+res.msg })
-          return 
-        }
-        /// 操作成功
-        Toast.success({ message: '删除操作成功' })
-        /// 返回上层视图
-        wx.navigateBack()
-      },
-      fail: (emsg) => {
-        /// 操作失败
-        Toast.fail({ message: '删除操作失败，原因：'+emsg })
-      }, complete: () => {
-        /// hideLoading
-        Toast.clear()
+    showLoading(()=>{
+      /// 参数信息
+      const userInfo = { 
+        ReceiveInfoId: this.data.autoid, 
+        Header: protoHeader(FunCode.DelUserReceiveInfoReq)  
       }
-    })
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          data: JSON.stringify(userInfo),
+          funCodeReq: FunCode.DelUserReceiveInfoReq,
+          funCodeRsp: FunCode.DelUserReceiveInfoRsp,
+          isEncrypted: isEncrypted()
+        },
+        success: (res) => {
+          /// 操作失败
+          if (res.code != 0) {
+            hideLoading(()=>{}, '删除操作失败，原因：'+res.msg, 'error')
+            return 
+          }
+          /// 操作成功
+          hideLoading(()=>{
+            /// 返回上层视图
+            wx.navigateBack()
+          }, '删除操作成功', 'success')
+        },
+        fail: (emsg) => {
+          /// 操作失败
+          hideLoading(()=>{}, '删除操作失败，原因：'+emsg, 'error')
+        }
+      })
+    }, '删除操作请求中.....')
   },
 
   /**
@@ -178,39 +178,37 @@ Page({
    */
   receiveIsDefaultReq() {
     /// loding.....
-    Toast.loading({ message: '操作请求中.....'})
-    /// 参数信息
-    const data = { 
-      AutoId: this.data.autoid, 
-      UserId: userid(),
-      Header: protoHeader(FunCode.UserReceiveIsDefaultReq)  
-    }
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        data: JSON.stringify(data),
-        funCodeReq: FunCode.UserReceiveIsDefaultReq,
-        funCodeRsp: FunCode.UserReceiveIsDefaultRsp,
-        isEncrypted: isEncrypted()
-      },
-      success: (res) => {
-        /// 操作失败
-        if (res.code != 0) {
-          Toast.fail('操作失败，原因：'+res.msg)
-          return 
-        }
-        /// 操作成功
-        Toast.success('操作成功')
-        /// 返回上层视图
-        wx.navigateBack()
-      },
-      fail: (emsg) => {
-        /// 操作失败
-        Toast.fail('操作失败，原因：'+emsg)
-      }, complete: () => {
-        /// hideLoading
-        Toast.clear()
+    showLoading(()=> {
+      /// 参数信息
+      const data = { 
+        AutoId: this.data.autoid, 
+        UserId: userid(),
+        Header: protoHeader(FunCode.UserReceiveIsDefaultReq)  
       }
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          data: JSON.stringify(data),
+          funCodeReq: FunCode.UserReceiveIsDefaultReq,
+          funCodeRsp: FunCode.UserReceiveIsDefaultRsp,
+          isEncrypted: isEncrypted()
+        },
+        success: (res) => {
+          /// 操作失败
+          if (res.code != 0) {
+            hideLoading(()=>{}, '操作失败，原因：'+res.msg, 'error')
+            return 
+          }
+          hideLoading(()=>{
+            /// 返回上层视图
+            wx.navigateBack()
+          }, '操作成功', 'success')        
+        },
+        fail: (emsg) => {
+          /// 操作失败
+          hideLoading(()=>{}, '操作失败，原因：'+emsg, 'error')
+        }
+      })
     })
   },
 
@@ -221,50 +219,49 @@ Page({
     /// 合规性校验
     if (!this.check()) { return }
     /// loding.....
-    Toast.loading('操作请求中......')
-    /// 参数信息
-    const userInfo = { ClientSerialID: timetample(), 
-                       UserID: userid(),
-                       ReceiverName: this.data.username,
-                       CardTypeID: 0,
-                       CardNum: '0',
-                       PhoneNum: this.data.mobile,
-                       CountryID: 0,
-                       ProvinceID: this.data.province,
-                       CityID: this.data.city,
-                       DistrictID: this.data.country,
-                       Address: this.data.detailAddress,
-                       TakeRemark: '',
-                       ReceiveInfoId: this.data.autoid,
-                       Header: protoHeader(FunCode.UserReceiveInfoReq)
-              }
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        data: JSON.stringify(userInfo),
-        funCodeReq: FunCode.UserReceiveInfoReq,
-        funCodeRsp: FunCode.UserReceiveInfoRsp,
-        isEncrypted: isEncrypted()
-      },
-      success: (res) => {
-        /// 操作失败
-        if (res.code != 0) {
-          Toast.fail('操作失败，原因：'+res.msg)
-          return 
-        }
-        /// 操作成功
-        Toast.success('操作成功')
-        /// 返回上层视图
-        wx.navigateBack()
-      },
-      fail: (emsg) => {
-        /// 操作失败
-        Toast.fail('操作失败，原因：'+emsg)
-      }, complete: () => {
-        /// hideLoading
-        Toast.clear()
+    showLoading(()=> {
+      /// 参数信息
+      const userInfo = { ClientSerialID: timetample(), 
+        UserID: userid(),
+        ReceiverName: this.data.username,
+        CardTypeID: 0,
+        CardNum: '0',
+        PhoneNum: this.data.mobile,
+        CountryID: 0,
+        ProvinceID: this.data.province,
+        CityID: this.data.city,
+        DistrictID: this.data.country,
+        Address: this.data.detailAddress,
+        TakeRemark: '',
+        ReceiveInfoId: this.data.autoid,
+        Header: protoHeader(FunCode.UserReceiveInfoReq)
       }
-    })
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          data: JSON.stringify(userInfo),
+          funCodeReq: FunCode.UserReceiveInfoReq,
+          funCodeRsp: FunCode.UserReceiveInfoRsp,
+          isEncrypted: isEncrypted()
+        },
+        success: (res) => {
+          /// 操作失败
+          if (res.code != 0) {
+            hideLoading(()=>{}, '操作失败，原因：'+res.msg, 'error')
+            return 
+          }
+          /// 操作失败
+          hideLoading(()=>{
+            /// 返回上层视图
+            wx.navigateBack()
+          }, '操作成功', 'success')
+        },
+        fail: (emsg) => {
+          /// 操作失败
+          hideLoading(()=>{}, '操作失败，原因：'+emsg, 'error')
+        }
+      })
+    }, '操作请求中......')
   },
 
   /**

GuangZuan/miniprogram/mMine/pages/bank/index.ts

@@ -3,6 +3,7 @@ import Toast from "../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { queryBankAccountSign, queryCusBankSignBank } from "../../../services/api/account/index"
 import { sendMsgToMQ } from "../../../services/api/common/index"
 import { accountid, isEncrypted, loginQuery, protoHeader, timetample, userid } from "../../../services/utils"
+import { hideLoading, showLoading } from "../../../utils/message/index"
 
 Page({
 
@@ -71,27 +72,31 @@ Page({
    * 查询托管银行信息
    */
   queryCusBankInfo() {
-    /// 发送请求
-    queryCusBankSignBank({
-      success: (res) => {
-        /// 请求失败
-        if (res.code != 200) {
-          Toast.fail({message: '托管银行请求失败，原因：'+res.msg})
-          return
+    /// showLoading
+    showLoading(()=>{
+      /// 发送请求
+      queryCusBankSignBank({
+        success: (res) => {
+          /// 请求失败
+          if (res.code != 200) {
+            hideLoading(()=>{}, '托管银行请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          hideLoading(()=>{
+            /// 数据赋值
+            this.setData({ 
+              cusBankInfo: res.data[0],
+              /// 银行信息
+              bankInfos: res.data[0].Banklst,
+              /// 银行名称信息
+              bankNames: res.data[0].Banklst.map(obj => { return obj.bankname })
+            })
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, '托管银行请求失败，原因：'+emsg, 'error')
         }
-        /// 数据赋值
-        this.setData({ 
-          cusBankInfo: res.data[0],
-          /// 银行信息
-          bankInfos: res.data[0].Banklst,
-          /// 银行名称信息
-          bankNames: res.data[0].Banklst.map(obj => { return obj.bankname })
-        })
-      },
-      fail: (emsg) => {
-        Toast.fail({message: '托管银行请求失败，原因：'+emsg})
-      },
-      complete: () => {}
+      })
     })
   },
 
@@ -99,24 +104,29 @@ Page({
    * 查询用户已签约信息
    */
   queryBankAccountSign() {
-    /// 发送请求
-    queryBankAccountSign({
-      data: {
-        userid: userid()
-      },
-      success: (res) => {
-        /// 请求失败
-        if (res.code != 200) {
-          Toast.fail({message: '用户签约信息请求失败，原因：'+res.msg})
-          return
+    /// showLoading
+    showLoading(()=>{
+      /// 发送请求
+      queryBankAccountSign({
+        data: {
+          userid: userid()
+        },
+        success: (res) => {
+          /// 请求失败
+          if (res.code != 200) {
+            hideLoading(()=>{}, '用户签约信息请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          /// hideLoading
+          hideLoading(()=>{
+            /// 数据赋值
+            this.setData({ bankAccountSign: res.data[0] })
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, '用户签约信息请求失败，原因：'+emsg, 'error')
         }
-        /// 数据赋值
-        this.setData({ bankAccountSign: res.data[0] })
-      },
-      fail: (emsg) => {
-        Toast.fail({message: '托管银行请求失败，原因：'+emsg})
-      },
-      complete: () => {}
+      })
     })
   },
 
@@ -143,82 +153,80 @@ Page({
     /// 合规性校验
     if (!this.check()) { return }
     /// loading
-    Toast.loading({ message: '签约请求中.....' })
-    /// 用户信息
-    const userinfo = loginQuery().userInfo
-    /// 参数信息
-    const param = { 
-      /// 扩展信息（JSON串，参考配置要求进行填充）
-      extend_info: {"sex": 1},
-      /// 收款支行名称
-      BranchBankName: this.data.branchBankName,
-      /// 交易所业务日期
-      TradeDate: this.data.cusBankInfo.tradedate,
-      /// 账户类型[1-对私;2-对公]
-      AccountType: 1,
-      /// 币种
-      Currency: this.data.cusBankInfo.currency,
-      /// 是否强制[0-否;1-是]强制，只更新中心签约信息，不发送银行。用于银行信息不一致的情况
-      IsForce: 0,
-      /// 授权代理人证件类型
-      AgentCertType: 0,
-      /// 变更类型[1-增加;2-修改;4-绑卡;
-      OperateType: 1,
-      /// 银行卡类型
-      BankCardType: 0,
-      /// 银行账户类型
-      BankAccountType: 1,
-      /// 客户名称
-      AccountName: this.data.accountName,
-      /// 银行账户名称
-      BankAccountName: this.data.accountName,
-      /// 银行账户
-      BankAccountNo: this.data.bankNo,
-      /// 开户支行名称
-      OpenBankName: this.data.branchBankName,
-      /// 银行卡行号
-      OpenBankAccId: this.data.bankInfo.bankid,
-      /// 托管银行编号
-      CusBankID: this.data.cusBankInfo.cusbankid,
-      /// 账户
-      AccountCode: accountid(),
-      /// 外部操作流水号
-      ExtOperatorID: timetample(),
-      /// 证件号码
-      CertID: userinfo.cardnum,
-      /// 证件类型
-      CertType:userinfo.cardtypeid,
-      /// 头部
-      Header: protoHeader(FunCode.T2bBankWithdrawReq)  
-    }
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        funCodeReq: FunCode.T2bBankWithdrawReq,
-        funCodeRsp: FunCode.T2bBankWithdrawRsp,
-        isEncrypted: isEncrypted(),
-        data: JSON.stringify(param)
-      },
-      success: (res) => {
-        /// 请求失败
-        if (res.code != 0) {
-          Toast({message: '签约请求失败，原因：'+res.msg, duration: 3000})
-          return
-        }
-        /// 请求成功
-        Toast.success({message: '签约请求成功', onClose: () => {
-          /// 返回上层视图
-          wx.navigateBack()
-        }})
-      }, 
-      fail: (emsg) => {
-        Toast({message: '签约请求失败，原因：'+emsg, duration: 3000})
-      },
-      complete: () => {
-        /// 清除Toast
-        Toast.clear()
+    showLoading(()=>{
+      /// 用户信息
+      const userinfo = loginQuery().userInfo
+      /// 参数信息
+      const param = { 
+        /// 扩展信息（JSON串，参考配置要求进行填充）
+        extend_info: JSON.stringify({ "sex" : 1 }),
+        /// 交易所业务日期
+        TradeDate: this.data.cusBankInfo.tradedate,
+        /// 账户类型[1-对私;2-对公]
+        AccountType: 1,
+        /// 币种
+        Currency: this.data.cusBankInfo.currency,
+        /// 是否强制[0-否;1-是]强制，只更新中心签约信息，不发送银行。用于银行信息不一致的情况
+        IsForce: 0,
+        /// 授权代理人证件类型
+        AgentCertType: 0,
+        /// 变更类型[1-增加;2-修改;4-绑卡;
+        OperateType: 1,
+        /// 银行卡类型
+        BankCardType: 0,
+        /// 银行账户类型
+        BankAccountType: 1,
+        /// 客户名称
+        AccountName: this.data.accountName,
+        /// 银行账户名称
+        BankAccountName: this.data.accountName,
+        /// 银行账户
+        BankAccountNo: this.data.bankNo,
+        /// 开户支行名称
+        OpenBankName: this.data.branchBankName,
+        /// 银行卡行号
+        OpenBankAccId: this.data.bankInfo.bankid,
+        /// 托管银行编号
+        CusBankID: this.data.cusBankInfo.cusbankid,
+        /// 开户行名称
+        ExBankName: this.data.bankInfo.bankname,
+        /// 账户
+        AccountCode: accountid().toString(),
+        /// 外部操作流水号
+        ExtOperatorID: timetample(),
+        /// 证件号码
+        CertID: userinfo.cardnum,
+        /// 证件类型
+        CertType: userinfo.cardtypeid.toString(),
+        /// 头部
+        Header: protoHeader(FunCode.T2bBankSignReq)  
       }
-    })
+      
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          funCodeReq: FunCode.T2bBankSignReq,
+          funCodeRsp: FunCode.T2bBankSignReq,
+          isEncrypted: isEncrypted(),
+          data: JSON.stringify(param)
+        },
+        success: (res) => {
+          /// 请求失败
+          if (res.code != 0) {
+            hideLoading(()=>{}, '签约请求请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          /// 请求成功
+          hideLoading(()=>{
+            /// 返回上层视图
+            wx.navigateBack()
+          }, '签约请求成功', 'success')
+        }, 
+        fail: (emsg) => {
+          hideLoading(()=>{}, '签约请求请求失败，原因：'+emsg, 'error')
+        }
+      })
+    }, '签约请求中.....')
   },
 
   /**
@@ -226,59 +234,53 @@ Page({
    */
   doCancelBankAccountSign() {
     /// loading
-    Toast.loading({ message: '解约请求中.....' })
-
-    /// 参数信息
-    const param = {
-      /// 头部
-      Header: protoHeader(FunCode.T2bBankCancelSignReq),  
-      /// 外部操作流水号
-      ExtOperatorID: timetample(),
-      /// 账户
-      AccountCode: this.data.bankAccountSign.accountcode,
-      /// 托管银行编号
-      CusBankID: this.data.bankAccountSign.cusbankid,
-      /// 币种
-      Currency: this.data.bankAccountSign.currency,
-      /// 交易所业务日期
-      TradeDate: this.data.cusBankInfo.tradedate,
-      /// 是否强制
-      isForce: 0,
-      /// 银行子账号
-      BankChildAcc: this.data.bankAccountSign.bankaccountno,
-      /// 银行子账号名
-      BankChildAccName: this.data.bankAccountSign.bankaccountname
-    }
-
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        isEncrypted: isEncrypted(),
-        funCodeReq: FunCode.T2bBankCancelSignReq,
-        funCodeRsp: FunCode.T2bBankCancelSignRsp,
-        data: JSON.stringify(param)
-      },
-      success: (res) => {
-        /// 请求失败
-        if (res.code != 0) {
-          Toast({message: '解约请求失败，原因：'+res.msg})
-          return
-        }
-        /// 请求成功
-        Toast.success({message: '解约请求成功', onClose: () => {
-          /// 返回上层视图
-          wx.navigateBack()
-        }})
-      },
-      fail: (emsg) => {
-        Toast({message: '解约请求失败，原因：'+emsg})
-      },
-      complete: () => {
-        /// 清除Toast
-        Toast.clear()
+    showLoading(()=>{
+      /// 参数信息
+      const param = {
+        /// 头部
+        Header: protoHeader(FunCode.T2bBankCancelSignReq),  
+        /// 外部操作流水号
+        ExtOperatorID: timetample(),
+        /// 账户
+        AccountCode: this.data.bankAccountSign.accountcode,
+        /// 托管银行编号
+        CusBankID: this.data.bankAccountSign.cusbankid,
+        /// 币种
+        Currency: this.data.bankAccountSign.currency,
+        /// 交易所业务日期
+        TradeDate: this.data.cusBankInfo.tradedate,
+        /// 是否强制
+        isForce: 0,
+        /// 银行子账号
+        BankChildAcc: this.data.bankAccountSign.bankaccountno,
+        /// 银行子账号名
+        BankChildAccName: this.data.bankAccountSign.bankaccountname
       }
-    })
-
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          isEncrypted: isEncrypted(),
+          funCodeReq: FunCode.T2bBankCancelSignReq,
+          funCodeRsp: FunCode.T2bBankCancelSignRsp,
+          data: JSON.stringify(param)
+        },
+        success: (res) => {
+          /// 请求失败
+          if (res.code != 0) {
+            hideLoading(()=>{}, '解约请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          /// 请求成功
+          hideLoading(()=>{
+            /// 返回上层视图
+            wx.navigateBack()
+          }, '解约请求成功', 'success')
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, '解约请求失败，原因：'+emsg, 'error')
+        }
+      })
+    }, '解约请求中.....')
   },
 
   /**

GuangZuan/miniprogram/mMine/pages/bank/index.wxml

@@ -1,8 +1,8 @@
 <view class="topView">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">添加签约账户</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">添加签约账户</text>
   </van-nav-bar>
 </view>
 

GuangZuan/miniprogram/mMine/pages/inoutgold/index.less

@@ -39,8 +39,8 @@
     }
 
     .credentials {
-      height: 130px;
-
+      height: 150px;
+      
       .credentials-top-view {
         display: flex;
         flex-direction: column;
@@ -59,6 +59,7 @@
           display: flex;
           justify-content: left;
           align-items: center;
+          margin-top: 10px;
         }
       }
     }

GuangZuan/miniprogram/mMine/pages/inoutgold/index.ts

@@ -4,7 +4,8 @@ import services from "../../../services/index"
 import { queryBankAccountSign } from "../../../services/api/account/index"
 import { sendMsgToMQ } from "../../../services/api/common/index"
 import { accountid, isEncrypted, loginQuery, protoHeader, timetample, userid } from "../../../services/utils"
-import { formatDate } from "../../../utils/util"
+import { formatDate, isnullstr } from "../../../utils/util"
+import { hideLoading, showLoading } from "../../../utils/message/index"
 
 // mMine/pages/inoutgold/index.ts
 Page({
@@ -30,7 +31,9 @@ Page({
     /// 文件上传列表
     fileList: [],
     /// 上传的文件路径
-    filePath: ''
+    filePath: '',
+    /// 显示信息
+    sign: {}
   },
 
   /**
@@ -101,196 +104,190 @@ Page({
    */
   queryBankAccountSign() {
     /// loding.....
-    Toast.loading({message: '查询账户签约信息.....'})
-    /// 发送请求
-    queryBankAccountSign({
-      data: {
-        userid: userid()
-      },
-      success: (res) => {
-        /// 请求失败
-        if (res.code != 200) {
-          Toast.fail({message: '用户签约信息请求失败，原因：'+res.msg})
-          return
-        }
-        /// 数据赋值
-        this.setData({ bankAccountSign: res.data[0] })
-      },
-      fail: (emsg) => {
-        Toast.fail({message: '托管银行请求失败，原因：'+emsg})
-      },
-      complete: () => {}
+    showLoading(() => {
+      /// 发送请求
+      queryBankAccountSign({
+        data: {
+          userid: userid()
+        },
+        success: (res) => {
+          /// 请求失败
+          if (res.code != 200) {
+            hideLoading(() => {}, '用户签约信息请求失败，原因：'+res.msg)
+            return
+          }
+          hideLoading(() => {
+            /// 数据赋值
+            this.setData({ 
+              bankAccountSign: res.data[0],
+              sign: res.data.map(obj=>{
+                return {
+                  bankname: obj.bankname,
+                  cardno: isnullstr(obj.cardno),
+                  bankaccountname: isnullstr(obj.bankaccountname),
+                  branchbankname: isnullstr(obj.branchbankname)
+                }
+              })[0]
+            })
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(() => {}, '托管银行请求失败，原因：'+emsg)
+        },
+        complete: () => {}
+      })
     })
   },
 
   /// 账户资金信息请求
   accountFundInfo() {
-    /// 参数信息
-    const param = {
-      /// 头部
-      Header: protoHeader(FunCode.AccountFundInfoReq),
-      /// uint32 查询位掩码
-      QueryBitMask: 2,
-      /// uint64 查询资金账号
-      AccountId: accountid(),
-      /// uint64 查询委托单号
-      OrderId: timetample()
-    }
-
     /// loding....
-    Toast.loading({message: '账户资金信息请求中......'})
-
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        isEncrypted: isEncrypted(),
-        funCodeReq: FunCode.AccountFundInfoReq,
-        funCodeRsp: FunCode.AccountFundInfoReq,
-        data: JSON.stringify(param)
-      },
-      success: (res) => {
-        /// 请求失败
-        if (res.code != 0) {
-          Toast({message: '账户资金信息请求失败，原因：'+res.msg, duration: 3000})
-          return
-        }
-      }, 
-      fail: (emsg) => {
-        Toast({message: '账户资金信息请求失败，原因：'+emsg, duration: 3000})
-      },
-      complete: () => {
-        /// 清除Toast
-        Toast.clear()
+    showLoading(()=>{
+      /// 参数信息
+      const param = {
+        /// 头部
+        Header: protoHeader(FunCode.AccountFundInfoReq),
+        /// uint32 查询位掩码
+        QueryBitMask: 2,
+        /// uint64 查询资金账号
+        AccountId: accountid(),
       }
-    })
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          isEncrypted: isEncrypted(),
+          funCodeReq: FunCode.AccountFundInfoReq,
+          funCodeRsp: FunCode.AccountFundInfoReq,
+          data: JSON.stringify(param)
+        },
+        success: (res) => {
+          /// 请求失败
+          if (res.code != 0) {
+            hideLoading(()=>{}, '账户资金信息请求失败，原因：'+res.msg, 'error')
+            return
+          }
+        }, 
+        fail: (emsg) => {
+          hideLoading(()=>{}, '账户资金信息请求失败，原因：'+emsg, 'error')
+        }
+      })
+    }, '账户资金信息请求中......')
   },
 
   /// 入金申请请求
   doInMoneyApply() {
     /// 合规性校验
     if (!this.check()) { return }
-    
-    /// 参数信息
-    const param = {
-      /// 头部
-      Header: protoHeader(FunCode.T2bBankDepositReq),
-      /// 外部操作流水号
-      ExtOperatorID: timetample(),
-      /// 托管银行编号
-      CusBankID: this.data.bankAccountSign.cusbankid,
-      /// 金额
-      Amount: this.data.inamount,
-      /// 币种
-      Currency: this.data.bankAccountSign.currency,
-      /// 银行卡号
-      BankAccoutNum: this.data.bankAccountSign.bankaccountno2,
-      /// 银行子账号名
-      BankAccoutName: this.data.bankAccountSign.bankaccountname2,
-      /// 资金账户
-      AccountCode: this.data.bankAccountSign.accountcode,
-      /// 扩展信息（JSON串，参考配置要求进行填充）
-      extend_info: {"sex": 1, "certificate_photo_url": this.data.filePath},
-    }
-
-    /// loding....
-    Toast.loading({message: '入金请求中......'})
-
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        isEncrypted: isEncrypted(),
-        funCodeReq: FunCode.T2bBankDepositReq,
-        funCodeRsp: FunCode.T2bBankDepositRsp,
-        data: JSON.stringify(param)
-      },
-      success: (res) => {
-        /// 请求失败
-        if (res.code != 0) {
-          Toast({message: '入金申请请求失败，原因：'+res.msg, duration: 3000})
-          return
-        }
-        /// 请求成功
-        Toast.success({message: '入金申请请求成功', onClose: () => {
-          /// 返回上层视图
-          wx.navigateBack()
-        }})
-      }, 
-      fail: (emsg) => {
-        Toast({message: '入金申请请求失败，原因：'+emsg, duration: 3000})
-      },
-      complete: () => {
-        /// 清除Toast
-        Toast.clear()
+    /// showLoading
+    showLoading(()=>{
+      /// 参数信息
+      const param = {
+        /// 头部
+        Header: protoHeader(FunCode.T2bBankDepositReq),
+        /// 外部操作流水号
+        ExtOperatorID: timetample(),
+        /// 托管银行编号
+        CusBankID: this.data.bankAccountSign.cusbankid,
+        /// 金额
+        Amount: this.data.inamount,
+        /// 币种
+        Currency: this.data.bankAccountSign.currency,
+        /// 银行卡号
+        BankAccoutNum: this.data.bankAccountSign.bankaccountno2,
+        /// 银行子账号名
+        BankAccoutName: this.data.bankAccountSign.bankaccountname2,
+        /// 资金账户
+        AccountCode: this.data.bankAccountSign.accountcode,
+        /// 扩展信息（JSON串，参考配置要求进行填充）
+        Extend_Info: {"sex": 1, "certificate_photo_url": this.data.filePath},
       }
-    })
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          isEncrypted: isEncrypted(),
+          funCodeReq: FunCode.T2bBankDepositReq,
+          funCodeRsp: FunCode.T2bBankDepositRsp,
+          data: JSON.stringify(param)
+        },
+        success: (res) => {
+          /// 请求失败
+          if (res.code != 0) {
+            hideLoading(()=>{}, '入金申请请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          /// 请求成功
+          hideLoading(()=>{
+            /// 返回上层视图
+            wx.navigateBack()
+          }, '入金申请请求成功', 'success')
+        }, 
+        fail: (emsg) => {
+          hideLoading(()=>{}, '入金申请请求失败，原因：'+emsg, 'error')
+        }
+      })
+    }, '入金请求中......')
   },
 
   /// 出金申请请求
   doOutMoneyApply() {
     /// 合规性校验
     if (!this.check()) { return }
-    
-    /// 参数信息
-    const param = {
-      /// 头部
-      Header: protoHeader(FunCode.T2bBankWithdrawReq),
-      /// 外部操作流水号
-      ExtOperatorID: timetample(),
-      /// 托管银行编号
-      CusBankID: this.data.bankAccountSign.cusbankid,
-      /// 金额
-      Amount: this.data.outamount,
-      /// 币种
-      Currency: this.data.bankAccountSign.currency,
-      /// 银行卡号
-      BankAccoutNum: this.data.bankAccountSign.bankaccountno2,
-      /// 银行子账号名
-      BankAccoutName: this.data.bankAccountSign.bankaccountname2,
-      /// 资金账户
-      AccountCode: this.data.bankAccountSign.accountcode,
-      /// 扩展信息（JSON串，参考配置要求进行填充）
-      extend_info: {"sex": 1},
-      /// 银行卡行号
-      OpenCardBankId: this.data.bankAccountSign.bankid,
-      /// 收款支行名称
-      BranchBankName: this.data.bankAccountSign.branchbankname,
-      /// 申请日期和时间
-      AppDateTime: formatDate(new Date()),
-      /// 账户类型
-      AccountType: 0
-    }
-
     /// loding....
-    Toast.loading({message: '出金请求中......'})
-
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        isEncrypted: isEncrypted(),
-        funCodeReq: FunCode.T2bBankWithdrawReq,
-        funCodeRsp: FunCode.T2bBankWithdrawRsp,
-        data: JSON.stringify(param)
-      },
-      success: (res) => {
-        /// 请求失败
-        if (res.code != 0) {
-          Toast({message: '出金申请请求失败，原因：'+res.msg, duration: 3000})
-          return
-        }
-        /// 请求成功
-        Toast.success({message: '出金申请请求成功', onClose: () => {
-          /// 返回上层视图
-          wx.navigateBack()
-        }})
-      }, 
-      fail: (emsg) => {
-        Toast({message: '出金申请请求失败，原因：'+emsg, duration: 3000})
-      },
-      complete: () => {
-        /// 清除Toast
-        Toast.clear()
+    showLoading(()=>{
+      /// 参数信息
+      const param = {
+        /// 头部
+        Header: protoHeader(FunCode.T2bBankWithdrawReq),
+        /// 外部操作流水号
+        ExtOperatorID: timetample(),
+        /// 托管银行编号
+        CusBankID: this.data.bankAccountSign.cusbankid,
+        /// 金额
+        Amount: this.data.outamount,
+        /// 币种
+        Currency: this.data.bankAccountSign.currency,
+        /// 银行卡号
+        BankAccoutNum: this.data.bankAccountSign.bankaccountno2,
+        /// 银行子账号名
+        BankAccoutName: this.data.bankAccountSign.bankaccountname2,
+        /// 资金账户
+        AccountCode: this.data.bankAccountSign.accountcode,
+        /// 扩展信息（JSON串，参考配置要求进行填充）
+        Extend_Info: {"sex": 1},
+        /// 银行卡行号
+        OpenCardBankId: this.data.bankAccountSign.bankid,
+        /// 收款支行名称
+        BranchBankName: this.data.bankAccountSign.branchbankname,
+        /// 申请日期和时间
+        AppDateTime: formatDate(new Date()),
+        /// 账户类型
+        AccountType: 0
       }
-    })
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          isEncrypted: isEncrypted(),
+          funCodeReq: FunCode.T2bBankWithdrawReq,
+          funCodeRsp: FunCode.T2bBankWithdrawRsp,
+          data: JSON.stringify(param)
+        },
+        success: (res) => {
+          /// 请求失败
+          if (res.code != 0) {
+            hideLoading(()=>{}, '出金申请请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          /// 请求成功
+          hideLoading(()=>{
+            /// 返回上层视图
+            wx.navigateBack()
+          }, '出金申请请求成功', 'success')
+        }, 
+        fail: (emsg) => {
+          hideLoading(()=>{}, '出金申请请求失败，原因：'+emsg, 'error')
+        }
+      })
+    }, '出金请求中......')
   },
 
   /// 合规性校验
@@ -330,7 +327,6 @@ Page({
         return false
       }
     }
-
     return true
   },
 

GuangZuan/miniprogram/mMine/pages/inoutgold/index.wxml

@@ -1,9 +1,9 @@
 
 <view class="topView">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">充值提现</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">充值提现</text>
   </van-nav-bar>
 
   <!-- tabs -->
@@ -52,25 +52,25 @@
     <!-- 开户银行 -->
     <view class="item bankName">
       <text class="title">开户银行</text>
-      <text class="value">{{bankAccountSign.bankname}}</text>
+      <text class="value">{{sign.bankname}}</text>
     </view>
 
     <!-- 银行卡号 -->
     <view class="item banNo">
       <text class="title">银行卡号</text>
-      <text class="value">{{bankAccountSign.cardno}}</text>
+      <text class="value">{{sign.cardno}}</text>
     </view>
 
     <!-- 姓名 -->
     <view class="item accountName">
       <text class="title">姓名</text>
-      <text class="value">{{bankAccountSign.bankaccountname}}</text>
+      <text class="value">{{sign.bankaccountname}}</text>
     </view>
 
     <!-- 支行名称 -->
     <view class="item branchBankName">
       <text class="title">支行名称</text>
-      <text class="value">{{bankAccountSign.branchbankname}}</text>
+      <text class="value">{{sign.branchbankname}}</text>
     </view>
   </view>
 
@@ -79,7 +79,7 @@
 
   <!-- 按钮 -->
   <view class="button-view">
-    <van-button custom-class="submit" id="submit" color="linear-gradient(to right, #4bb0ff, #6149f6)" block bind:click="onButtonPressed">确定</van-button>
+    <van-button custom-class="submit" id="submit" round color="linear-gradient(to right, #4bb0ff, #6149f6)" block bind:click="onButtonPressed">确定</van-button>
   </view>
 </view>
 

GuangZuan/miniprogram/mMine/pages/invoice/list/index.ts

@@ -1,6 +1,6 @@
-import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { queryWrUserReceiptInfo } from "../../../../services/api/common/index"
 import { userid } from "../../../../services/utils"
+import { hideLoading, showLoading } from "../../../../utils/message/index"
 
 Page({
 
@@ -45,33 +45,34 @@ Page({
   /// 查询用户发票信息
   queryWrUserReceiptInfo() {
     /// showLoading
-    Toast.loading({ message: '数据查询中.....'})
-
-    /// 发送查询请求
-    queryWrUserReceiptInfo({
-      data: {
-        userid: userid()
-      },
-      success: (res) => {
-        /// 加载失败
-        if (res.code != 200) {
-          Toast('数据加载失败，原因：'+res.msg)
-          return
+    showLoading(()=>{
+      /// 发送查询请求
+      queryWrUserReceiptInfo({
+        data: {
+          userid: userid()
+        },
+        success: (res) => {
+          /// 加载失败
+          if (res.code != 200) {
+            hideLoading(()=>{}, '数据加载失败，原因：'+res.msg, 'error')
+            return
+          }
+          /// 数据信息
+          hideLoading(()=>{
+            this.setData({ 
+              infos: res.data,
+              isEmpty: res.data.length === 0
+            })
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, '数据加载失败，原因：'+emsg, 'error')
+        },
+        complete: () => {
+          /// 结束下拉刷新
+          wx.stopPullDownRefresh()
         }
-        /// 数据信息
-        this.setData({ infos: res.data })
-      },
-      fail: (emsg) => {
-        Toast('数据加载失败，原因：'+emsg)
-      },
-      complete: () => {
-        /// 清楚Toast
-        Toast.clear()
-        /// 结束下拉刷新
-        wx.stopPullDownRefresh()
-        /// 判断数据是否为空
-        this.setData({ isEmpty: this.data.infos.length == 0 })
-      }
+      })
     })
   },
 

GuangZuan/miniprogram/mMine/pages/invoice/list/index.wxml

@@ -2,9 +2,9 @@
 <!-- 内容 -->
 <view class="container" style="padding-bottom: {{safeBottom}}px;">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">发票信息</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">发票信息</text>
   </van-nav-bar>
 
   <!-- 数据列表 -->

GuangZuan/miniprogram/mMine/pages/invoice/operate/index.ts

@@ -1,7 +1,7 @@
 import { FunCode } from "../../../../constants/enum/funcode"
 import { protoHeader, userid, isEncrypted, timetample } from "../../../../services/utils"
 import { sendMsgToMQ } from "../../../../services/api/common/index"
-import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
+import { hideLoading, showLoading, showToast } from "../../../../utils/message/index"
 
 Page({
 
@@ -50,13 +50,13 @@ Page({
   check(): boolean {
     /// 请输入发票抬头
     if (this.data.inname.length == 0) {
-      Toast.fail('请输入发票抬头！')
+      showToast('请输入发票抬头！')
       return false
     }
 
     /// 请输入纳税人识别号
     if (this.data.inno.length == 0 && this.data.type != 1) {
-      Toast.fail('请输入纳税人识别号！')
+      showToast('请输入纳税人识别号！')
       return false
     }
     return true
@@ -69,23 +69,23 @@ Page({
     /// 合规性校验
     if (!this.check()) { return }
     /// loding.....
-    Toast.loading('操作请求中......')
-    /// 参数信息
-    const userInfo = { ClientSerialID: timetample(), 
-                       UserID: userid(),
-                       UserName: this.data.inname,
-                       ReceiptType: this.data.type,
-                       TaxpayerID: this.data.inno,
-                       Address: this.data.inaddress,
-                       ReceiptBank: this.data.bankname,
-                       ReceiptAccount: this.data.bankno,
-                       ReceiptInfoId: this.data.autoid,
-                       ContactInfo: this.data.inmobile,
-                       Header: protoHeader(FunCode.UserReceiptInfoReq)
-              }
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
+    showLoading(()=>{
+      /// 参数信息
+      const userInfo = { ClientSerialID: timetample(), 
+        UserID: userid(),
+        UserName: this.data.inname,
+        ReceiptType: this.data.type,
+        TaxpayerID: this.data.inno,
+        Address: this.data.inaddress,
+        ReceiptBank: this.data.bankname,
+        ReceiptAccount: this.data.bankno,
+        ReceiptInfoId: this.data.autoid,
+        ContactInfo: this.data.inmobile,
+        Header: protoHeader(FunCode.UserReceiptInfoReq)
+      }
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
         data: JSON.stringify(userInfo),
         funCodeReq: FunCode.UserReceiptInfoReq,
         funCodeRsp: FunCode.UserReceiptInfoReq,
@@ -94,22 +94,21 @@ Page({
       success: (res) => {
         /// 操作失败
         if (res.code != 0) {
-          Toast.fail('操作失败，原因：'+res.msg)
+          hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
           return 
         }
         /// 操作成功
-        Toast.success('操作成功')
-        /// 返回上层视图
-        wx.navigateBack()
+        hideLoading(()=>{
+          /// 返回上层视图
+          wx.navigateBack()
+        }, '操作成功', 'success')
       },
       fail: (emsg) => {
         /// 操作失败
-        Toast.fail('操作失败，原因：'+emsg)
-      }, complete: () => {
-        /// hideLoading
-        Toast.clear()
-      }
+        hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
+      },
     })
+    }, '操作请求中......')
   },
 
   /**
@@ -117,8 +116,8 @@ Page({
    */
   deleteUserReceiptInfoReqReq() {
     /// loding.....
-    Toast.loading('删除操作请求中......')
-    /// 参数信息
+    showLoading(()=>{
+      /// 参数信息
     const userInfo = { 
       ReceiptInfoId: this.data.autoid, 
       Header: protoHeader(FunCode.DelUserReceiptInfoReq)  
@@ -134,22 +133,22 @@ Page({
       success: (res) => {
         /// 操作失败
         if (res.code != 0) {
-          Toast.fail('删除操作失败，原因：'+res.msg)
+          /// 操作失败
+          hideLoading(()=>{}, '删除操作请求失败，原因：'+res.msg, 'error')
           return 
         }
         /// 操作成功
-        Toast.success('操作成功')
-        /// 返回上层视图
-        wx.navigateBack()
+        hideLoading(()=>{
+          /// 返回上层视图
+          wx.navigateBack()
+        }, '操作成功', 'success')
       },
       fail: (emsg) => {
         /// 操作失败
-        Toast.fail('删除操作失败，原因：'+emsg)
-      }, complete: () => {
-        /// hideLoading
-        Toast.clear()
+        hideLoading(()=>{}, '删除操作请求失败，原因：'+emsg, 'error')
       }
     })
+    }, '删除操作请求中......')
   },
 
   /**

GuangZuan/miniprogram/mMine/pages/modifypwd/index.wxml

@@ -1,8 +1,8 @@
 <view class="topView">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">登录密码修改</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">登录密码修改</text>
   </van-nav-bar>
 </view>
 

GuangZuan/miniprogram/mMine/pages/myinventorys/list/index.ts

@@ -1,7 +1,7 @@
 import { queryMyWRPosition } from "../../../../services/api/orders/index";
 import { userid } from "../../../../services/utils";
-import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast";
 import { isnullstr } from "../../../../utils/util";
+import { hideLoading, showLoading } from "../../../../utils/message/index";
 
 Page({
 
@@ -62,27 +62,24 @@ Page({
     this.setData({ active: e.detail.index })
     /// 类型
     const zscategory = this.data.tabs[this.data.active].id
-
+    
     switch (zscategory) {
       case 2:  /// 单颗裸钻
         this.setData({
           /// 列头  
-          titles: [['重量', '形状', '尺寸', '编号'], ['颜色', '净度', '切工', '对称', '抛光', '荧光', '证书', '价格']],
-          active: e.detail.index
+          titles: [['重量', '形状', '尺寸', '编号'], ['颜色', '净度', '切工', '对称', '抛光', '荧光', '证书', '价格']]
         })
         break;
       case 5:  /// 单颗彩钻
         this.setData({
           /// 列头  
-          titles: [['重量', '形状', '尺寸', '编号'], ['颜色', '净度', '对称', '抛光', '荧光', '证书', '价格']],
-          active: e.detail.index
+          titles: [['重量', '形状', '尺寸', '编号'], ['颜色', '净度', '对称', '抛光', '荧光', '证书', '价格']]
         })
         break;
       default: /// 钻石首饰
         this.setData({
           /// 列头  
-          titles: [['重量', '形状', '款式', '尺寸', '编号'], ['颜色', '净度', '切工', '对称', '抛光', '荧光', '证书', '价格']],
-          active: e.detail.index
+          titles: [['重量', '形状', '款式', '尺寸', '编号'], ['颜色', '净度', '切工', '对称', '抛光', '荧光', '证书', '价格']]
         })
     }
     /// 查询我的库存
@@ -92,53 +89,53 @@ Page({
   /// 查询我的库存
   queryMyWRPosition(zscategory: number) {
     /// loding.....
-    Toast.loading({message: '加载中...'});
-    /// 查询我的库存
-    queryMyWRPosition({
-      data: {
-        zscategory: zscategory,
-        wruserid: userid()
-      },
-      success: (res) => {
-        /// 请求失败
-        if (res.code != 200) {
+    showLoading(()=>{
+      /// 查询我的库存
+      queryMyWRPosition({
+        data: {
+          zscategorys: zscategory,
+          wruserid: userid()
+        },
+        success: (res) => {
+          /// 请求失败
+          if (res.code != 200) {
+            /// 加载失败
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          hideLoading(()=>{
+            /// 设置数据
+            this.setData({
+              /// 数据信息
+              datas: res.data,
+              isEmpty: res.data.length === 0,
+              /// 显示的值
+              values: res.data.map(obj => {
+                return {up: [obj.weight+'ct', 
+                            isnullstr(obj.zsshapetypedisplay), 
+                            isnullstr(obj.size1), 
+                            isnullstr(obj.goodsno)], 
+                        dwn: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
+                              isnullstr(obj.zsclaritytype1display)+' | '+
+                              isnullstr(obj.zscuttype1display)+' | '+
+                              isnullstr(obj.zssymmetrytype1display)+' | '+
+                              isnullstr(obj.zspolishtype1display)+' | '+
+                              isnullstr(obj.zsfluorescencetype1display)+' | '+
+                              isnullstr(obj.zscerttypedisplay),
+                            obj.zscurrencytypedisplayunit+obj.price.toFixed(2)]}
+              })
+            })
+          })
+        },
+        fail: (emsg) => {
           /// 加载失败
-          Toast.fail({ message: '请求失败，原因：'+res.msg});
-          return
+          hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
+        },
+        complete: () => {
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
         }
-        /// 设置数据
-        this.setData({
-          /// 数据信息
-          datas: res.data,
-          /// 显示的值
-          values: res.data.map(obj => {
-            return {up: [obj.weight+'ct', 
-                        isnullstr(obj.zsshapetypedisplay), 
-                        isnullstr(obj.size1), 
-                        isnullstr(obj.goodsno)], 
-                    dwn: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
-                          isnullstr(obj.zsclaritytype1display)+' | '+
-                          isnullstr(obj.zscuttype1display)+' | '+
-                          isnullstr(obj.zssymmetrytype1display)+' | '+
-                          isnullstr(obj.zspolishtype1display)+' | '+
-                          isnullstr(obj.zsfluorescencetype1display)+' | '+
-                          isnullstr(obj.zscerttypedisplay),
-                        obj.zscurrencytypedisplayunit+obj.price.toFixed(2)]}
-          })
-        })
-      },
-      fail: (emsg) => {
-        /// 加载失败
-        Toast.fail({ message: '查询失败，原因：'+emsg});
-      },
-      complete: () => {
-        /// 清楚Toast
-        Toast.clear()
-        /// 判断数据是否为空
-        this.setData({ isEmpty: this.data.values.length == 0 })
-        /// 停止下拉刷新
-        wx.stopPullDownRefresh()
-      }
+      })
     })
   },
 
@@ -161,7 +158,7 @@ Page({
    */
   onShow() {
     /// 查询我的库存
-    this.queryMyWRPosition(1)
+    this.queryMyWRPosition(this.data.tabs[this.data.active].id)
   },
 
   /**

GuangZuan/miniprogram/mMine/pages/myinventorys/list/index.wxml

@@ -1,8 +1,8 @@
 <view class="topView">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">我的库存</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">我的库存</text>
   </van-nav-bar>
 
   <!-- tabs -->

GuangZuan/miniprogram/mMine/pages/myorders/his/index.ts

@@ -1,6 +1,6 @@
-import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { queryMyDeListing } from "../../../../services/api/orders/index"
 import { userid } from "../../../../services/utils"
+import { hideLoading, showLoading } from "../../../../utils/message/index"
 import { formatDate, isnullstr } from "../../../../utils/util"
 
 Page({
@@ -87,8 +87,7 @@ Page({
   /// 查询我的摘牌
   queryMyDeListing() {
     /// loding
-    Toast.loading({ message: '加载中....' })
-
+    showLoading(()=>{
     /// 数据查询请求
     queryMyDeListing({
       data: {
@@ -101,7 +100,7 @@ Page({
       success: (res) => {
         /// 请求失败
         if (res.code != 200) {
-          Toast('请求失败，原因：'+res.msg)
+          hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
           return
         }
         
@@ -109,6 +108,7 @@ Page({
         this.setData({
           /// 设置列头
           datas: res.data,
+          isEmpty: res.data.length === 0,
           /// 显示的值
           values: res.data.map(obj => {
             return {up: [obj.qty+'ct', 
@@ -122,17 +122,15 @@ Page({
         })
       },
       fail: (emsg) => {
-        Toast('请求失败，原因：'+emsg)
+        hideLoading(()=>{}, '请求失败，原因：'+emsg)
       },
       complete: () => { 
-        /// 清楚Toast
-        Toast.clear()
-        /// 判断数据是否为空
-        this.setData({ isEmpty: this.data.values.length == 0 })
         /// 停止下拉刷新
         wx.stopPullDownRefresh()
       }
     })
+    })
+    
   },
 
   /**

GuangZuan/miniprogram/mMine/pages/myorders/his/index.wxml

@@ -1,8 +1,8 @@
 <view class="topView">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">历史订单</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">历史订单</text>
   </van-nav-bar>
 
   <!-- 过滤条件 -->

GuangZuan/miniprogram/mMine/pages/myorders/list/index.ts

@@ -1,6 +1,9 @@
-import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
+import { FunCode } from "../../../../constants/enum/funcode"
+import { EOrderSrc } from "../../../../constants/enum/index"
+import { sendMsgToMQ } from "../../../../services/api/common/index"
 import { queryMyBuyOrder, queryMyDeListing, queryMyDelistingApply, queryMySellOrder } from "../../../../services/api/orders/index"
-import { userid } from "../../../../services/utils"
+import { accountid, clientType, isEncrypted, loginid, marketid, protoHeader, timetample, userid } from "../../../../services/utils"
+import { hideLoading, showLoading, showModel } from "../../../../utils/message/index"
 import { isnullstr } from "../../../../utils/util"
 
 Page({
@@ -119,7 +122,6 @@ Page({
    * 按钮点击响应事件
    */
   onButtonPressed(e: any) {
-    
     /// 获取对应的id
     const ids = (<string> e.target.id).split(' ')
     let id = (<string> e.target.id).split(' ')[0]
@@ -134,12 +136,12 @@ Page({
         switch (this.data.active) {
           case 4:  /// 询价消息详情
             wx.navigateTo({
-              url: '/mMine/pages/myorders/mydelistingapplydetail/index?item='+JSON.stringify(this.data.myDelistingApplys[index])
+              url: '/mMine/pages/myorders/mydelistingapplydetail/index?type=2&item='+JSON.stringify(this.data.myDelistingApplys[index])
             })
             break;
           case 3:  /// 我的询价详情
             wx.navigateTo({
-              url: '/mMine/pages/myorders/mydelistingapplydetail/index?item='+JSON.stringify(this.data.myDelistingApplys[index])
+              url: '/mMine/pages/myorders/mydelistingapplydetail/index?type=1&item='+JSON.stringify(this.data.myDelistingApplys[index])
             })
             break;
           case 2:  /// 我的摘牌
@@ -158,13 +160,30 @@ Page({
             })
             break;
           default:
-            
             break;
         }
         break;
       case 'cancel':  /// 撤销
+        switch (this.data.active) {
+          case 1:  /// 求购挂牌
+            showModel(()=>{
+              const { wrtradeorderid } = this.data.buyorders[index]
+              this.doWRListingCancelOrder(wrtradeorderid, 1)
+            }, '提示', '确定要撤销吗？')
+            break;
+          default:
+            showModel(()=>{
+              const { selldelistingapplyid } = this.data.myDelistingApplys[index]
+              this.doZZSSellOrderDestingApplyOperate(selldelistingapplyid)
+            }, '提示', '确定要撤销吗？')
+            break;
+        }
         break;
       case 'shelves':  /// 下架
+        showModel(()=>{
+          const { wrtradeorderid } = this.data.sellorders[index]
+          this.doWRListingCancelOrder(wrtradeorderid, 0)
+        }, '提示', '确定要下架吗？')
         break;
       default:
         break;
@@ -197,118 +216,114 @@ Page({
   /// 查询我的摘牌
   queryMyDeListing() {
     /// loding
-    Toast.loading({ message: '加载中....' })
-
-    /// 数据查询请求
-    queryMyDeListing({
-      data: {
-        userid: userid(),
-        page: this.data.page,
-        pagesize: 20,
-      },
-      success: (res) => {
-        /// 请求失败
-        if (res.code != 200) {
-          Toast('请求失败，原因：'+res.msg)
-          return
-        }
-        
-        /// 设置数据
-        this.setData({
-          /// 设置列头
-          dlistings: res.data,
-          /// 显示的值
-          values: res.data.map(obj => {
-            return {up: [obj.qty+'ct', 
-                        isnullstr(obj.zsshapetypedisplay), 
-                        '--', 
-                        isnullstr(obj.sizedisplay), 
-                        isnullstr(obj.goodsno)], 
-                    mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
-                          isnullstr(obj.zsclaritytype1display)+' | '+
-                          isnullstr(obj.zscuttype1display)+' | '+
-                          isnullstr(obj.zssymmetrytype1display)+' | '+
-                          isnullstr(obj.zspolishtype1display)+' | '+
-                          isnullstr(obj.zsfluorescencetype1display)+' | '+
-                          isnullstr(obj.zscerttypedisplay),
-                        obj.zscurrencytypedisplayunit+obj.price.toFixed(2)], 
-                    dwn: []}
+    showLoading(()=>{
+      /// 数据查询请求
+      queryMyDeListing({
+        data: {
+          userid: userid(),
+          page: this.data.page,
+          pagesize: 20,
+        },
+        success: (res) => {
+          /// 请求失败
+          if (res.code != 200) {
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          hideLoading(()=>{
+            /// 设置数据
+            this.setData({
+              /// 设置列头
+              dlistings: res.data,
+              isEmpty: res.data.length === 0,
+              /// 显示的值
+              values: res.data.map(obj => {
+                return {up: [obj.qty+'ct', 
+                            isnullstr(obj.zsshapetypedisplay), 
+                            '--', 
+                            isnullstr(obj.sizedisplay), 
+                            isnullstr(obj.goodsno)], 
+                        mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
+                              isnullstr(obj.zsclaritytype1display)+' | '+
+                              isnullstr(obj.zscuttype1display)+' | '+
+                              isnullstr(obj.zssymmetrytype1display)+' | '+
+                              isnullstr(obj.zspolishtype1display)+' | '+
+                              isnullstr(obj.zsfluorescencetype1display)+' | '+
+                              isnullstr(obj.zscerttypedisplay),
+                            obj.zscurrencytypedisplayunit+obj.price.toFixed(2)], 
+                        dwn: []}
+              })
+            })
           })
-        })
-      },
-      fail: (emsg) => {
-        Toast('请求失败，原因：'+emsg)
-      },
-      complete: () => { 
-        /// 清楚Toast
-        Toast.clear()
-        /// 判断数据是否为空
-        this.setData({ isEmpty: this.data.values.length == 0 })
-        /// 停止下拉刷新
-        wx.stopPullDownRefresh()
-      }
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
+        },
+        complete: () => { 
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
+        }
+      })
     })
   },
 
   /// 查询求购挂牌
   queryMyBuyOrder() {
     /// loding
-    Toast.loading({ message: '加载中....' })
-
-    /// 数据查询请求
-    queryMyBuyOrder({
-      data: {
-        userid: userid(),
-        page: this.data.page,
-        pagesize: 20,
-      },
-      success: (res) => {
-        /// 请求失败
-        if (res.code != 200) {
-          Toast('请求失败，原因：'+res.msg)
-          return
-        }
-        
-        /// 设置数据
-        this.setData({
-          /// 设置列头
-          buyorders: res.data,
-          /// 显示的值
-          values: res.data.map(obj => {
-            return {up: [isnullstr(obj.zsshapetypedisplay), 
-                         isnullstr(obj.zssize),
-                         isnullstr(obj.zscategorydisplay)], 
-                    mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
-                          isnullstr(obj.zsclaritytypedisplay)+' | '+
-                          isnullstr(obj.zscuttypedisplay)+' | '+
-                          isnullstr(obj.zssymmetrytypedisplay)+' | '+
-                          isnullstr(obj.zspolishtypedisplay)+' | '+
-                          isnullstr(obj.zsfluorescencetypedisplay),
-                        ''], 
-                    dwn: []}
+    showLoading(()=>{
+      /// 数据查询请求
+      queryMyBuyOrder({
+        data: {
+          userid: userid(),
+          page: this.data.page,
+          pagesize: 20,
+        },
+        success: (res) => {
+          /// 请求失败
+          if (res.code != 200) {
+            /// 加载失败
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          hideLoading(()=>{
+            /// 设置数据
+            this.setData({
+              /// 设置列头
+              buyorders: res.data,
+              isEmpty: res.data.length === 0,
+              /// 显示的值
+              values: res.data.map(obj => {
+                return {up: [isnullstr(obj.zsshapetypedisplay), 
+                            isnullstr(obj.zssize),
+                            isnullstr(obj.zscategorydisplay)], 
+                        mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
+                              isnullstr(obj.zsclaritytypedisplay)+' | '+
+                              isnullstr(obj.zscuttypedisplay)+' | '+
+                              isnullstr(obj.zssymmetrytypedisplay)+' | '+
+                              isnullstr(obj.zspolishtypedisplay)+' | '+
+                              isnullstr(obj.zsfluorescencetypedisplay),
+                            ''], 
+                        dwn: []}
+              })
+            })
           })
-        })
-      },
-      fail: (emsg) => {
-        Toast('请求失败，原因：'+emsg)
-      },
-      complete: () => { 
-        /// 清楚Toast
-        Toast.clear()
-        /// 判断数据是否为空
-        this.setData({ isEmpty: this.data.values.length == 0 })
-        /// 停止下拉刷新
-        wx.stopPullDownRefresh()
-      }
-    })
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
+        },
+        complete: () => { 
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
+        }
+      })
+    }, '加载中....')
   },
 
   /// 查询出售挂牌
   queryMySellOrder() {
     /// loding
-    Toast.loading({ message: '加载中....' })
-
-    /// 数据查询请求
+    showLoading(()=>{
+      /// 数据查询请求
     queryMySellOrder({
       data: {
         userid: userid(),
@@ -318,113 +333,203 @@ Page({
       success: (res) => {
         /// 请求失败
         if (res.code != 200) {
-          Toast('请求失败，原因：'+res.msg)
+          /// 加载失败
+          hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
           return
         }
-        
-        /// 设置数据
-        this.setData({
-          /// 设置列头
-          sellorders: res.data,
-          active: 0,
-          /// 显示的值
-          values: res.data.map(obj => {
-            return {up: [obj.totalqty+'ct', 
-                        isnullstr(obj.zsshapetypedisplay), 
-                        '--',
-                        isnullstr(obj.size1),
-                        obj.goodsno], 
-                    mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
-                          isnullstr(obj.zsclaritytype1display)+' | '+
-                          isnullstr(obj.zscuttype1display)+' | '+
-                          isnullstr(obj.zssymmetrytype1display)+' | '+
-                          isnullstr(obj.zspolishtype1display)+' | '+
-                          isnullstr(obj.zsfluorescencetype1display)+' | '+
-                          isnullstr(obj.zscerttypedisplay),
-                        obj.zscurrencytypedisplayunit+obj.price.toFixed(2)], 
-                    dwn: []}
+        hideLoading(()=>{
+          /// 设置数据
+          this.setData({
+            /// 设置列头
+            sellorders: res.data,
+            isEmpty: res.data.length === 0,
+            active: 0,
+            /// 显示的值
+            values: res.data.map(obj => {
+              return {up: [obj.totalqty+'ct', 
+                          isnullstr(obj.zsshapetypedisplay), 
+                          '--',
+                          isnullstr(obj.size1),
+                          obj.goodsno], 
+                      mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
+                            isnullstr(obj.zsclaritytype1display)+' | '+
+                            isnullstr(obj.zscuttype1display)+' | '+
+                            isnullstr(obj.zssymmetrytype1display)+' | '+
+                            isnullstr(obj.zspolishtype1display)+' | '+
+                            isnullstr(obj.zsfluorescencetype1display)+' | '+
+                            isnullstr(obj.zscerttypedisplay),
+                          obj.zscurrencytypedisplayunit+obj.price.toFixed(2)], 
+                      dwn: []}
+            })
           })
         })
       },
       fail: (emsg) => {
-        Toast('请求失败，原因：'+emsg)
+        /// 加载失败
+        hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
       },
       complete: () => { 
-        /// 清楚Toast
-        Toast.clear()
-        /// 判断数据是否为空
-        this.setData({ isEmpty: this.data.values.length == 0 })
         /// 停止下拉刷新
         wx.stopPullDownRefresh()
       }
     })
+    })
   },
 
   /// 查询我的询价以及询价消息
   queryMyDelistingApply(applytype: number) {
     /// loding
-    Toast.loading({ message: '加载中....' })
+    showLoading(()=>{
+      /// 数据查询请求
+      queryMyDelistingApply({
+        data: {
+          userid: userid(),
+          page: this.data.page,
+          pagesize: 20,
+          type: applytype
+        },
+        success: (res) => {
+          /// 请求失败
+          if (res.code != 200) {
+            /// 加载失败
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          hideLoading(()=>{
+            /// 设置数据
+            this.setData({
+              /// 设置列头
+              myDelistingApplys: res.data,
+              isEmpty: res.data.length === 0,
+              /// 显示的值 
+              values: applytype == 0 ? res.data.map(obj => {
+                return {up: [isnullstr(obj.zsshapetypedisplay), 
+                            isnullstr(obj.sizedisplay),
+                            isnullstr(obj.zscategorydisplay)], 
+                        mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
+                              isnullstr(obj.zsclaritytypedisplay)+' | '+
+                              isnullstr(obj.zscuttypedisplay)+' | '+
+                              isnullstr(obj.zssymmetrytypedisplay)+' | '+
+                              isnullstr(obj.zspolishtypedisplay)+' | '+
+                              isnullstr(obj.zsfluorescencetypedisplay),
+                          ''], 
+                        dwn: [obj.buyusername, obj.goodsno]}
+              }) : res.data.map(obj => {
+                return {up: [obj.applyqty+'ct',
+                            isnullstr(obj.zsshapetypedisplay), 
+                            isnullstr(obj.sizedisplay),
+                            isnullstr(obj.zscategorydisplay)], 
+                        mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
+                              isnullstr(obj.zsclaritytypedisplay)+' | '+
+                              isnullstr(obj.zscuttypedisplay)+' | '+
+                              isnullstr(obj.zssymmetrytypedisplay)+' | '+
+                              isnullstr(obj.zspolishtypedisplay)+' | '+
+                              isnullstr(obj.zsfluorescencetypedisplay),
+                            obj.zscurrencytypedisplayunit+obj.applyprice.toFixed(2)], 
+                        dwn: ['', obj.sellusername+' | --']}
+              })
+            })
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
+        },
+        complete: () => { 
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
+        }
+      })
+    })
+  },
 
-    /// 数据查询请求
-    queryMyDelistingApply({
-      data: {
-        userid: userid(),
-        page: this.data.page,
-        pagesize: 20,
-        type: applytype
-      },
-      success: (res) => {
-        /// 请求失败
-        if (res.code != 200) {
-          Toast('请求失败，原因：'+res.msg)
-          return
+  /// 出售挂牌-求购挂牌撤单请求(下架)
+  doWRListingCancelOrder(wrtradeorderid: string, buyorsell: number) {
+    /// loading
+    showLoading(()=>{
+      /// 参数信息
+      const params = {
+        UserID: userid(),
+        AccountID: accountid(),
+        OldWRTradeOrderID: wrtradeorderid,
+        OrderSrc: EOrderSrc.ORDERSRC_CLIENT,
+        ClientType: clientType,
+        ClientSerialNo: timetample().toString,
+        OperatorID: loginid(),
+        BuyOrSell: buyorsell,
+        Header: protoHeader(FunCode.WRListingCancelOrderReq)
+      }
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          funCodeReq: FunCode.WRListingCancelOrderReq,
+          funCodeRsp: FunCode.WRListingCancelOrderRsp,
+          isEncrypted: isEncrypted(),
+          data: JSON.stringify(params)
+        },
+        success: (res) => {
+          if (res.code != 0) {
+            /// 加载失败
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          /// 操作成功
+          hideLoading(()=>{
+            /// 重新获取数据
+            this.queryMySellOrder()
+          }, '操作成功', 'success')
+        },
+        fail: (emsg) => {
+          /// 操作失败
+          hideLoading(()=>{}, '下架请求失败，原因：'+emsg, 'error')
         }
-        
-        /// 设置数据
-        this.setData({
-          /// 设置列头
-          myDelistingApplys: res.data,
-          /// 显示的值 
-          values: applytype == 0 ? res.data.map(obj => {
-            return {up: [isnullstr(obj.zsshapetypedisplay), 
-                        isnullstr(obj.sizedisplay),
-                        isnullstr(obj.zscategorydisplay)], 
-                    mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
-                          isnullstr(obj.zsclaritytypedisplay)+' | '+
-                          isnullstr(obj.zscuttypedisplay)+' | '+
-                          isnullstr(obj.zssymmetrytypedisplay)+' | '+
-                          isnullstr(obj.zspolishtypedisplay)+' | '+
-                          isnullstr(obj.zsfluorescencetypedisplay),
-                       ''], 
-                    dwn: [obj.buyusername, obj.goodsno]}
-          }) : res.data.map(obj => {
-            return {up: [obj.applyqty+'ct',
-                         isnullstr(obj.zsshapetypedisplay), 
-                        isnullstr(obj.sizedisplay),
-                        isnullstr(obj.zscategorydisplay)], 
-                    mid: [isnullstr(obj.zsczcolor1typedisplay)+' | '+
-                          isnullstr(obj.zsclaritytypedisplay)+' | '+
-                          isnullstr(obj.zscuttypedisplay)+' | '+
-                          isnullstr(obj.zssymmetrytypedisplay)+' | '+
-                          isnullstr(obj.zspolishtypedisplay)+' | '+
-                          isnullstr(obj.zsfluorescencetypedisplay),
-                        obj.zscurrencytypedisplayunit+obj.applyprice.toFixed(2)], 
-                    dwn: ['', obj.sellusername+' | --']}
-          })
-        })
-      },
-      fail: (emsg) => {
-        Toast('请求失败，原因：'+emsg)
-      },
-      complete: () => { 
-        /// 清楚Toast
-        Toast.clear()
-        /// 判断数据是否为空
-        this.setData({ isEmpty: this.data.values.length == 0 })
-        /// 停止下拉刷新
-        wx.stopPullDownRefresh()
+      })
+    }, '下架请求中....')
+  },
+
+  /// 我的询价撤销
+  doZZSSellOrderDestingApplyOperate(SellDelistingApplyID: string) {
+    /// loading
+    showLoading(()=>{
+      /// 参数信息
+      const params = {
+        UserID: userid(),
+        AccountID: accountid(),
+        SellDelistingApplyID: SellDelistingApplyID,
+        AuditRemark: '',
+        OperateType: 1,
+        MarketID: marketid(),
+        OrderSrc: EOrderSrc.ORDERSRC_CLIENT,
+        ClientType: clientType,
+        ClientSerialNo: timetample().toString(),
+        Header: protoHeader(FunCode.ZSSellOrderDestingApplyOperateReq)
       }
-    })
+
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          funCodeReq: FunCode.ZSSellOrderDestingApplyOperateReq,
+          funCodeRsp: FunCode.ZSSellOrderDestingApplyOperateReq,
+          isEncrypted: isEncrypted(),
+          data: JSON.stringify(params)
+        },
+        success: (res) => {
+          if (res.code != 0) {
+            /// 加载失败
+            hideLoading(()=>{}, '操作请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          /// 操作成功
+          hideLoading(()=>{
+            /// 重新获取数据
+            this.queryMySellOrder()
+          }, '操作成功', 'success')
+        },
+        fail: (emsg) => {
+          /// 加载失败
+          hideLoading(()=>{}, '操作请求失败，原因：'+emsg, 'error')
+        }
+      })
+    }, '撤销请求中....')
   },
 
   /**

GuangZuan/miniprogram/mMine/pages/myorders/list/index.wxml

@@ -1,8 +1,8 @@
 <view class="topView">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">我的订单</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">我的订单</text>
   </van-nav-bar>
 
   <!-- tabs -->
@@ -61,3 +61,5 @@
 <van-empty wx:if="{{isEmpty}}" class="custom-image" description="无数据"/>
 <!-- toast --> 
 <van-toast id="van-toast" />
+<!-- 对话弹框  -->
+<van-dialog id="van-dialog" />

GuangZuan/miniprogram/mMine/pages/myorders/mydelistingapplydetail/index.less

@@ -183,10 +183,11 @@
     flex-direction: row;
     align-content: center;
     align-items: center;
-    justify-content: space-between;
+    justify-content: center;
 
     van-button {
       width: 46%;
+      margin: 0px 10px;
     }
   }
 }

GuangZuan/miniprogram/mMine/pages/myorders/mydelistingapplydetail/index.ts

@@ -1,11 +1,126 @@
-// mMine/pages/myorders/MyDelistingApplyDetail/index.ts
+import Long from "long"
+import { FunCode } from "../../../../constants/enum/funcode"
+import { EOrderSrc } from "../../../../constants/enum/index"
+import Dialog from "../../../../miniprogram_npm/@vant/weapp/dialog/dialog"
+import { sendMsgToMQ } from "../../../../services/api/common/index"
+import { queryWrPerformancePlanStep } from "../../../../services/api/orders/index"
+import { accountid, clientType, isEncrypted, marketid, protoHeader, timetample, userid } from "../../../../services/utils"
+import { hideLoading, showLoading } from "../../../../utils/message/index"
+
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+    /// 底部安全区域
+    safeBottom: getApp().globalData.safeBottom,
+    /// 我的询价消息
+    item: <GuangZuan.MyDelistingApply>({}),
+    /// 类型
+    type: 1,
+    /// 履约步骤信息
+    steps: <GuangZuan.WrPerformancePlanStep[]>[]
+  },
 
+  /**
+   * 按钮点击响应事件
+   */
+  onButtonPressed(e: any) {
+    switch (e.target.id) {
+      case 'agree':  /// 同意
+        Dialog.confirm({
+          title: '提示',
+          message: '确定要同意吗？'
+        }).then(() => {
+          /// 同意
+          this.doZZSSellOrderDestingApplyOperate(3)
+        })
+        break;
+      case 'refuse': /// 拒绝
+        Dialog.confirm({
+          title: '提示',
+          message: '确定要拒绝吗？'
+        }).then(() => {
+          /// 同意
+          this.doZZSSellOrderDestingApplyOperate(2)
+        })
+        break;
+      default:
+        Dialog.confirm({
+          title: '提示',
+          message: '确定要撤销吗？'
+        }).then(() => {
+          /// 同意
+          this.doZZSSellOrderDestingApplyOperate(1)
+        })
+        break;
+    }
+  },
+
+  /// 买摘牌询价操作接口
+  doZZSSellOrderDestingApplyOperate(type: number) {
+    /// loading
+    showLoading(()=>{
+      const { selldelistingapplyid } = this.data.item
+      /// 参数信息
+      const params = {
+        UserID: userid(),
+        AccountID: accountid(),
+        SellDelistingApplyID: selldelistingapplyid,
+        AuditRemark: '',
+        OperateType: type,
+        MarketID: marketid(),
+        OrderSrc: EOrderSrc.ORDERSRC_CLIENT,
+        ClientType: clientType,
+        ClientSerialNo: timetample().toString(),
+        Header: protoHeader(FunCode.ZSSellOrderDestingApplyOperateReq)
+      }
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          funCodeReq: FunCode.ZSSellOrderDestingApplyOperateReq,
+          funCodeRsp: FunCode.ZSSellOrderDestingApplyOperateReq,
+          isEncrypted: isEncrypted(),
+          data: JSON.stringify(params)
+        },
+        success: (res) => {
+          if (res.code != 0) {
+            hideLoading(()=>{}, '拒绝申请失败， 原因：'+res.msg)
+            return
+          }
+          /// 操作成功
+          hideLoading(()=>{
+            /// 返回上层视图
+            wx.navigateBack()
+          }, '拒绝成功', 'success')
+        },
+        fail: (emsg) => {
+          /// 操作失败
+          hideLoading(()=>{}, '操作失败，原因：'+emsg)
+        }
+      })
+    })
+  },
+
+  /// 查询履约步骤信息
+  queryWrPerformancePlanStep() {
+    showLoading(()=>{
+      /// 发送查询
+      queryWrPerformancePlanStep({
+        data: {
+          planid: this.data.item.performancetemplateid
+        },
+        success: (res) => {
+          hideLoading(()=>{
+            this.setData({ steps: res.data })
+          })
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
+        }
+      })
+    })
   },
 
    /**
@@ -19,8 +134,14 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad() {
-
+  onLoad(optinos: any) {
+    const obj = JSON.parse(optinos.item)
+    if (obj) {
+      /// 数据赋值
+      this.setData({  item: obj, type: optinos.type  })
+    }
+    /// 查询履约步骤信息
+    this.queryWrPerformancePlanStep()
   },
 
   /**

GuangZuan/miniprogram/mMine/pages/myorders/mydelistingapplydetail/index.wxml

@@ -1,16 +1,16 @@
 <!--mMine/pages/myorders/MyDelistingApplyDetail/index.wxml-->
-<view class="container">
+<view class="container" style="padding-bottom: {{safeBottom}}px;">
   <view class="topView">
     <!-- 导航栏 -->
     <van-nav-bar custom-style="background-color: #E92020">
       <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-      <text slot="title" style="color: white;">询价消息</text>
+      <text slot="title" style="color: white;">{{ type === 1 ? '询价详情' : '询价消息' }}</text>
     </van-nav-bar>
   </view>
 
   <view class="buyinfo-info">
     <view class="title-view">
-      <text class="title">【我的求购】</text>
+      <text class="title">{{ type === 1 ? '【求购信息】' : '【我的求购】'}}</text>
       <text class="wrstandname">单颗裸钻-人民币：{{}}</text>
     </view>
     <!-- 履约信息 --> 
@@ -38,20 +38,20 @@
   </view>
 
   <!-- 卖家信息 -->
-  <view class="seller-info">
+  <view class="seller-info" wx:if="{{ type != 1 }}">
     <text class="title">【卖家信息】</text>
     <view class="content">
       <view class="content__item">
         <text class="title">名称：</text>
-        <text class="value">xxxx钻石贸易商</text>
+        <text class="value">{{ item.sellusername }}</text>
       </view>
       <view class="content__item">
         <text class="title">电话：</text>
-        <text class="value">13888888888</text>
+        <text class="value">--</text>
       </view>
       <view class="content__item">
         <text class="title">仓库：</text>
-        <text class="value">中国-广东省-广州市-南沙XXXxxxxX仓库</text>
+        <text class="value">{{ item.warehouseinfosdisplay }}</text>
       </view>
       <view class="content__item">
         <text class="title">履约：</text>
@@ -62,52 +62,68 @@
 
   <!-- 钻石属性 -->
   <view class="attribute-info">
-    <text class="title">【钻石属性】</text>
     <view class="attribute-info__item">
-      <text class="title">形状：</text>
-      <text class="value">圆明亮形(Round)</text>
+      <text class="title" style="width: 100%;">{{ item.zscategorydisplay }} - 商品编号{{ item.goodsno }} </text>
+    </view>
+    <view class="attribute-info__item">
+      <text class="title">价格：</text>
+      <text class="value">{{ item.price }}</text>
+    </view>
+    <view class="attribute-info__item">
+      <text class="title">重量：</text>
+      <text class="value">{{ item.weight }}</text>
+    </view>
+    <view class="attribute-info__item">
+      <text class="title">克拉单价：</text>
+      <text class="value">--</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">形状：</text>
-      <text class="value">圆明亮形(Round)</text>
+      <text class="value">{{ item.zsshapetypedisplay }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">颜色：</text>
-      <text class="value">E</text>
+      <text class="value">{{ item.zsczcolor1typedisplay }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">净度：</text>
-      <text class="value">FL</text>
+      <text class="value">{{ item.zsclaritytypedisplay }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">切工：</text>
-      <text class="value">EX</text>
+      <text class="value">{{ item.zscuttypedisplay }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">抛光：</text>
-      <text class="value">EX</text>
+      <text class="value">{{ item.zspolishtypedisplay }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">荧光：</text>
-      <text class="value">微弱(faint)</text>
+      <text class="value">{{ item.zsfluorescencetypedisplay }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">尺寸：</text>
-      <text class="value">1.22 * 1.35 * 1.36</text>
+      <text class="value">{{ item.sizedisplay }}</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">证书类型：</text>
-      <text class="value">GIA</text>
+      <text class="value">--</text>
     </view>
     <view class="attribute-info__item">
       <text class="title">证书编号：</text>
-      <text class="value">223848856</text>
+      <text class="value">--</text>
     </view>
   </view>
 
    <!-- 按钮 -->
    <view class="button-view">
-    <van-button custom-class="excute" id="excute" round color="linear-gradient(to right, #4bb0ff, #F7A657)" block bind:click="onButtonPressed">拒绝</van-button>
-    <van-button custom-class="excute" id="excute" round color="linear-gradient(to right, #4bb0ff, #F7A657)" block bind:click="onButtonPressed">立即购买</van-button>
+    <van-button wx:if="{{ type == 2 }}" custom-class="refuse" id="refuse" round color="linear-gradient(to right, #4bb0ff, #F7A657)" block bind:click="onButtonPressed">拒绝</van-button>
+    <van-button wx:if="{{ type == 1 }}" custom-class="cancel" id="cancel" round color="linear-gradient(to right, #4bb0ff, #F7A657)" block bind:click="onButtonPressed">撤销申请</van-button>
+    <van-button wx:if="{{ type == 2 }}" custom-class="agree" id="agree" round color="linear-gradient(to right, #4bb0ff, #F7A657)" block bind:click="onButtonPressed">同意</van-button>
   </view>
 </view>
+
+<!-- toast --> 
+<van-toast id="van-toast" />
+<!-- 对话弹框  -->
+<van-dialog id="van-dialog" />

GuangZuan/miniprogram/mMine/pages/myperformance/breach/index.ts

@@ -3,6 +3,7 @@ import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast";
 import { FunCode } from "../../../../constants/enum/funcode"
 import { accountid, isEncrypted, protoHeader, userid } from "../../../../services/utils";
 import services from "../../../../services/index"
+import { hideLoading, showLoading, showToast } from "../../../../utils/message/index";
 
 Page({
 
@@ -31,7 +32,7 @@ Page({
       formData: { user: 'test' },
       success: (res) => {
         if (res.statusCode != 200) {
-          Toast({message: '图片上传失败，原因：'+res.errMsg})
+          showToast('图片上传失败，原因：'+res.errMsg)
           return
         }
         // 上传完成需要更新 fileList
@@ -60,51 +61,50 @@ Page({
     /// 校验失败
     if (!this.check()) { return  }
     /// loding.....
-    Toast.loading({ message: '违约申请请求中.....'})
-    /// 参数信息
-    const params = {
-      PerformancePlanID: this.data.order.performanceplanid,
-      BreachType: this.data.order.buyaccountid === accountid() ? 2 : 1,
-      ApplyRemark: this.data.remark,
-      Applicant: userid(),
-      Header: protoHeader(FunCode.PerformanceContractedApplyReq)
-    }
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        data: JSON.stringify(params),
-        funCodeReq: FunCode.PerformanceContractedApplyReq,
-        funCodeRsp: FunCode.PerformanceContractedApplyRsp,
-        isEncrypted: isEncrypted()
-      },
-      success: (res) => {
-        if (res.code != 0) {
-          Toast.fail({message: '操作申请失败， 原因：'+res.msg})
-          return
-        }
-        /// 操作成功
-        Toast.success('操作成功')
-        /// 返回上层视图
-        wx.navigateBack()
-      },
-      fail: (emsg) => {
-        /// 操作失败
-        Toast.fail('操作失败，原因：'+emsg)
-      }, complete: () => {
-        /// hideLoading
-        Toast.clear()
+    showLoading(()=>{
+      /// 参数信息
+      const params = {
+        PerformancePlanID: this.data.order.performanceplanid,
+        BreachType: this.data.order.buyaccountid === accountid() ? 2 : 1,
+        ApplyRemark: this.data.remark,
+        Applicant: userid(),
+        Header: protoHeader(FunCode.PerformanceContractedApplyReq)
       }
-    })
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          data: JSON.stringify(params),
+          funCodeReq: FunCode.PerformanceContractedApplyReq,
+          funCodeRsp: FunCode.PerformanceContractedApplyRsp,
+          isEncrypted: isEncrypted()
+        },
+        success: (res) => {
+          if (res.code != 0) {
+            hideLoading(()=>{}, '操作申请请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          /// 操作成功
+          hideLoading(()=>{
+            /// 返回上层视图
+            wx.navigateBack()
+          }, '操作成功', 'success')
+        },
+        fail: (emsg) => {
+          /// 操作失败
+          hideLoading(()=>{}, '操作申请请求失败，原因：'+emsg, 'error')
+        }
+      })
+    }, '违约申请请求中.....')
   },
 
   check(): boolean {
     if (this.data.remark === '') {
-      Toast.fail({message: '请输入备注！'})
+      showToast('请输入备注！')
       return false
     }
 
     if (this.data.filePath === '') {
-      Toast.fail({message: '请上传附件！'})
+      showToast('请上传附件！')
       return false
     }
     return true

GuangZuan/miniprogram/mMine/pages/myperformance/detail/index.ts

@@ -5,6 +5,7 @@ import { FunCode } from "../../../../constants/enum/funcode"
 import { accountid, getPerformancestatus, getStepStatus, getSteptype, isEncrypted, protoHeader, userid } from "../../../../services/utils";
 import { queryWrPerformancePlanStep } from "../../../../services/api/orders/index";
 import { formatDateString, isnullstr } from "../../../../utils/util";
+import { hideLoading, showLoading, showToast } from "../../../../utils/message/index";
 
 Page({
 
@@ -53,42 +54,41 @@ Page({
     /// 合规性校验
     if (!this.check(true)) { return  }
     /// loding.....
-    Toast.loading({ message: '延期申请请求中.....'})
-    /// 参数信息
-    const params = {
-      PerformancePlanStepID: this.data.order.curstepid,
-      delaydays: this.data.delaydays,
-      applyremark: this.data.remark,
-      applicant: userid(),
-      Header: protoHeader(FunCode.PerformanceDelayApplyReq)
-    }
+    showLoading(()=>{
+      /// 参数信息
+      const params = {
+        PerformancePlanStepID: this.data.order.curstepid,
+        delaydays: this.data.delaydays,
+        applyremark: this.data.remark,
+        applicant: userid(),
+        Header: protoHeader(FunCode.PerformanceDelayApplyReq)
+      }
 
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        data: JSON.stringify(params),
-        funCodeReq: FunCode.PerformanceDelayApplyReq,
-        funCodeRsp: FunCode.PerformanceDelayApplyReq,
-        isEncrypted: isEncrypted()
-      },
-      success: (res) => {
-        if (res.code != 0) {
-          Toast.fail({message: '操作申请失败， 原因：'+res.msg})
-          return
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          data: JSON.stringify(params),
+          funCodeReq: FunCode.PerformanceDelayApplyReq,
+          funCodeRsp: FunCode.PerformanceDelayApplyReq,
+          isEncrypted: isEncrypted()
+        },
+        success: (res) => {
+          if (res.code != 0) {
+            hideLoading(()=>{}, '操作申请失败，原因：'+res.msg, 'error')
+            return
+          }
+          /// 操作成功
+          hideLoading(()=>{
+            /// 返回上层视图
+            wx.navigateBack()
+          }, '操作成功', 'success')
+        },
+        fail: (emsg) => {
+          /// 操作失败
+          hideLoading(()=>{}, '操作申请失败，原因：'+emsg, 'error')
         }
-        /// 操作成功
-        Toast.success('操作成功')
-        /// 返回上层视图
-        wx.navigateBack()
-      },
-      fail: (emsg) => {
-        /// 操作失败
-        Toast.fail('操作失败，原因：'+emsg)
-      }, complete: () => {
-        /// hideLoading
-        Toast.clear()
-      }
-    })
+      })
+    }, '延期申请请求中.....')
   },
 
   /**
@@ -99,41 +99,40 @@ Page({
     /// 合规性校验
     if (!this.check(false)) { return  }
     /// loding.....
-    Toast.loading({ message: '立即执行请求中.....'})
-    /// 参数信息
-    const params = {
-      PerformancePlanStepID: this.data.order.curstepid,
-      PerformanceExecuteSide: this.data.order.buyaccountid === accountid() ? 1 : 2,
-      StepRemark: this.data.remark,
-      Header: protoHeader(FunCode.PerformanceManualConfirmReq)
-    }
+    showLoading(()=>{
+      /// 参数信息
+      const params = {
+        PerformancePlanStepID: this.data.order.curstepid,
+        PerformanceExecuteSide: this.data.order.buyaccountid === accountid() ? 1 : 2,
+        StepRemark: this.data.remark,
+        Header: protoHeader(FunCode.PerformanceManualConfirmReq)
+      }
 
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        data: JSON.stringify(params),
-        funCodeReq: FunCode.PerformanceManualConfirmReq,
-        funCodeRsp: FunCode.PerformanceManualConfirmRsp,
-        isEncrypted: isEncrypted()
-      },
-      success: (res) => {
-        if (res.code != 0) {
-          Toast.fail({message: '操作申请失败， 原因：'+res.msg})
-          return
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          data: JSON.stringify(params),
+          funCodeReq: FunCode.PerformanceManualConfirmReq,
+          funCodeRsp: FunCode.PerformanceManualConfirmRsp,
+          isEncrypted: isEncrypted()
+        },
+        success: (res) => {
+          if (res.code != 0) {
+            hideLoading(()=>{}, '操作申请请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          /// 操作成功
+          hideLoading(()=> {
+            /// 返回上层视图
+            wx.navigateBack()
+          }, '操作成功', 'success')
+        },
+        fail: (emsg) => {
+          /// 操作失败
+          hideLoading(()=>{}, '操作申请请求失败，原因：'+emsg, 'error')
         }
-        /// 操作成功
-        Toast.success('操作成功')
-        /// 返回上层视图
-        wx.navigateBack()
-      },
-      fail: (emsg) => {
-        /// 操作失败
-        Toast.fail('操作失败，原因：'+emsg)
-      }, complete: () => {
-        /// hideLoading
-        Toast.clear()
-      }
-    })
+      })
+    }, '立即执行请求中.....')
   },
 
   onClose() {
@@ -156,12 +155,12 @@ Page({
 
   check(isDelay: boolean): boolean {
     if (this.data.delaydays === 0 && isDelay) {
-      Toast.fail({message: '请输入延期天数！'})
+      showToast('请输入延期天数！')
       return false
     }
 
     if (this.data.remark === '') {
-      Toast.fail({message: '请输入备注！'})
+      showToast('请输入备注！')
       return false
     }
     return true
@@ -172,36 +171,41 @@ Page({
    */
   queryWrPerformancePlanStep() {
     /// loding.....
-    wx.showLoading({title: '加载中.....'})
-    /// 发送请求
-    queryWrPerformancePlanStep({
-      data: {
-        planid: <number><unknown>this.data.order.performanceplanid
-      },
-      success: (res) => {
-        this.setData({ 
-          steps: res.data,
-          stepsValues: res.data.map(itm => {
-            return { stepindex: itm.stepindex,
-                     steptypename: itm.steptypename, 
-                     stepstatus: itm.stepstatus,
-                     stepstatusdisplay: getStepStatus(itm.stepstatus),
-                     starttime: formatDateString(itm.starttime, 'YYYY-MM-DD'),
-                     endtime: formatDateString(itm.endtime, 'YYYY-MM-DD'),
-                     remaindays: itm.stepstatus === 2 ? `剩余${itm.remaindays}天` : ((itm.stepstatus === 3 || itm.stepstatus === 6) ? `${itm.stepdays}` : ''),
-                     stepdays: itm.stepdays,
-                     bgcolor: itm.stepstatus === 2 ? '#2794FF' : ((itm.stepstatus === 3 || itm.stepstatus === 6) ? '#89C5FF' : '#DDE3E8')
-                    }
+    showLoading(()=> {
+      /// 发送请求
+      queryWrPerformancePlanStep({
+        data: {
+          planid: <number><unknown>this.data.order.performanceplanid
+        },
+        success: (res) => {
+          /// 请求失败
+          if (res.code != 200) {
+            /// 加载失败
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          hideLoading(()=>{
+            this.setData({ 
+              steps: res.data,
+              stepsValues: res.data.map(itm => {
+                return { stepindex: itm.stepindex,
+                        steptypename: itm.steptypename, 
+                        stepstatus: itm.stepstatus,
+                        stepstatusdisplay: getStepStatus(itm.stepstatus),
+                        starttime: formatDateString(itm.starttime, 'YYYY-MM-DD'),
+                        endtime: formatDateString(itm.endtime, 'YYYY-MM-DD'),
+                        remaindays: itm.stepstatus === 2 ? `剩余${itm.remaindays}天` : ((itm.stepstatus === 3 || itm.stepstatus === 6) ? `${itm.stepdays}` : ''),
+                        stepdays: itm.stepdays,
+                        bgcolor: itm.stepstatus === 2 ? '#2794FF' : ((itm.stepstatus === 3 || itm.stepstatus === 6) ? '#89C5FF' : '#DDE3E8')
+                        }
+              })
+            })
           })
-        })
-      },
-      fail: (emsg) => {
-        Toast.fail({message: '数据请求失败，原因：'+emsg})
-      },
-      complete: () => {
-        /// 清除Toast
-        wx.hideLoading()
-      }
+        },
+        fail: (emsg) => {
+          hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
+        }
+      })
     })
   },
 

GuangZuan/miniprogram/mMine/pages/myperformance/his/index.ts

@@ -1,6 +1,6 @@
-import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { queryMyPerformanc } from "../../../../services/api/orders/index"
 import { getPerformancestatus, getSteptype, userid } from "../../../../services/utils"
+import { hideLoading, showLoading } from "../../../../utils/message/index"
 import { isnullstr } from "../../../../utils/util"
 
 Page({
@@ -31,49 +31,49 @@ Page({
   /// 查询我的履约
   queryMyPerformanc(buyOrSell: number) {
     /// loding.....
-    Toast.loading({ message: '数据请求中....' })
-    /// 发送请求
-    queryMyPerformanc({
-      data: {
-        userid: userid(),
-        buyorsell: buyOrSell,
-        ishis: true,
-        page: this.data.page
-      },
-      success: (res) => {
-        if (res.code != 200) {
-          Toast.fail({ message: '查询失败，原因：'+res.msg })
-          return
-        }
-        /// 查询成功
-        this.setData({ 
-          datas: res.data,
-          /// 显示的值
-          values: res.data.map(obj => {
-            return {up: [obj.zscurrencytypedisplayunit+obj.price.toString()+' | '+ 
-                        obj.zscurrencytypedisplayunit+(this.data.active == 0 ? obj.buypaidamount : obj.sellreceivedamount).toString()+' | '+ 
-                         obj.zscurrencytypedisplayunit+(this.data.active == 0 ? obj.buyerfreezeamount : obj.sellerfreezeamount).toString(), 
-                        getSteptype(obj.steptypeid)+' | '+ obj.remaindays.toString()+'天'], 
-                    dwn: [isnullstr(obj.zsshapetypedisplay)+' | '+
-                          isnullstr(obj.zscolortype1display)+' | '+
-                          '--'+' | '+
-                          isnullstr(obj.accountname),
-                        getPerformancestatus(obj.performancestatus)]}
+    showLoading(()=>{
+       /// 发送请求
+      queryMyPerformanc({
+        data: {
+          userid: userid(),
+          buyorsell: buyOrSell,
+          ishis: true,
+          page: this.data.page
+        },
+        success: (res) => {
+          if (res.code != 200) {
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          hideLoading(()=>{
+            /// 查询成功
+            this.setData({ 
+              datas: res.data,
+              isEmpty: res.data.length === 0,
+              /// 显示的值
+              values: res.data.map(obj => {
+                return {up: [obj.zscurrencytypedisplayunit+obj.price.toString()+' | '+ 
+                            obj.zscurrencytypedisplayunit+(this.data.active == 0 ? obj.buypaidamount : obj.sellreceivedamount).toString()+' | '+ 
+                            obj.zscurrencytypedisplayunit+(this.data.active == 0 ? obj.buyerfreezeamount : obj.sellerfreezeamount).toString(), 
+                            getSteptype(obj.steptypeid)+' | '+ obj.remaindays.toString()+'天'], 
+                        dwn: [isnullstr(obj.zsshapetypedisplay)+' | '+
+                              isnullstr(obj.zscolortype1display)+' | '+
+                              '--'+' | '+
+                              isnullstr(obj.accountname),
+                            getPerformancestatus(obj.performancestatus)]}
+              })
+            })
           })
-        })
-      },
-      fail: (emsg) => {
-        /// showToast
-        Toast.fail({ message: '查询失败，原因：'+emsg })
-      },
-      complete: () => {
-        /// hideLoading
-        Toast.clear()
-        /// 判断数据是否为空
-        this.setData({ isEmpty: this.data.datas.length == 0 })
-        /// 停止下拉刷新
-        wx.stopPullDownRefresh()
-      }
+        },
+        fail: (emsg) => {
+          /// showToast
+          hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
+        },
+        complete: ()=>{
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
+        }
+      })
     })
   },
 

GuangZuan/miniprogram/mMine/pages/myperformance/his/index.wxml

@@ -1,8 +1,8 @@
 <view class="topView">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">历史履约</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">历史履约</text>
   </van-nav-bar>
 
   <!-- tabs -->

GuangZuan/miniprogram/mMine/pages/myperformance/list/index.ts

@@ -1,6 +1,6 @@
-import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast"
 import { queryMyPerformanc } from "../../../../services/api/orders/index"
 import { getPerformancestatus, getSteptype, userid } from "../../../../services/utils"
+import { hideLoading, showLoading } from "../../../../utils/message/index"
 import { isnullstr } from "../../../../utils/util"
 
 Page({
@@ -31,49 +31,49 @@ Page({
   /// 查询我的履约
   queryMyPerformanc(buyOrSell: number) {
     /// loding.....
-    Toast.loading({ message: '数据请求中....' })
-    /// 发送请求
-    queryMyPerformanc({
-      data: {
-        userid: userid(),
-        buyorsell: buyOrSell,
-        ishis: false,
-        page: this.data.page
-      },
-      success: (res) => {
-        if (res.code != 200) {
-          Toast.fail({ message: '查询失败，原因：'+res.msg })
-          return
-        }
-        /// 查询成功
-        this.setData({ 
-          datas: res.data,
-          /// 显示的值
-          values: res.data.map(obj => {
-            return {up: [obj.zscurrencytypedisplayunit+obj.price.toFixed(2)+' | '+ 
-                         obj.zscurrencytypedisplayunit+(this.data.active == 0 ? obj.buypaidamount : obj.sellreceivedamount).toFixed(2)+' | '+
-                         obj.zscurrencytypedisplayunit+(this.data.active == 0 ? obj.buyerfreezeamount : obj.sellerfreezeamount).toFixed(2), 
-                        getSteptype(obj.steptypeid)+' | '+  obj.remaindays.toString()+"天"], 
-                    dwn: [isnullstr(obj.zsshapetypedisplay)+' | '+
-                          isnullstr(obj.zscolortype1display)+' | '+
-                          '--'+' | '+
-                          isnullstr(obj.accountname),
-                        getPerformancestatus(obj.performancestatus)], isChecked: false}
+    showLoading(()=>{
+      /// 发送请求
+      queryMyPerformanc({
+        data: {
+          userid: userid(),
+          buyorsell: buyOrSell,
+          ishis: false,
+          page: this.data.page
+        },
+        success: (res) => {
+          if (res.code != 200) {
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          hideLoading(()=>{
+             /// 查询成功
+            this.setData({ 
+              datas: res.data,
+              isEmpty: res.data.length === 0,
+              /// 显示的值
+              values: res.data.map(obj => {
+                return {up: [obj.zscurrencytypedisplayunit+obj.price.toFixed(2)+' | '+ 
+                            obj.zscurrencytypedisplayunit+(this.data.active == 0 ? obj.buypaidamount : obj.sellreceivedamount).toFixed(2)+' | '+
+                            obj.zscurrencytypedisplayunit+(this.data.active == 0 ? obj.buyerfreezeamount : obj.sellerfreezeamount).toFixed(2), 
+                            getSteptype(obj.steptypeid)+' | '+  obj.remaindays.toString()+"天"], 
+                        dwn: [isnullstr(obj.zsshapetypedisplay)+' | '+
+                              isnullstr(obj.zscolortype1display)+' | '+
+                              '--'+' | '+
+                              isnullstr(obj.accountname),
+                            getPerformancestatus(obj.performancestatus)], isChecked: false}
+              })
+            })
           })
-        })
-      },
-      fail: (emsg) => {
-        /// showToast
-        Toast.fail({ message: '查询失败，原因：'+emsg })
-      },
-      complete: () => {
-        /// hideLoading
-        Toast.clear()
-        /// 判断数据是否为空
-        this.setData({ isEmpty: this.data.datas.length == 0 })
-        /// 停止下拉刷新
-        wx.stopPullDownRefresh()
-      }
+        },
+        fail: (emsg) => {
+          /// showToast
+          hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
+        },
+        complete: () => {
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
+        }
+      })
     })
   },
 

GuangZuan/miniprogram/mMine/pages/myperformance/list/index.wxml

@@ -1,8 +1,8 @@
 <view class="topView">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">我的履约</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">我的履约</text>
   </van-nav-bar>
 
   <!-- tabs -->

GuangZuan/miniprogram/mMine/pages/myperformance/modify/index.ts

@@ -1,7 +1,7 @@
 import { sendMsgToMQ } from "../../../../services/api/common/index"
-import Toast from "../../../../miniprogram_npm/@vant/weapp/toast/toast";
 import { FunCode } from "../../../../constants/enum/funcode"
 import { accountid, isEncrypted, protoHeader } from "../../../../services/utils";
+import { hideLoading, showLoading, showToast } from "../../../../utils/message/index";
 
 Page({
 
@@ -34,59 +34,58 @@ Page({
     // 校验失败
     if (!this.check()) { return  }
     /// loding.....
-    Toast.loading({ message: '修改申请请求中.....'})
-
-    const json = {
-      ContactInfo: `ContactInfo：${this.data.contract}`+`ReceiveInfo：${this.data.address}`+`ReceiptInfo：${this.data.invoice}`
-    }
-    /// 参数信息
-    const params = {
-      PerformancePlanID: this.data.order.performanceplanid,
-      AccountID: accountid(),
-      ContactInfo: JSON.stringify(json),
-      Header: protoHeader(FunCode.PerformanceModifyContactReq)
-    }
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        data: JSON.stringify(params),
-        funCodeReq: FunCode.PerformanceModifyContactReq,
-        funCodeRsp: FunCode.PerformanceModifyContactRsp,
-        isEncrypted: isEncrypted()
-      },
-      success: (res) => {
-        if (res.code != 0) {
-          Toast.fail({message: '修改申请失败， 原因：'+res.msg})
-          return
-        }
-        /// 操作成功
-        Toast.success('修改申请成功')
-        /// 返回上层视图
-        wx.navigateBack()
-      },
-      fail: (emsg) => {
-        /// 操作失败
-        Toast.fail('修改申请失败，原因：'+emsg)
-      }, complete: () => {
-        /// hideLoading
-        Toast.clear()
+    showLoading(()=>{
+      /// json
+      const json = {
+        ContactInfo: `ContactInfo：${this.data.contract}`+`ReceiveInfo：${this.data.address}`+`ReceiptInfo：${this.data.invoice}`
       }
-    })
+      /// 参数信息
+      const params = {
+        PerformancePlanID: this.data.order.performanceplanid,
+        AccountID: accountid(),
+        ContactInfo: JSON.stringify(json),
+        Header: protoHeader(FunCode.PerformanceModifyContactReq)
+      }
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          data: JSON.stringify(params),
+          funCodeReq: FunCode.PerformanceModifyContactReq,
+          funCodeRsp: FunCode.PerformanceModifyContactRsp,
+          isEncrypted: isEncrypted()
+        },
+        success: (res) => {
+          if (res.code != 0) {
+            hideLoading(()=>{}, '修改申请失败， 原因：'+res.msg, 'error')
+            return
+          }
+          /// 操作成功
+          hideLoading(()=>{
+            /// 返回上层视图
+            wx.navigateBack()
+          }, '修改申请成功', 'success')
+        },
+        fail: (emsg) => {
+          /// 操作失败
+          hideLoading(()=>{}, '修改申请失败，原因：'+emsg, 'error')
+        }
+      })
+    }, '修改申请请求中.....')
   },
 
   check(): boolean {
     if (this.data.contract === '') {
-      Toast.fail({message: '请输入联系信息！'})
+      showToast('请输入联系信息！')
       return false
     }
 
     if (this.data.address === '') {
-      Toast.fail({message: '请选择收货地址信息！'})
+      showToast('请选择收货地址信息！')
       return false
     }
 
     if (this.data.invoice === '') {
-      Toast.fail({message: '请选择发票信息！'})
+      showToast('请选择发票信息！')
       return false
     }
     return true

GuangZuan/miniprogram/mTrade/pages/buyinquiry/index.wxml

@@ -1,79 +0,0 @@
-<view class="container">
-  <!-- 摘牌信息 -->
-  <view class="delisting-info">
-    <view class="delisting-info-item">
-      <text>摘牌信息</text>
-    </view>
-    <view class="delisting-info-item">
-      <text>分类：</text> 
-      <text>成批裸钻</text> 
-    </view>
-    <view class="delisting-info-item">
-      <text>委托单信息：</text> 
-      <text>3201657258206970002</text> 
-    </view>
-    <view class="delisting-info-item">
-      <text>卖方：</text> 
-      <text>机构1000</text> 
-    </view>
-    <view class="delisting-info-item">
-      <text>商品编号：</text> 
-      <text>CPLZ00000001</text> 
-    </view>
-    <view class="delisting-info-item">
-      <text>资金帐号：</text> 
-      <text>25000000001</text> 
-    </view>
-    <view class="delisting-info-item">
-      <text>委托价格：</text> 
-      <text>￥8,123.00</text> 
-    </view>
-    <view class="delisting-info-item">
-      <text>委托时间：</text> 
-      <text>2000-07-15 11：20：20</text> 
-    </view>
-    <view class="delisting-info-item">
-      <text>委托重量：</text> 
-      <text>223.23CT</text> 
-    </view>
-    <view class="delisting-info-item">
-      <text>有效日期：</text> 
-      <text>2022-08-15</text> 
-    </view>
-    <view class="delisting-info-item">
-      <text>成交重量：</text> 
-      <text>100.00CT</text> 
-    </view>
-  </view>
-
-  <!-- 询价信息 -->
-  <view class="inquiry-info">
-    <view class="inquiry-info-item">
-      <text>询价信息</text>
-    </view>
-    <view class="inquiry-info-item">
-      <text>资金账号</text>
-      <text>250000000082</text>
-    </view>
-    <view class="inquiry-info-item">
-      <text>购买数量</text>
-      <input placeholder="请输入数量" type="number"></input>
-      <text>CT</text>
-    </view>
-    <view class="inquiry-info-item">
-      <text>购买价格</text>
-      <input placeholder="请输入价格" type="digit"></input>
-      <text>RMB</text>
-    </view>
-    <view class="inquiry-info-item remark">
-      <text>备注</text>
-      <textarea placeholder="请输入备注"></textarea>
-    </view>
-  </view>
-
-  <!-- 询价信息 -->
-  <view class="button-view">
-    <van-button id="apply" block round color="linear-gradient(to right, #4bb0ff, #6149f6)" bind:click="buttonOnClick">询价申请</van-button>
-    <van-button id="cancel" block round color="#7232dd" bind:click="buttonOnClick">取消</van-button>
-  </view>
-</view>

GuangZuan/miniprogram/mTrade/pages/delistingbuy/index.json

@@ -1,4 +1,5 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "摘牌申请（买）"
+  "navigationBarTitleText": "摘牌申请（买）",
+  "navigationStyle": "custom"
 }

GuangZuan/miniprogram/mTrade/pages/delistingbuy/index.less

@@ -1,77 +0,0 @@
-.container {
-  display: flex;
-  flex-direction: column;
-
-  .delisting-info, .listing-info {
-    display: grid;
-    margin: 10px;
-    align-content: center;
-    border: 1px solid #f0f0f0;
-    border-radius: 10px;
-
-    view:nth-child(1) {
-      text {
-        font-size: 18px;
-      }
-    }
-
-    .delisting-info-item, .listing-info-item {
-      display: flex;
-      flex-direction: row;
-      align-content: center;
-      align-items: center;
-      justify-content: start;
-      height: 45px;
-      border-bottom: 1px solid #f0f0f0;
-      width: 100%;
-      margin: 0px 10px 0px 10px;
-
-      text:nth-child(1) {
-        width: 100px;
-      }
-
-      input {
-        font-size: 14px;
-        color: #333;
-      }
-
-      text:nth-child(3) {
-        width: 60px;
-        padding-left: 10px;
-        font-size: 12px;
-        color: #666;
-      }
-
-      text {
-        font-size: 14px;
-        color: #333333;
-        text-align: left;
-      }
-    }
-
-    .remark {
-      height: 100px;
-
-      textarea {
-        font-size: 13px;
-        color: #444;
-        height: 60px;
-        border: 1px solid #eee;
-        padding: 10px 10px 10px 10px;
-        border-radius: 10px;
-        width: 65%;
-      }
-    }
-  }
-
-  .button-view {
-    display: flex;
-    justify-content: space-between;
-    margin: 10px 10px 10px 10px;
-
-    van-button {
-      width: 48%;
-      height: 40px;
-    }
-  }
-}

GuangZuan/miniprogram/mTrade/pages/delistingbuy/index.wxml

@@ -1,79 +0,0 @@
-<view class="container">
-
-<!-- 挂牌信息 -->
-<view class="listing-info">
-  <view class="listing-info-item">
-    <text>挂牌信息</text>
-  </view>
-  <view class="listing-info-item">
-    <text>分类：</text> 
-    <text>成批裸钻</text> 
-  </view>
-  <view class="listing-info-item">
-    <text>委托单信息：</text> 
-    <text>3201657258206970002</text> 
-  </view>
-  <view class="listing-info-item">
-    <text>卖方：</text> 
-    <text>机构1000</text> 
-  </view>
-  <view class="listing-info-item">
-    <text>商品编号：</text> 
-    <text>CPLZ00000001</text> 
-  </view>
-  <view class="listing-info-item">
-    <text>资金帐号：</text> 
-    <text>25000000001</text> 
-  </view>
-  <view class="listing-info-item">
-    <text>委托价格：</text> 
-    <text>￥8,123.00</text> 
-  </view>
-  <view class="listing-info-item">
-    <text>委托时间：</text> 
-    <text>2000-07-15 11：20：20</text> 
-  </view>
-  <view class="listing-info-item">
-    <text>委托重量：</text> 
-    <text>223.23CT</text> 
-  </view>
-  <view class="listing-info-item">
-    <text>有效日期：</text> 
-    <text>2022-08-15</text> 
-  </view>
-  <view class="listing-info-item">
-    <text>成交重量：</text> 
-    <text>100.00CT</text> 
-  </view>
-</view>
-
-<!-- 摘牌信息 -->
-<view class="delisting-info">
-  <view class="delisting-info-item">
-    <text>摘牌信息</text>
-  </view>
-  <view class="delisting-info-item">
-    <text>购买数量</text>
-    <input placeholder="请输入数量" type="number"></input>
-    <text>CT</text>
-  </view>
-  <view class="delisting-info-item">
-    <text>汇率</text>
-    <text>6.7500</text>
-  </view>
-  <view class="delisting-info-item">
-    <text>购买金额</text>
-    <text>￥54,830.25</text>
-  </view>
-  <view class="delisting-info-item">
-    <text>资金账号</text>
-    <text>250000000082</text>
-  </view>
-</view>
-
-<!-- 按钮 -->
-<view class="button-view">
-  <van-button id="delisting" block round color="linear-gradient(to right, #4bb0ff, #6149f6)" bind:click="buttonOnClick">摘牌</van-button>
-  <van-button id="cancel" block round color="#7232dd" bind:click="buttonOnClick">取消</van-button>
-</view>
-</view>

GuangZuan/miniprogram/mTrade/pages/diadetail/index.wxml

@@ -1,42 +0,0 @@
-<!-- 钻石详情页 -->
-
-<van-cell-group>
-  <van-cell title="货期："></van-cell>
-  <van-cell title="供应商："></van-cell>
-  <van-cell title="地点："></van-cell>
-  <van-cell title="形状："></van-cell>
-  <van-cell title="克拉："></van-cell>
-  <van-cell title="颜色："></van-cell>
-</van-cell-group>
-
-<van-cell-group>
-  <van-cell title="净度："></van-cell>
-  <van-cell title="切工："></van-cell>
-  <van-cell title="抛光："></van-cell>
-  <van-cell title="对称："></van-cell>
-  <van-cell title="荧光："></van-cell>
-  <van-cell title="全深比："></van-cell>
-</van-cell-group>
-
-<van-cell-group>
-  <van-cell title="台宽比："></van-cell>
-  <van-cell title="尺寸："></van-cell>
-  <van-cell title="奶咖绿："></van-cell>
-  <van-cell title="证书："></van-cell>
-  <van-cell title="证书号："></van-cell>
-  <van-cell title="图片："></van-cell>
-</van-cell-group>
-
-<van-cell-group>
-  <van-cell title="视频："></van-cell>
-  <van-cell title="报告："></van-cell>
-  <van-cell title="国际报价："></van-cell>
-  <van-cell title="折扣："></van-cell>
-  <van-cell title="美金价："></van-cell>
-  <van-cell title="人民币："></van-cell>
-</van-cell-group>
-
-<view class="button_view" style="position: relative; padding-bottom: {{safeBottom}}px;">
-  <button type="primary">收藏</button>
-  <button type="warn">购买</button>
-</view>

GuangZuan/miniprogram/mTrade/pages/listingbuy/index.ts

@@ -121,7 +121,7 @@ Page({
     const ids = (<string> e.target.id).split(' ')
     let id = (<string> e.target.id).split(' ')[0]
     const index = <number> <unknown>ids[1]
-    console.log(ids)
+
     switch (id) {
       case 'shape':   /// 形状
         this.setData({ shapes: this.data.shapes.map(item => {

GuangZuan/miniprogram/mTrade/pages/listingsell/index.wxml

@@ -1,9 +1,9 @@
 
 <view class="container">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">我要出售</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">我要出售</text>
   </van-nav-bar>
 </view>
 <!-- tabs -->

GuangZuan/miniprogram/miniprogram_npm/@vant/area-data/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1666073990073, function(require, module, exports) {
+__DEFINE__(1669857359198, function(require, module, exports) {
 
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -3920,7 +3920,7 @@ var areaList = {
 };
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1666073990073);
+return __REQUIRE__(1669857359198);
 })()
 //miniprogram-npm-outsideDeps=[]
 //# sourceMappingURL=index.js.map

GuangZuan/miniprogram/miniprogram_npm/@vant/weapp/toast/toast.js

@@ -18,7 +18,7 @@ var defaultOptions = {
     message: '',
     show: true,
     zIndex: 1000,
-    duration: 4000,
+    duration: 2000,
     position: 'middle',
     forbidClick: false,
     loadingType: 'circular',

GuangZuan/miniprogram/miniprogram_npm/crypto-js/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1666073990074, function(require, module, exports) {
+__DEFINE__(1669857359199, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -23,8 +23,8 @@ __DEFINE__(1666073990074, function(require, module, exports) {
 	return CryptoJS;
 
 }));
-}, function(modId) {var map = {"./core":1666073990075,"./x64-core":1666073990076,"./lib-typedarrays":1666073990077,"./enc-utf16":1666073990078,"./enc-base64":1666073990079,"./enc-base64url":1666073990080,"./md5":1666073990081,"./sha1":1666073990082,"./sha256":1666073990083,"./sha224":1666073990084,"./sha512":1666073990085,"./sha384":1666073990086,"./sha3":1666073990087,"./ripemd160":1666073990088,"./hmac":1666073990089,"./pbkdf2":1666073990090,"./evpkdf":1666073990091,"./cipher-core":1666073990092,"./mode-cfb":1666073990093,"./mode-ctr":1666073990094,"./mode-ctr-gladman":1666073990095,"./mode-ofb":1666073990096,"./mode-ecb":1666073990097,"./pad-ansix923":1666073990098,"./pad-iso10126":1666073990099,"./pad-iso97971":1666073990100,"./pad-zeropadding":1666073990101,"./pad-nopadding":1666073990102,"./format-hex":1666073990103,"./aes":1666073990104,"./tripledes":1666073990105,"./rc4":1666073990106,"./rabbit":1666073990107,"./rabbit-legacy":1666073990108}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990075, function(require, module, exports) {
+}, function(modId) {var map = {"./core":1669857359200,"./x64-core":1669857359201,"./lib-typedarrays":1669857359202,"./enc-utf16":1669857359203,"./enc-base64":1669857359204,"./enc-base64url":1669857359205,"./md5":1669857359206,"./sha1":1669857359207,"./sha256":1669857359208,"./sha224":1669857359209,"./sha512":1669857359210,"./sha384":1669857359211,"./sha3":1669857359212,"./ripemd160":1669857359213,"./hmac":1669857359214,"./pbkdf2":1669857359215,"./evpkdf":1669857359216,"./cipher-core":1669857359217,"./mode-cfb":1669857359218,"./mode-ctr":1669857359219,"./mode-ctr-gladman":1669857359220,"./mode-ofb":1669857359221,"./mode-ecb":1669857359222,"./pad-ansix923":1669857359223,"./pad-iso10126":1669857359224,"./pad-iso97971":1669857359225,"./pad-zeropadding":1669857359226,"./pad-nopadding":1669857359227,"./format-hex":1669857359228,"./aes":1669857359229,"./tripledes":1669857359230,"./rc4":1669857359231,"./rabbit":1669857359232,"./rabbit-legacy":1669857359233}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359200, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -833,7 +833,7 @@ __DEFINE__(1666073990075, function(require, module, exports) {
 
 }));
 }, function(modId) { var map = {}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990076, function(require, module, exports) {
+__DEFINE__(1669857359201, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1138,8 +1138,8 @@ __DEFINE__(1666073990076, function(require, module, exports) {
 	return CryptoJS;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990077, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359202, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1216,8 +1216,8 @@ __DEFINE__(1666073990077, function(require, module, exports) {
 	return CryptoJS.lib.WordArray;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990078, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359203, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1367,8 +1367,8 @@ __DEFINE__(1666073990078, function(require, module, exports) {
 	return CryptoJS.enc.Utf16;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990079, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359204, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1505,8 +1505,8 @@ __DEFINE__(1666073990079, function(require, module, exports) {
 	return CryptoJS.enc.Base64;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990080, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359205, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1647,8 +1647,8 @@ __DEFINE__(1666073990080, function(require, module, exports) {
 	return CryptoJS.enc.Base64url;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990081, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359206, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -1917,8 +1917,8 @@ __DEFINE__(1666073990081, function(require, module, exports) {
 	return CryptoJS.MD5;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990082, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359207, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -2069,8 +2069,8 @@ __DEFINE__(1666073990082, function(require, module, exports) {
 	return CryptoJS.SHA1;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990083, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359208, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -2270,8 +2270,8 @@ __DEFINE__(1666073990083, function(require, module, exports) {
 	return CryptoJS.SHA256;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990084, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359209, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -2352,8 +2352,8 @@ __DEFINE__(1666073990084, function(require, module, exports) {
 	return CryptoJS.SHA224;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./sha256":1666073990083}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990085, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./sha256":1669857359208}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359210, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -2680,8 +2680,8 @@ __DEFINE__(1666073990085, function(require, module, exports) {
 	return CryptoJS.SHA512;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./x64-core":1666073990076}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990086, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./x64-core":1669857359201}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359211, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -2765,8 +2765,8 @@ __DEFINE__(1666073990086, function(require, module, exports) {
 	return CryptoJS.SHA384;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./x64-core":1666073990076,"./sha512":1666073990085}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990087, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./x64-core":1669857359201,"./sha512":1669857359210}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359212, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -3093,8 +3093,8 @@ __DEFINE__(1666073990087, function(require, module, exports) {
 	return CryptoJS.SHA3;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./x64-core":1666073990076}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990088, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./x64-core":1669857359201}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359213, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -3362,8 +3362,8 @@ __DEFINE__(1666073990088, function(require, module, exports) {
 	return CryptoJS.RIPEMD160;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990089, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359214, function(require, module, exports) {
 ;(function (root, factory) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -3507,8 +3507,8 @@ __DEFINE__(1666073990089, function(require, module, exports) {
 
 
 }));
-}, function(modId) { var map = {"./core":1666073990075}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990090, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359215, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -3654,8 +3654,8 @@ __DEFINE__(1666073990090, function(require, module, exports) {
 	return CryptoJS.PBKDF2;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./sha1":1666073990082,"./hmac":1666073990089}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990091, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./sha1":1669857359207,"./hmac":1669857359214}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359216, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -3790,8 +3790,8 @@ __DEFINE__(1666073990091, function(require, module, exports) {
 	return CryptoJS.EvpKDF;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./sha1":1666073990082,"./hmac":1666073990089}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990092, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./sha1":1669857359207,"./hmac":1669857359214}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359217, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -4682,8 +4682,8 @@ __DEFINE__(1666073990092, function(require, module, exports) {
 
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./evpkdf":1666073990091}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990093, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./evpkdf":1669857359216}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359218, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -4764,8 +4764,8 @@ __DEFINE__(1666073990093, function(require, module, exports) {
 	return CryptoJS.mode.CFB;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990094, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359219, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -4824,8 +4824,8 @@ __DEFINE__(1666073990094, function(require, module, exports) {
 	return CryptoJS.mode.CTR;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990095, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359220, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -4942,8 +4942,8 @@ __DEFINE__(1666073990095, function(require, module, exports) {
 	return CryptoJS.mode.CTRGladman;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990096, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359221, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -4998,8 +4998,8 @@ __DEFINE__(1666073990096, function(require, module, exports) {
 	return CryptoJS.mode.OFB;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990097, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359222, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5040,8 +5040,8 @@ __DEFINE__(1666073990097, function(require, module, exports) {
 	return CryptoJS.mode.ECB;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990098, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359223, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5091,8 +5091,8 @@ __DEFINE__(1666073990098, function(require, module, exports) {
 	return CryptoJS.pad.Ansix923;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990099, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359224, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5137,8 +5137,8 @@ __DEFINE__(1666073990099, function(require, module, exports) {
 	return CryptoJS.pad.Iso10126;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990100, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359225, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5179,8 +5179,8 @@ __DEFINE__(1666073990100, function(require, module, exports) {
 	return CryptoJS.pad.Iso97971;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990101, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359226, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5228,8 +5228,8 @@ __DEFINE__(1666073990101, function(require, module, exports) {
 	return CryptoJS.pad.ZeroPadding;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990102, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359227, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5260,8 +5260,8 @@ __DEFINE__(1666073990102, function(require, module, exports) {
 	return CryptoJS.pad.NoPadding;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990103, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359228, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5328,8 +5328,8 @@ __DEFINE__(1666073990103, function(require, module, exports) {
 	return CryptoJS.format.Hex;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990104, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359229, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -5564,8 +5564,8 @@ __DEFINE__(1666073990104, function(require, module, exports) {
 	return CryptoJS.AES;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./enc-base64":1666073990079,"./md5":1666073990081,"./evpkdf":1666073990091,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990105, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./enc-base64":1669857359204,"./md5":1669857359206,"./evpkdf":1669857359216,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359230, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -6345,8 +6345,8 @@ __DEFINE__(1666073990105, function(require, module, exports) {
 	return CryptoJS.TripleDES;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./enc-base64":1666073990079,"./md5":1666073990081,"./evpkdf":1666073990091,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990106, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./enc-base64":1669857359204,"./md5":1669857359206,"./evpkdf":1669857359216,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359231, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -6486,8 +6486,8 @@ __DEFINE__(1666073990106, function(require, module, exports) {
 	return CryptoJS.RC4;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./enc-base64":1666073990079,"./md5":1666073990081,"./evpkdf":1666073990091,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990107, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./enc-base64":1669857359204,"./md5":1669857359206,"./evpkdf":1669857359216,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359232, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -6680,8 +6680,8 @@ __DEFINE__(1666073990107, function(require, module, exports) {
 	return CryptoJS.Rabbit;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./enc-base64":1666073990079,"./md5":1666073990081,"./evpkdf":1666073990091,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-__DEFINE__(1666073990108, function(require, module, exports) {
+}, function(modId) { var map = {"./core":1669857359200,"./enc-base64":1669857359204,"./md5":1669857359206,"./evpkdf":1669857359216,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+__DEFINE__(1669857359233, function(require, module, exports) {
 ;(function (root, factory, undef) {
 	if (typeof exports === "object") {
 		// CommonJS
@@ -6872,8 +6872,8 @@ __DEFINE__(1666073990108, function(require, module, exports) {
 	return CryptoJS.RabbitLegacy;
 
 }));
-}, function(modId) { var map = {"./core":1666073990075,"./enc-base64":1666073990079,"./md5":1666073990081,"./evpkdf":1666073990091,"./cipher-core":1666073990092}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1666073990074);
+}, function(modId) { var map = {"./core":1669857359200,"./enc-base64":1669857359204,"./md5":1669857359206,"./evpkdf":1669857359216,"./cipher-core":1669857359217}; return __REQUIRE__(map[modId], modId); })
+return __REQUIRE__(1669857359199);
 })()
 //miniprogram-npm-outsideDeps=["crypto"]
 //# sourceMappingURL=index.js.map

GuangZuan/miniprogram/miniprogram_npm/long/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1666073990109, function(require, module, exports) {
+__DEFINE__(1669857359234, function(require, module, exports) {
 // GENERATED FILE. DO NOT EDIT.
 var Long = (function(exports) {
   
@@ -1439,7 +1439,7 @@ if (typeof define === 'function' && define.amd) define([], function() { return L
 else if (typeof module === 'object' && typeof exports==='object') module.exports = Long;
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1666073990109);
+return __REQUIRE__(1669857359234);
 })()
 //miniprogram-npm-outsideDeps=[]
 //# sourceMappingURL=index.js.map

GuangZuan/miniprogram/miniprogram_npm/moment/index.js

@@ -4,7 +4,7 @@ var __DEFINE__ = function(modId, func, req) { var m = { exports: {}, _tempexport
 var __REQUIRE__ = function(modId, source) { if(!__MODS__[modId]) return require(source); if(!__MODS__[modId].status) { var m = __MODS__[modId].m; m._exports = m._tempexports; var desp = Object.getOwnPropertyDescriptor(m, "exports"); if (desp && desp.configurable) Object.defineProperty(m, "exports", { set: function (val) { if(typeof val === "object" && val !== m._exports) { m._exports.__proto__ = val.__proto__; Object.keys(val).forEach(function (k) { m._exports[k] = val[k]; }); } m._tempexports = val }, get: function () { return m._tempexports; } }); __MODS__[modId].status = 1; __MODS__[modId].func(__MODS__[modId].req, m, m.exports); } return __MODS__[modId].m.exports; };
 var __REQUIRE_WILDCARD__ = function(obj) { if(obj && obj.__esModule) { return obj; } else { var newObj = {}; if(obj != null) { for(var k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) newObj[k] = obj[k]; } } newObj.default = obj; return newObj; } };
 var __REQUIRE_DEFAULT__ = function(obj) { return obj && obj.__esModule ? obj.default : obj; };
-__DEFINE__(1666073990110, function(require, module, exports) {
+__DEFINE__(1669857359235, function(require, module, exports) {
 //! moment.js
 //! version : 2.29.4
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
@@ -5692,7 +5692,7 @@ __DEFINE__(1666073990110, function(require, module, exports) {
 })));
 
 }, function(modId) {var map = {}; return __REQUIRE__(map[modId], modId); })
-return __REQUIRE__(1666073990110);
+return __REQUIRE__(1669857359235);
 })()
 //miniprogram-npm-outsideDeps=[]
 //# sourceMappingURL=index.js.map

GuangZuan/miniprogram/pages/circle/index.ts

@@ -4,6 +4,7 @@ import { clientType, isEncrypted, marketid, protoHeader, userid, timetample } fr
 import { sendMsgToMQ } from "../../services/api/common/index";
 import { FunCode } from "../../constants/enum/funcode";
 import { isnullstr } from "../../utils/util";
+import { hideLoading, showLoading } from "../../utils/message/index";
 
 Page({
 
@@ -76,96 +77,99 @@ Page({
    */
   onCancelFavorite(e: any) {
     /// loding.....
-    Toast.loading({ message: '请求中.....'})
-    /// 获取对应的id
-    const ids = (<string> e.target.id).split(' ')
-    const index = <number> <unknown>ids[1]
-    const wrtradeorderid = this.data.favorites[index].wrtradeorderid
-
-    /// 参数信息
-    const info = { 
-      UserID: userid(),
-      OperateType: 2,
-      ClientType: clientType(),
-      MarketID: marketid(),
-      ClientSerialNo: timetample().toString(),
-      WRTradeOrderID: wrtradeorderid,
-      Header: protoHeader(FunCode.GoodsFavoriteOperateReq)
-    }
+    showLoading(()=>{
+      /// 获取对应的id
+      const ids = (<string> e.target.id).split(' ')
+      const index = <number> <unknown>ids[1]
+      const wrtradeorderid = this.data.favorites[index].wrtradeorderid
+
+      /// 参数信息
+      const info = { 
+        UserID: userid(),
+        OperateType: 2,
+        ClientType: clientType(),
+        MarketID: marketid(),
+        ClientSerialNo: timetample().toString(),
+        WRTradeOrderID: wrtradeorderid,
+        Header: protoHeader(FunCode.GoodsFavoriteOperateReq)
+      }
 
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        data: JSON.stringify(info),
-        funCodeReq: FunCode.GoodsFavoriteOperateReq,
-        funCodeRsp: FunCode.GoodsFavoriteOperateRsp,
-        isEncrypted: isEncrypted()
-      },
-      success: (res) => {
-        /// 操作失败
-        if (res.code != 0) {
-          Toast.fail({message: '请求失败，原因：'+res.msg})
-          return 
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          data: JSON.stringify(info),
+          funCodeReq: FunCode.GoodsFavoriteOperateReq,
+          funCodeRsp: FunCode.GoodsFavoriteOperateRsp,
+          isEncrypted: isEncrypted()
+        },
+        success: (res) => {
+          /// 操作失败
+          if (res.code != 0) {
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
+            return 
+          }
+          /// 操作成功
+          hideLoading(()=>{
+            /// 更新数据
+            this.queryMyFavorite()
+          }, '请求成功', 'success')
+        },
+        fail: (emsg) => {
+          /// 操作失败
+          hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
         }
-        /// 操作成功
-        Toast.success({message: '请求成功'})
-        /// 更新数据
-        this.queryMyFavorite()
-      },
-      fail: (emsg) => {
-        /// 操作失败
-        Toast.fail({ message: '请求失败，原因：'+emsg})
-      }, complete: () => {
-        /// 清楚Toast
-        Toast.clear()
-      }
+      })
     })
   },
 
   /// 查询我的收藏数据信息
   queryMyFavorite() {
-    /// 发送查询
-    queryMyFavorite({
-      data: {
-        userid: userid(),
-        zscategorys: this.data.active == 0 ? '2' : '5'
-      },
-      /// 加载成功
-      success: (res) => {
-        if (res.code != 200) {
+    /// showLoading
+    showLoading(()=> {
+      /// 发送查询
+      queryMyFavorite({
+        data: {
+          userid: userid(),
+          zscategorys: this.data.active == 0 ? '2' : '5'
+        },
+        /// 加载成功
+        success: (res) => {
+          if (res.code != 200) {
+            /// 加载失败
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          hideLoading(()=>{
+            /// 数据赋值
+            this.setData({ 
+              favorites: res.data,
+              isEmpty: res.data.length === 0,
+              /// 显示的值
+              values: res.data.map(obj => {
+                return {up: [obj.weight.toString()+'ct', 
+                            isnullstr(obj.zsshapetypedisplay), 
+                            isnullstr(obj.sizedisplay), 
+                            isnullstr(obj.zscategorydisplay)], 
+                        dwn: [isnullstr(obj.zscolortype1display)+' | '+
+                              isnullstr(obj.zsclaritytype1display)+' | '+
+                              isnullstr(obj.zscuttype1display)+' | '+
+                              isnullstr(obj.zssymmetrytype1display)+' | '+
+                              isnullstr(obj.zspolishtype1display)+' | '+
+                              isnullstr(obj.zsfluorescencetype1display),
+                            obj.zscurrencytypedisplayunit+obj.price]}
+              })
+            })
+          })
+        },
+        fail: (emsg) => {
           /// 加载失败
-          Toast.fail({ message: '加载失败...'});
-          return
+          hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
+        },
+        complete: () => {
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
         }
-        /// 数据赋值
-        this.setData({ 
-          favorites: res.data,
-          /// 显示的值
-          values: res.data.map(obj => {
-            return {up: [obj.weight.toString()+'ct', 
-                        isnullstr(obj.zsshapetypedisplay), 
-                        isnullstr(obj.sizedisplay), 
-                        isnullstr(obj.zscategorydisplay)], 
-                    dwn: [isnullstr(obj.zscolortype1display)+' | '+
-                          isnullstr(obj.zsclaritytype1display)+' | '+
-                          isnullstr(obj.zscuttype1display)+' | '+
-                          isnullstr(obj.zssymmetrytype1display)+' | '+
-                          isnullstr(obj.zspolishtype1display)+' | '+
-                          isnullstr(obj.zsfluorescencetype1display),
-                        obj.zscurrencytypedisplayunit+obj.price]}
-          })
-        })
-      },
-      fail: (emsg) => {
-        /// 加载失败
-        Toast.fail({ message: '加载失败...'+emsg});
-      },
-      complete: () => {
-        /// 数据赋值
-        this.setData({ isEmpty: this.data.values.length == 0 })
-        /// 停止下拉刷新
-        wx.stopPullDownRefresh()
-      }
+      })
     })
   },
 

GuangZuan/miniprogram/pages/forgetpwd/index.wxml

@@ -1,8 +1,8 @@
 <view class="top-view">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">忘记密码</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">忘记密码</text>
   </van-nav-bar>
 </view>
 

GuangZuan/miniprogram/pages/home/index.less

@@ -15,7 +15,7 @@
   margin: 10px;
   background-color: #f0f0f0;
   padding: 15px;
-  border-radius: 5px;
+  border-radius: 10px;
   box-shadow: 5px 5px 5px #aaa;
 
   .statistics-item {
@@ -31,23 +31,82 @@
   }
 }
 
-.view_top_content {
+.gird-view {
   display: flex;
   flex-direction: row;
+  align-items: center;
+  align-content: center;
   justify-content: space-between;
+  border-radius: 10px;
+  background-color: #f0f0f0;
+  padding: 10px 0px;
+
+  &__item {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    align-content: center;
+    width: 100%;
+
+    &__icon {
+      width: 60px;
+      height: 60px;
+    }
+
+    &__title {
+      color: #333;
+      font-size: 24rpx;
+      width: 100%;
+      text-align: center;
+    }
+  }
+}
+
+.msg-view {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
   align-items: center;
+  align-content: center;
+  justify-content: center;
 
-  .msg_date {
-    font-size: 22rpx;
-    color: #999999;
-    text-align: left;
-    width: 120px;
+  &__top {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    width: 95%;
+    align-items: center;
+    align-content: center;
+
+    van-tabs {
+      width: 100px;
+    }
+
+    &__more {
+      width: 20px;
+      height: 20px;
+    }
   }
 
-  .msg_title {
-    font-size: 28rpx;
-    color: #333333;
-    text-align: left;
+  .view_top_content {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  
+    .msg_date {
+      font-size: 22rpx;
+      color: #999999;
+      text-align: left;
+      width: 120px;
+    }
+  
+    .msg_title {
+      font-size: 28rpx;
+      color: #333333;
+      text-align: left;
+    }
   }
 }
 

GuangZuan/miniprogram/pages/home/index.ts

@@ -2,7 +2,7 @@ import services from "../../services/index"
 import { queryImageConfigs, queryNotice } from "../../services/api/common/index"
 import { homeData } from "../../services/api/orders/index"
 import { loginid, loginQuery, userid } from "../../services/utils"
-import Toast from "../../miniprogram_npm/@vant/weapp/toast/toast"
+import { hideLoading, showLoading } from "../../utils/message/index"
 
 Page({
 
@@ -17,11 +17,11 @@ Page({
     /// banner轮播图
     banners: [''],
     /// 功能菜单
-    menus: [{id: 1, icon: '', title: '钻石搜索', path: '/mHome/pages/search/index'}, 
-            {id: 2, icon: '', title: '挂牌大厅', path: 'pages/trade/index'}, 
-            {id: 3, icon: '', title: '钻石首饰', path: '/mHome/pages/jewelry/list/index'}, 
-            {id: 4, icon: '', title: '出境检测', path: '/mHome/pages/inspection/list/index'}, 
-            {id: 5, icon: '', title: '保税服务', path: '/mHome/pages/bond/list/index'}],
+    menus: [{id: 1, icon: 'home-zsss', title: '钻石搜索', path: '/mHome/pages/search/index'}, 
+            {id: 2, icon: 'home-gpdt', title: '挂牌大厅', path: '/pages/trade/index'}, 
+            {id: 3, icon: 'home-ss', title: '钻石首饰', path: '/mHome/pages/jewelry/list/index'}, 
+            {id: 4, icon: 'home-cjjc', title: '出境检测', path: '/mHome/pages/inspection/list/index'}, 
+            {id: 5, icon: 'home-bsfw', title: '保税服务', path: '/mHome/pages/bond/list/index'}],
     /// 统计
     statistics: [{id: 1, title: '出售中', value: 0}, 
                  {id: 2, title: '求购中', value: 0}, 
@@ -30,10 +30,14 @@ Page({
                  {id: 5, title: '今日汇率', value: 0}],
     /// 首页数据
     homedata: [0, 0, 0, 0, 0],
+    /// tabs
+    tabs:[{id: 1, title: '公告'}, {id: 2, title: '消息'}],
     /// 公告消息
     notice: {},
     /// 公告系XO
-    msgs: [{}]
+    msgs: [{}],
+    /// 是否为空
+    isEmpty: true
   },
 
   /**
@@ -76,34 +80,35 @@ Page({
   /**
    * 查询通知公告消息
    */
-  queryNotice(){
+  queryNotice(type: number){
     /// loading
-    Toast.loading({ message: '请求中.....' })
-    /// 发送查询请求
-    queryNotice({
-      data: {
-        loginID: loginid()
-      },
-      success:(res) => {
-        /// 数据为空
-        if (res.code != 200) {
-          Toast('公告消息请求失败，原因：'+res.msg)
-          return
+    showLoading(()=>{
+      /// 发送查询请求
+      queryNotice({
+        data: {
+          loginID: loginid(),
+          msgType: type
+        },
+        success:(res) => {
+          /// 数据为空
+          if (res.code != 200) {
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          hideLoading(()=>{
+            /// 加载成功 数据复制
+            this.setData({ 
+              notice: res.data[0],
+              msgs: res.data,
+              isEmpty: res.data.length === 0
+            })
+          })
+        },
+        fail: (emsg) => {
+          /// 加载失败
+          hideLoading(()=>{}, '公告消息请求失败，原因：'+emsg, 'error')
         }
-        /// 加载成功 数据复制
-        this.setData({ 
-          notice: res.data[0],
-          msgs: res.data
-        })
-      },
-      fail: (emsg) => {
-        /// 加载失败
-        Toast('公告消息请求失败，原因：'+emsg)
-      },
-      complete: () => {
-        /// 清除Toast
-        Toast.clear()
-      }
+      })
     })
   },
 
@@ -125,6 +130,12 @@ Page({
     })
   },
 
+  /// onTabChange
+  onTabChange(e: any) {
+    /// 查询公告消息
+    this.queryNotice(e.detail.index)
+  },
+
   /**
    * 证书查询
    */
@@ -144,13 +155,16 @@ Page({
 
   /// onGirdClick
   onGirdClick(e: any) {
-    switch (e.target.id) {
-      case "挂牌大厅":
+    switch (e.currentTarget.id) {
+      case "2":
         wx.switchTab({
-          url: '/pages/trade/index'
+          url: e.currentTarget.dataset.url
         })
         break;
-      default:
+      default:  /// 其他页面跳转
+        wx.navigateTo({
+          url: e.currentTarget.dataset.url
+        })
         break;
     }
   },
@@ -162,7 +176,7 @@ Page({
     /// 获取新闻首页数据
     this.homeData()
     /// 查询新闻资讯
-    this.queryNotice()
+    this.queryNotice(1)
     /// 查询轮播图数据
     this.queryImageConfigs()
   },

GuangZuan/miniprogram/pages/home/index.wxml

@@ -1,5 +1,5 @@
 <!-- 导航栏 -->
-<nav-bar title="首页" left="{{false}}"></nav-bar>
+<nav-bar title="首页" left="{{ false }}"></nav-bar>
 
 <scroll-view style="padding-bottom: 80px;" scroll-y>
   <!-- banner轮播图 -->
@@ -23,27 +23,41 @@
   </view>
 
   <!-- 功能菜单 -->
-  <van-grid clickable column-num="5">
-    <van-grid-item wx:for="{{menus}}" wx:key="id" wx:for-index="idx" wx:for-item="itm" url="{{itm.path}}" icon="send-gift" id="{{itm.title}}" text="{{itm.title}}" bind:click="onGirdClick"/>
-  </van-grid>
-
-  <van-cell-group wx:if="{{msgs.length != 0}}">
-    <van-cell custom-class="msg-item" wx:for="{{msgs}}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{idx}}" bind:click="goToMsgDetail">
-      <view solt="title" class="view_top_content">
-        <text class="msg_date" user-select>{{itm.scheduletime}}</text>
-        <text class="msg_title" user-select>{{itm.title}}</text>
-      </view>
-    </van-cell>
-  </van-cell-group>
+  <view class="gird-view">
+    <view class="gird-view__item" wx:for="{{ menus }}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{ itm.id }}" data-url="{{ itm.path }}" bindtap="onGirdClick">
+      <image class="gird-view__item__icon" mode="widthFix" src="../../images/{{ itm.icon }}.png"></image>
+      <text class="gird-view__item__title">{{ itm.title }}</text>
+    </view>
+  </view>
+
+  <!-- 公告消息 -->
+  <view class="msg-view">
+    <view class="msg-view__top">
+      <van-tabs custom-class="msg-view__menus" bind:change="onChange" color="#2270D9" line-width="20px" title-inactive-color="#333" title-active-color="#2270D9" bind:change="onTabChange">
+        <van-tab wx:for="{{ tabs }}" wx:for-item="itm" wx:for-index="idx" wx:key="id" title="{{ itm.title }}" />
+      </van-tabs>
+      <image class="msg-view__top__more" src="../../images/home-more.png" bindtap="goToMsg"></image>
+    </view>
+    <van-cell-group wx:if="{{ !isEmpty }}">
+      <van-cell custom-class="msg-item" wx:for="{{msgs}}" wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{idx}}" bind:click="goToMsgDetail">
+        <view solt="title" class="view_top_content">
+          <text class="msg_date" user-select>{{ itm.scheduletime }}</text>
+          <text class="msg_title" user-select>{{ itm.title }}</text>
+        </view>
+      </van-cell>
+    </van-cell-group>
+  </view>
 </scroll-view>
 
+
 <!-- 证书查询  -->
 <view class="certsearch" style="background-image: url('../../images/home-zscx.png'); background-size: 100% 100%; width: 50px; height: 50px;" bindtap="goToCerserach"></view>
 <!-- 计算器  -->
 <view class="calculator" style="background-image: url('../../images/home-jsq.png'); background-size: 100% 100%; width: 50px; height: 50px;" bindtap="goToCalculator" ></view>
 <!-- toast --> 
 <van-toast id="van-toast" />
-
+<!-- 无数据 --> 
+<van-empty wx:if="{{ isEmpty }}" class="custom-image" description="无数据"/>
 
 
 

GuangZuan/miniprogram/pages/login/index.ts

@@ -4,6 +4,7 @@ import { appConfig } from '../../config/index'
 import { getDivisions, loginid, setAllEnums, taAccounts } from '../../services/utils'
 import Toast from '../../miniprogram_npm/@vant/weapp/toast/toast'
 import { getAllEnums } from '../../services/api/common/index'
+import { hideLoading, showLoading } from '../../utils/message/index'
 
 Page({
 
@@ -40,7 +41,7 @@ Page({
     }
     return true
   },
-
+  
   /**
    * 用户登录请求方法
    */
@@ -50,82 +51,84 @@ Page({
     /// loding.....
     this.setData({ isLoding: true })
     /// loding......
-    wx.showLoading({title: '登录中.....'})
-    /// 进行账户登录
-    login({
-      data: {
-        userName: this.data.username,
-        password: this.data.pwd,
-        clientType: 5
-      }, 
-      enableAuthorization: false,
-      success: (res) => {
-        /// 登录失败
-        if (res.code != 0) { 
-          Toast('登录失败，原因：'+res.msg)
-          return 
+    showLoading(() => {
+      /// 进行账户登录
+      login({
+        data: {
+          userName: this.data.username,
+          password: this.data.pwd,
+          clientType: 5
+        }, 
+        enableAuthorization: false,
+        success: (res) => {
+          hideLoading(() => {
+            /// 登录失败
+            if (res.code != 0) { 
+              /// isLoding
+              this.setData({ isLoding: false }) 
+              Toast('登录失败，原因：'+res.msg)
+              return 
+            }
+
+            /// 存储token以及loginId、userId
+            wx.setStorageSync('Authorization', res.data.token)
+            wx.setStorageSync('LoginID', res.data.loginId)
+            wx.setStorageSync('UserId', res.data.userId)
+
+            /// 获取地区区域信息
+            getDivisions()
+            /// 获取资金账户信息
+            taAccounts()
+            /// 登录查询
+            this.loginQuery()
+          })
+        },
+        fail: (emsg) => { 
+          Toast('登录失败，原因：'+emsg)
+          /// isLoding
+          this.setData({ isLoding: false }) 
+          hideLoading(()=> {}, '登录失败，原因：'+emsg)
         }
-
-        /// 存储token以及loginId、userId
-        wx.setStorageSync('Authorization', res.data.token)
-        wx.setStorageSync('LoginID', res.data.loginId)
-        wx.setStorageSync('UserId', res.data.userId)
-
-        /// 获取地区区域信息
-        getDivisions()
-        /// 获取资金账户信息
-        taAccounts()
-        /// 登录查询
-        this.loginQuery()
-      },
-      fail: (emsg) => { 
-        Toast('登录失败，原因：'+emsg)
-      },
-      complete: () => { 
-        /// 清除Toast
-        wx.hideLoading()
-        /// isLoding
-        this.setData({ isLoding: false }) 
-      }
-    })
+      })
+    }, '登录中.....')
   },
 
   /// 登录查询
   loginQuery() {
     /// showLoading
-    Toast.loading({ message: '数据查询中.....' })
-    /// 发送查询请求
-    loginQuery({
-      data: { loginID: loginid() },
-      success: (res) => {
-        /// 数据存储
-        wx.setStorageSync('LoginQuery', res.data)
-        /// 存储市场ID
-        wx.setStorageSync('MarketID', res.data.markets[0].marketid)
-        /// 获取所有的枚举值
-        this.getAllEnums()
-        
-        /// 登录失败
-        if (res.code != 200) { 
-          Toast.fail({message: '数据查询失败，原因:'+res.msg})
-          return 
+    showLoading(()=>{
+      /// 发送查询请求
+      loginQuery({
+        data: { loginID: loginid() },
+        success: (res) => {
+          /// 数据存储
+          wx.setStorageSync('LoginQuery', res.data)
+          /// 存储市场ID
+          wx.setStorageSync('MarketID', res.data.markets[0].marketid)
+          /// 获取所有的枚举值
+          this.getAllEnums()
+          
+          /// 登录失败
+          if (res.code != 200) { 
+            hideLoading(()=>{}, '数据查询失败，原因：'+res.msg, 'error')
+            return 
+          }
+
+          /// showToast
+          hideLoading(()=>{
+            /// 跳转到首页
+            wx.reLaunch({ url: '/pages/home/index' })
+          }, '登录成功', 'success')        
+        },
+        fail: (emsg) => {
+          /// showToast
+          hideLoading(()=>{}, '数据查询失败，原因：'+emsg, 'error')
+        },
+        complete: () => {
+          /// isLoding
+          this.setData({ isLoding: false })
         }
-
-        /// showToast
-        Toast.success({ message: '登录成功' })
-        /// 跳转到首页
-        wx.reLaunch({ url: '/pages/home/index' })
-      },
-      fail: (emsg) => {
-        /// showToast
-        Toast.fail({message: '数据查询失败，原因：'+emsg})
-      },
-      complete: () => {
-        /// hideLoading
-        Toast.clear()
-        /// isLoding
-        this.setData({ isLoding: false })
-      }
+      })
     })
   },
 
@@ -143,7 +146,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad() {
-
+    
   },
 
   /**

GuangZuan/miniprogram/pages/mine/index.less

@@ -92,6 +92,7 @@
   .cell-title {
     color: #333;
     font-size: 14px;
+    padding-left: 10px;
   }
 
   .loginOut-view {

GuangZuan/miniprogram/pages/mine/index.ts

@@ -1,7 +1,6 @@
-// pages/mine/index.ts
-import Dialog from '@vant/weapp/dialog/dialog';
-import Toast from '../../miniprogram_npm/@vant/weapp/toast/toast';
-import { accountid, loginid, loginQuery, taAccount, userid } from '../../services/utils';
+import Dialog from  '../../miniprogram_npm/@vant/weapp/dialog/dialog'
+import { accountid, loginid, loginQuery, taAccount } from '../../services/utils';
+import { hideLoading, showLoading } from '../../utils/message/index';
 
 Page({
 
@@ -17,11 +16,11 @@ Page({
                 {id: 5, title: '我的保税', img: 'fire-o',      path: '/mHome/pages/bond/list/index'}],
 
     // 列表菜单项
-    tablelists: [{id: 1, title: '签约账户', iconfont: 'https://www.iconfont.cn/search/index?searchType=icon&q=签约&page=1&fromCollection=1&fills=&tag=',   path: '/mMine/pages/bank/index'}, 
-                 {id: 2, title: '收货地址', iconfont: 'https://www.iconfont.cn/search/index?searchType=icon&q=签约&page=1&fromCollection=1&fills=&tag=',    path: '/mMine/pages/address/list/index'}, 
-                 {id: 3, title: '发票信息', iconfont: 'https://www.iconfont.cn/search/index?searchType=icon&q=签约&page=1&fromCollection=1&fills=&tag=',    path: '/mMine/pages/invoice/list/index'}, 
-                 {id: 4, title: '账户安全', iconfont: 'https://www.iconfont.cn/search/index?searchType=icon&q=签约&page=1&fromCollection=1&fills=&tag=',    path: '/mMine/pages/modifypwd/index'}, 
-                 {id: 5, title: '关于我们', iconfont: 'https://www.iconfont.cn/search/index?searchType=icon&q=签约&page=1&fromCollection=1&fills=&tag=',    path: '/mMine/pages/about/about/index'}],
+    tablelists: [{id: 1, title: '签约账户', iconfont: 'sign',   path: '/mMine/pages/bank/index'}, 
+                 {id: 2, title: '收货地址', iconfont: 'location-o',    path: '/mMine/pages/address/list/index'}, 
+                 {id: 3, title: '发票信息', iconfont: 'todo-list-o',    path: '/mMine/pages/invoice/list/index'}, 
+                 {id: 4, title: '账户安全', iconfont: 'wap-nav',    path: '/mMine/pages/modifypwd/index'}, 
+                 {id: 5, title: '关于我们', iconfont: 'info',    path: '/mMine/pages/about/about/index'}],
     /// 微信头像 
     avatarUrl: "",
     /// 微信昵称
@@ -91,14 +90,15 @@ Page({
         /// 清楚所有的缓存数据
         wx.clearStorage()
         /// loding....
-        Toast.loading('登出中....')
-
-        /// 登出
-        setTimeout(function () {
-          Toast.clear()
-          // on confirm
-          wx.reLaunch({ url: '/pages/login/index' })
-        }, 2000)
+        showLoading(()=>{
+          /// 登出
+          setTimeout(function () {
+            hideLoading(()=>{
+              // on confirm
+              wx.reLaunch({ url: '/pages/login/index' })
+            }, '登出成功', 'success')
+          }, 3000)
+        }, '登出中....')
     }).catch(() => {
         // on cancel
     });

GuangZuan/miniprogram/pages/mine/index.wxml

@@ -1,5 +1,3 @@
-<!-- 我的视图 -->
-
 <!-- 导航栏 -->
 <nav-bar title="我的" left="{{false}}"></nav-bar>
 
@@ -52,7 +50,8 @@
 
   <!-- 列表菜单项 -->
   <van-cell-group>
-    <van-cell clickable title-class="cell-title" center is-link border wx:for="{{tablelists}}" use-label-slot clickable wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{itm.id}}" title="{{itm.title}}" link-type="navigateTo" url="{{itm.path}}">
+    <van-cell clickable title-class="cell-title" size="large" center is-link border wx:for="{{tablelists}}" clickable wx:key="id" wx:for-index="idx" wx:for-item="itm" id="{{itm.id}}" title="{{itm.title}}" link-type="navigateTo" url="{{itm.path}}">
+      <van-icon slot="icon" size="25" name="{{ itm.iconfont }}"></van-icon>
     </van-cell>
   </van-cell-group>
 

GuangZuan/miniprogram/pages/register/index.wxml

@@ -1,8 +1,8 @@
 <view class="top-view">
   <!-- 导航栏 -->
-  <van-nav-bar custom-style="background-color: #E92020">
-    <van-icon slot="left" name="arrow-left" size="25px" color="white" bind:click="backToParent"/>
-    <text slot="title" style="color: white;">会员注册</text>
+  <van-nav-bar custom-style="background-color: #fff">
+    <van-icon slot="left" name="arrow-left" size="25px" color="#333" bind:click="backToParent"/>
+    <text slot="title" style="color: #333;">会员注册</text>
   </van-nav-bar>
 </view>
 

GuangZuan/miniprogram/pages/trade/index.ts

@@ -1,11 +1,10 @@
 import { queryBuyOrder, queryDiamond } from "../../services/api/orders/index"
-import Toast from "../../miniprogram_npm/@vant/weapp/toast/toast"
 import { clientType, isEncrypted, marketid, protoHeader, userid, timetample } from "../../services/utils";
 import { FunCode } from "../../constants/enum/funcode";
 import { sendMsgToMQ } from "../../services/api/common/index";
 import { isnullstr } from "../../utils/util";
+import { hideLoading, showLoading, showToast } from "../../utils/message/index";
 
-// pages/trade/index.ts
 Page({
 
   /**
@@ -207,68 +206,65 @@ Page({
    */
   onAddFavorite(index: number) {
     /// loding.....
-    Toast.loading({ message: '请求中.....'})
-    /// 委托单号
-    const wrtradeorderid = this.data.sellOrders[index].wrtradeorderid
-
-    /// 参数信息
-    const info = { 
-      UserID: userid(),
-      OperateType: 1,
-      ClientType: clientType(),
-      MarketID: marketid(),
-      ClientSerialNo: timetample().toString(),
-      WRTradeOrderID: wrtradeorderid,
-      Header: protoHeader(FunCode.GoodsFavoriteOperateReq)
-    }
-
-    /// 发送请求
-    sendMsgToMQ({
-      data: {
-        data: JSON.stringify(info),
-        funCodeReq: FunCode.GoodsFavoriteOperateReq,
-        funCodeRsp: FunCode.GoodsFavoriteOperateRsp,
-        isEncrypted: isEncrypted()
-      },
-      success: (res) => {
-        /// 操作失败
-        if (res.code != 0) {
-          Toast.fail({message: '请求失败，原因：'+res.msg})
-          return 
+    showLoading(()=>{
+      /// 委托单号
+      const wrtradeorderid = this.data.sellOrders[index].wrtradeorderid
+      /// 参数信息
+      const info = { 
+        UserID: userid(),
+        OperateType: 1,
+        ClientType: clientType(),
+        MarketID: marketid(),
+        ClientSerialNo: timetample().toString(),
+        WRTradeOrderID: wrtradeorderid,
+        Header: protoHeader(FunCode.GoodsFavoriteOperateReq)
+      }
+      /// 发送请求
+      sendMsgToMQ({
+        data: {
+          data: JSON.stringify(info),
+          funCodeReq: FunCode.GoodsFavoriteOperateReq,
+          funCodeRsp: FunCode.GoodsFavoriteOperateRsp,
+          isEncrypted: isEncrypted()
+        },
+        success: (res) => {
+          /// 操作失败
+          if (res.code != 0) {
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
+            return 
+          }
+          /// 操作成功
+          hideLoading(()=>{}, '请求成功'+res.msg, 'success')
+        },
+        fail: (emsg) => {
+          /// 操作失败
+          hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
         }
-        /// 操作成功
-        Toast.success({message: '请求成功'})
-      },
-      fail: (emsg) => {
-        /// 操作失败
-        Toast.fail({ message: '请求失败，原因：'+emsg})
-      }, complete: () => {}
+      })
     })
   },
 
   /// 查询出售大厅委托单
   queryDiamond() {
-    /// loding.....
-    Toast.loading({message: '加载中...'});
-    /// 获取参数
-    const storge = wx.getStorageSync('TradeParams')
     /// 数据存储
-    var info
-    if (this.data.storge) { info = JSON.parse(storge) }
-   
+    var data = {
+      /// 钻石分类
+      zscategory: this.data.category,
+      /// 形状
+      zsshapetype: this.data.shape,
+      /// 净度
+      zsclaritytype: [this.data.clarity],
+      /// 切工
+      zscuttype: [this.data.cut],
+      /// 荧光
+      zsfluorescencetype: [this.data.fluorescence],
+    }
+    /// 获取参数
+    const info = JSON.parse(wx.getStorageSync('TradeParams')) 
     /// 钻石查询
     queryDiamond({
       data: {
-        /// 钻石分类
-        zscategory: this.data.category,
-        /// 形状
-        zsshapetype: this.data.shape,
-        /// 净度
-        zsclaritytype: [this.data.clarity],
-        /// 切工
-        zscuttype: [this.data.cut],
-        /// 荧光
-        zsfluorescencetype: [this.data.fluorescence],
+        ...data,
         /// 颜色
         zscolortype: info ? info.zscolortype : [null],
         /// 货币类型
@@ -288,12 +284,13 @@ Page({
       success: (res) => {
         if (res.code != 200) {
           /// 加载失败
-          Toast.fail({ message: '加载失败，原因：'+res.msg});
+          showToast('请求失败，原因：'+res.msg)
           return
         }
         /// 数据赋值
         this.setData({ 
           sellOrders: res.data,
+          isEmpty: res.data.length === 0,
           /// 显示的值
           values: res.data.map(obj => {
             return {up: [obj.kpweight.toString()+'ct', 
@@ -311,13 +308,9 @@ Page({
       },
       fail: (emsg) => {
         /// 加载失败
-        Toast.fail({ message: '加载失败，原因：'+emsg});
+        showToast('请求失败，原因：'+emsg)
       },
       complete: () => {
-        /// Toast
-        Toast.clear()
-        /// 数据赋值
-        this.setData({ isEmpty: this.data.values.length == 0 })
         /// 停止下拉刷新
         wx.stopPullDownRefresh()
       }
@@ -327,50 +320,49 @@ Page({
   /// 查询求购大厅委托单
   queryBuyOrder() {
     /// loding.....
-    Toast.loading({message: '加载中...'});
-    /// loding....
-    queryBuyOrder({
-      data: {
-        /// 模糊搜索
-        zsallproperties: this.data.zsallproperties
-      },
-      /// 加载成功
-      success: (res) => {
-        if (res.code != 200) {
+    showLoading(()=>{
+      /// loding....
+      queryBuyOrder({
+        data: {
+          /// 模糊搜索
+          zsallproperties: this.data.zsallproperties
+        },
+        /// 加载成功
+        success: (res) => {
+          if (res.code != 200) {
+            /// 加载失败
+            hideLoading(()=>{}, '请求失败，原因：'+res.msg, 'error')
+            return
+          }
+          hideLoading(()=>{
+            /// 数据赋值
+            this.setData({ 
+              buyOrders: res.data,
+              isEmpty: res.data.length === 0,
+              /// 显示的值
+              values: res.data.map(obj => {
+                return {up: [isnullstr(obj.zsshapetypedisplay), 
+                            obj.zssize, 
+                            isnullstr(obj.zscategorydisplay)], 
+                        dwn: [isnullstr(obj.zscolortypedisplay)+' | '+
+                            isnullstr(obj.zsclaritytypedisplay)+' | '+
+                            isnullstr(obj.zscuttypedisplay)+' | '+
+                            isnullstr(obj.zssymmetrytypedisplay)+' | '+
+                            isnullstr(obj.zspolishtypedisplay)+' | '+
+                            isnullstr(obj.zsfluorescencetypedisplay), '']}
+              })
+            })
+          })
+        },
+        fail: (emsg) => {
           /// 加载失败
-          Toast.success({ message: '加载失败...'});
-          return
+          hideLoading(()=>{}, '请求失败，原因：'+emsg, 'error')
+        },
+        complete: () => {
+          /// 停止下拉刷新
+          wx.stopPullDownRefresh()
         }
-        /// 数据赋值
-        this.setData({ 
-          buyOrders: res.data,
-          /// 显示的值
-          values: res.data.map(obj => {
-            return {up: [isnullstr(obj.zsshapetypedisplay), 
-                        obj.zssize, 
-                        isnullstr(obj.zscategorydisplay)], 
-                    dwn: [isnullstr(obj.zscolortypedisplay)+' | '+
-                        isnullstr(obj.zsclaritytypedisplay)+' | '+
-                        isnullstr(obj.zscuttypedisplay)+' | '+
-                        isnullstr(obj.zssymmetrytypedisplay)+' | '+
-                        isnullstr(obj.zspolishtypedisplay)+' | '+
-                        isnullstr(obj.zsfluorescencetypedisplay),
-                        '']}
-          })
-        })
-      },
-      fail: (emsg) => {
-        /// 加载失败
-        Toast.fail({ message: '加载失败...'+emsg});
-      },
-      complete: () => {
-        /// Toast
-        Toast.clear()
-        /// 数据赋值
-        this.setData({ isEmpty: this.data.values.length == 0 })
-        /// 停止下拉刷新
-        wx.stopPullDownRefresh()
-      }
+      })
     })
   },
 
@@ -381,26 +373,18 @@ Page({
 
   onShow() {
     /// 获取参数
-    const storge = wx.getStorageSync('TradeParams')
+    const storge = JSON.parse(wx.getStorageSync('TradeParams'))
     if (storge) {
-      try {
-        /// 数据存储
-        const info = JSON.parse(storge)
-        /// 数据缓存
-        this.setData({ storge: info })
-        /// 数据赋值
-        if (info) {
-          this.setData({
-            category: info.category,
-            cut: info.zscuttype,
-            shape: info.zsshapetype,
-            clarity: info.zsclaritytype,
-            fluorescence: info.zsfluorescencetype
-          })
-        }
-      } catch (error) {}
+      /// 数据缓存
+      this.setData({ 
+        storge: storge,
+        category: storge.category,
+        cut: storge.zscuttype,
+        shape: storge.zsshapetype,
+        clarity: storge.zsclaritytype,
+        fluorescence: storge.zsfluorescencetype
+      })
     } 
-    
     /// 查询出售大厅委托单
     this.data.active == 0 ? this.queryDiamond() : this.queryBuyOrder()
   },

GuangZuan/miniprogram/pages/trade/index.wxml

@@ -5,7 +5,7 @@
 
   <!-- tabs -->
   <view class="tab-view">
-    <van-tabs custom-class="van-tabs"  sticky animated bind:change="onTabChange" color="#2270D9" title-active-color="#2270D9" title-inactive-color="#8F8AA6">
+    <van-tabs custom-class="van-tabs" sticky animated bind:change="onTabChange" color="#2270D9" title-active-color="#2270D9" title-inactive-color="#8F8AA6">
       <van-tab wx:for="{{tabs}}" wx:for-item="itm" wx:key="id" id="{{itm.id}}" title="{{itm.name}}"/>
     </van-tabs>  
     <van-icon id="listing-buy" name="plus" size="20" bind:click="onIconClick"/>
@@ -23,7 +23,7 @@
   </van-dropdown-menu>
 
   <!-- 搜索框 -->
-  <van-search model:value="{{ zsallproperties }}" use-action-slot="{{true}}" wx:if="{{active != 0}}" shape="round" input-align="center" background="#2270D9" placeholder="请输入商品属性 支持模糊查询">
+  <van-search model:value="{{ zsallproperties }}" use-action-slot="{{ true }}" wx:if="{{active != 0}}" shape="round" input-align="center" background="#999" placeholder="请输入商品属性 支持模糊查询">
     <view slot="action" style="color: white;" bind:tap="onClick">搜索</view>
   </van-search>
 
@@ -62,6 +62,6 @@
 </scroll-view>
 
 <!-- 无数据 --> 
-<van-empty wx:if="{{isEmpty}}" class="custom-image" description="无数据"/>
+<van-empty wx:if="{{ isEmpty }}" class="custom-image" description="无数据"/>
 <!-- toast --> 
 <van-toast id="van-toast" />