Parcourir la source

:art: 减小体积,图表调整

Ritchie il y a 1 an
Parent
commit
97d4d8247e
100 fichiers modifiés avec 2 ajouts et 2504 suppressions
  1. BIN
      src/assets/accountPer/addicon.png
  2. BIN
      src/assets/accountPer/icon.png
  3. BIN
      src/assets/accountPer/listIcon.png
  4. BIN
      src/assets/accountPer/sxIcon.png
  5. BIN
      src/assets/alarmHistory/icon.png
  6. BIN
      src/assets/device/diyFlowers/S01.png
  7. BIN
      src/assets/device/diyFlowers/S02.png
  8. BIN
      src/assets/device/diyFlowers/S03.png
  9. BIN
      src/assets/device/diyFlowers/S04.png
  10. BIN
      src/assets/device/diyFlowers/S05.png
  11. BIN
      src/assets/device/diyFlowers/S06.png
  12. BIN
      src/assets/device/diyFlowers/S07.png
  13. BIN
      src/assets/device/diyFlowers/S08.png
  14. BIN
      src/assets/device/diyFlowers/S09.png
  15. BIN
      src/assets/device/diyFlowers/T01.png
  16. BIN
      src/assets/device/diyFlowers/T02.png
  17. BIN
      src/assets/device/diyFlowers/T03.png
  18. BIN
      src/assets/device/diyFlowers/T04.png
  19. BIN
      src/assets/device/operIcon/alarmClock.png
  20. BIN
      src/assets/device/operIcon/awake.png
  21. BIN
      src/assets/device/operIcon/customLogo.png
  22. BIN
      src/assets/device/operIcon/deletedevice.png
  23. BIN
      src/assets/device/operIcon/diyFlower.png
  24. BIN
      src/assets/device/operIcon/doSugar.png
  25. BIN
      src/assets/device/operIcon/editPrice.png
  26. BIN
      src/assets/device/operIcon/editPrice1.png
  27. BIN
      src/assets/device/operIcon/ic_报警历史@3x.png
  28. BIN
      src/assets/device/operIcon/ic_查看位置@3x.png
  29. BIN
      src/assets/device/operIcon/lock.png
  30. BIN
      src/assets/device/operIcon/materialMonitor.png
  31. BIN
      src/assets/device/operIcon/materialMonitorOff.png
  32. BIN
      src/assets/device/operIcon/modulation.png
  33. BIN
      src/assets/device/operIcon/offSleep.png
  34. BIN
      src/assets/device/operIcon/onOff.png
  35. BIN
      src/assets/device/operIcon/openDoor.png
  36. BIN
      src/assets/device/operIcon/paramsSet.png
  37. BIN
      src/assets/device/operIcon/password.png
  38. BIN
      src/assets/device/operIcon/recharge.png
  39. BIN
      src/assets/device/operIcon/restart.png
  40. BIN
      src/assets/device/operIcon/saveProportion.png
  41. BIN
      src/assets/device/operIcon/showGoods.png
  42. BIN
      src/assets/device/operIcon/sleep.png
  43. BIN
      src/assets/device/operIcon/tuoji.png
  44. BIN
      src/assets/device/operIcon/viewLogs.png
  45. BIN
      src/assets/device/searchIcon.png
  46. BIN
      src/assets/discountCode/icon.png
  47. BIN
      src/assets/distributionSet/leftIcon.png
  48. BIN
      src/assets/home/M1.png
  49. BIN
      src/assets/home/M10.png
  50. BIN
      src/assets/home/M11.png
  51. BIN
      src/assets/home/M12.png
  52. BIN
      src/assets/home/M13.png
  53. BIN
      src/assets/home/M14.png
  54. BIN
      src/assets/home/M15.png
  55. BIN
      src/assets/home/M18.png
  56. BIN
      src/assets/home/M19.png
  57. BIN
      src/assets/home/M20.png
  58. BIN
      src/assets/home/M3.png
  59. BIN
      src/assets/home/M4.png
  60. BIN
      src/assets/home/M5.png
  61. BIN
      src/assets/home/M6.png
  62. BIN
      src/assets/home/M7.png
  63. BIN
      src/assets/home/M9.png
  64. BIN
      src/assets/home/noData.png
  65. BIN
      src/assets/joinPayMch/center.png
  66. BIN
      src/assets/joinPayMch/top1.png
  67. BIN
      src/assets/joinPayMch/top2.png
  68. BIN
      src/assets/joinPayMch/top3.png
  69. 1 290
      src/assets/language/zh.json
  70. 0 7
      src/router/index.js
  71. 0 97
      src/service/accountPar/index.js
  72. 0 20
      src/service/discountCode/index.js
  73. 0 19
      src/service/home/index.js
  74. 0 35
      src/service/labelMan/index.js
  75. 1 6
      src/service/login/forget-password.js
  76. 0 6
      src/service/login/index.js
  77. 0 16
      src/service/login/register.js
  78. 0 36
      src/service/merchantManage/index.js
  79. 0 27
      src/service/order/index.js
  80. 0 8
      src/service/popPayment.js
  81. 0 8
      src/service/robotRanking.js
  82. 0 93
      src/service/role/index.js
  83. 0 46
      src/service/taskMessage/index.js
  84. 0 89
      src/service/test.js
  85. 0 221
      src/service/trading/index.js
  86. 0 15
      src/service/typeSelectList.js
  87. 0 157
      src/styles/accountPer/index.less
  88. 0 112
      src/styles/alarmHistory/index.less
  89. 0 23
      src/styles/buyConfList/index.less
  90. 0 208
      src/styles/discountCode/index.less
  91. 0 98
      src/styles/distributionSet/index.less
  92. 0 211
      src/styles/joinpayMch/index.less
  93. 0 23
      src/styles/pendingOrderList/index.less
  94. 0 222
      src/styles/role/index.less
  95. 0 23
      src/styles/sellConfList/index.less
  96. 0 23
      src/styles/taskAccountList/index.less
  97. 0 22
      src/styles/taskMessage/index.less
  98. 0 27
      src/styles/transactionList/index.less
  99. 0 316
      src/views/accountPer/add.vue
  100. 0 0
      src/views/accountPer/index.vue

BIN
src/assets/accountPer/addicon.png


BIN
src/assets/accountPer/icon.png


BIN
src/assets/accountPer/listIcon.png


BIN
src/assets/accountPer/sxIcon.png


BIN
src/assets/alarmHistory/icon.png


BIN
src/assets/device/diyFlowers/S01.png


BIN
src/assets/device/diyFlowers/S02.png


BIN
src/assets/device/diyFlowers/S03.png


BIN
src/assets/device/diyFlowers/S04.png


BIN
src/assets/device/diyFlowers/S05.png


BIN
src/assets/device/diyFlowers/S06.png


BIN
src/assets/device/diyFlowers/S07.png


BIN
src/assets/device/diyFlowers/S08.png


BIN
src/assets/device/diyFlowers/S09.png


BIN
src/assets/device/diyFlowers/T01.png


BIN
src/assets/device/diyFlowers/T02.png


BIN
src/assets/device/diyFlowers/T03.png


BIN
src/assets/device/diyFlowers/T04.png


BIN
src/assets/device/operIcon/alarmClock.png


BIN
src/assets/device/operIcon/awake.png


BIN
src/assets/device/operIcon/customLogo.png


BIN
src/assets/device/operIcon/deletedevice.png


BIN
src/assets/device/operIcon/diyFlower.png


BIN
src/assets/device/operIcon/doSugar.png


BIN
src/assets/device/operIcon/editPrice.png


BIN
src/assets/device/operIcon/editPrice1.png


BIN
src/assets/device/operIcon/ic_报警历史@3x.png


BIN
src/assets/device/operIcon/ic_查看位置@3x.png


BIN
src/assets/device/operIcon/lock.png


BIN
src/assets/device/operIcon/materialMonitor.png


BIN
src/assets/device/operIcon/materialMonitorOff.png


BIN
src/assets/device/operIcon/modulation.png


BIN
src/assets/device/operIcon/offSleep.png


BIN
src/assets/device/operIcon/onOff.png


BIN
src/assets/device/operIcon/openDoor.png


BIN
src/assets/device/operIcon/paramsSet.png


BIN
src/assets/device/operIcon/password.png


BIN
src/assets/device/operIcon/recharge.png


BIN
src/assets/device/operIcon/restart.png


BIN
src/assets/device/operIcon/saveProportion.png


BIN
src/assets/device/operIcon/showGoods.png


BIN
src/assets/device/operIcon/sleep.png


BIN
src/assets/device/operIcon/tuoji.png


BIN
src/assets/device/operIcon/viewLogs.png


BIN
src/assets/device/searchIcon.png


BIN
src/assets/discountCode/icon.png


BIN
src/assets/distributionSet/leftIcon.png


BIN
src/assets/home/M1.png


BIN
src/assets/home/M10.png


BIN
src/assets/home/M11.png


BIN
src/assets/home/M12.png


BIN
src/assets/home/M13.png


BIN
src/assets/home/M14.png


BIN
src/assets/home/M15.png


BIN
src/assets/home/M18.png


BIN
src/assets/home/M19.png


BIN
src/assets/home/M20.png


BIN
src/assets/home/M3.png


BIN
src/assets/home/M4.png


BIN
src/assets/home/M5.png


BIN
src/assets/home/M6.png


BIN
src/assets/home/M7.png


BIN
src/assets/home/M9.png


BIN
src/assets/home/noData.png


BIN
src/assets/joinPayMch/center.png


BIN
src/assets/joinPayMch/top1.png


BIN
src/assets/joinPayMch/top2.png


BIN
src/assets/joinPayMch/top3.png


+ 1 - 290
src/assets/language/zh.json

@@ -52,51 +52,6 @@
     "machineRanking": "机器排行",
     "personalCenter": "个人中心"
   },
-  "accountPer": {
-    "usernameLabel": "账号",
-    "usernamePlaceholder": "请输入账号",
-    "passwordLabel": "密码",
-    "passwordPlaceholder": "请输入密码",
-    "editPasswordPlaceholder": "为空默认不修改",
-    "nameLabel": "姓名",
-    "namePlaceholder": "请输入姓名",
-    "phoneLabel": "电话",
-    "phonePlaceholder": "请输入电话",
-    "roleLabel": "角色",
-    "rolePlaceholder": "请选择角色",
-    "setUp": "设置",
-    "startOrNot": "是否启动",
-    "manageMachinesLabel": "机器",
-    "manageMachinesPlaceholder": "请选择管理机器",
-    "submit": "提交",
-    "modifyAccount": "修改账号",
-    "delete": "删除",
-    "addAccount": "添加子商家账号",
-    "whole": "全部",
-    "successfullyModifiedTheAccount": "修改账号成功",
-    "failedToModifyTheAccount": "修改账号失败",
-    "accountAddedSuccessfully": "添加账号成功",
-    "accountNameExists": "账号名已存在",
-    "failedToAddAccount": "添加账号失败",
-    "successfullyDeletedTheAccount": "删除账号成功",
-    "failedToDeleteTheAccount": "删除账号失败",
-    "accountPermission": "账号权限",
-    "total": "共 ",
-    "permissions": " 条权限",
-    "rolePermissions": "角色权限",
-    "add": "子商家",
-    "screen": "筛选",
-    "fullName": "姓名",
-    "role": "角色",
-    "accountNumber": "账号",
-    "effective": "已生效",
-    "paused": "已暂停",
-    "merchantNameLabel": "商户姓名",
-    "merchantNamePlaceholder": "请输入商户姓名",
-    "merchantAccountLabel": "商户账号",
-    "merchantAccountPlaceholder": "请选择商户账号",
-    "clickQuery": "点击查询"
-  },
   "advertManage": {
     "advertisingNameLabel": "广告名称",
     "advertisingNamePlaceholder": "请输入广告名称",
@@ -186,30 +141,6 @@
       }
     }
   },
-  "alarmHistory": {
-    "equipmentNoLabel": "设备编号",
-    "equipmentNoPlaceholder": "请输入设备编号",
-    "equipmentNameLabel": "设备名称",
-    "equipmentNamePlaceholder": "请输入设备名称",
-    "alarmTime": "报警时间",
-    "to": "至",
-    "startTime": "开始时间",
-    "endTime": "结束时间",
-    "clickQuery": "点击查询",
-    "selectFullTime": "选择日期",
-    "alarmHistory": "报警历史",
-    "requestFailed": "请求失败,点击重新加载",
-    "noMore": "没有更多了",
-    "common": "共 ",
-    "recordsTotal": " 条记录",
-    "search": "搜索",
-    "affiliatedMerchants": "所属商家",
-    "equipmentNo": "设备编号",
-    "equipmentName": "设备名称",
-    "creationTime": "报警时间",
-    "alarmContent": "报警内容",
-    "alltradings": "所有设备"
-  },
   "apkManage": {
     "apkManagement": "apk管理",
     "version": "版本号",
@@ -584,89 +515,6 @@
     "sunday": "日",
     "checkedAll": "全选"
   },
-  "discountCode": {
-    "discountCodeNoLabel": "优惠码编号",
-    "discountCodeNoPlaceholder": "请输入优惠码编号",
-    "creationTime": "创建时间",
-    "startTime": "开始时间",
-    "endTime": "结束时间",
-    "to": "至",
-    "usageTime": "使用时间",
-    "clickQuery": "点击查询",
-    "selectFullTime": "选择日期",
-    "discountCode": "优惠码",
-    "total": "共 ",
-    "discountCodesInTotal": " 个优惠码",
-    "search": "搜索",
-    "notUsed": "未使用",
-    "used": "已使用",
-    "export": "导出",
-    "apply": "申请",
-    "delete": "删除",
-    "cancel": "取消",
-    "selectAll": "全选",
-    "confirmDel": "确认删除",
-    "deletionSucceeded": "删除成功",
-    "discount": "折扣",
-    "deduction": "抵扣",
-    "termOfValidity": "有效期",
-    "affiliatedMerchants": "所属商家",
-    "expired": "(已过期)",
-    "validDays": "有效天数",
-    "usingTheMachine": "使用机器",
-    "purchaseDiscountCode": "购买优惠码",
-    "numberOfDiscountCodesLabel": "个数",
-    "numberOfDiscountCodesPlaceholder": "请输入个数",
-    "aSingleGenerationCannotExceed": "单次生成不能超过200个",
-    "pleaseEnterTheValidityPeriod": "请输入有效期",
-    "Months": "个月",
-    "noMoreThanMonths": "(不超过3个月)",
-    "days": "天",
-    "type": "类型",
-    "deductionRoll": "抵扣卷",
-    "discount2": "打折",
-    "deductionPriceLabdel": "抵扣价格",
-    "deductionPricePlaceholder": "请输入抵扣价格",
-    "enterNumber": "输入数字",
-    "paymentMethod": "支付方式",
-    "weChat": "微信",
-    "alipay": "支付宝",
-    "makePayment": "进行支付",
-    "pleaseEnterDiscount": "请输入折扣",
-    "theNumberOfDiscountCodesCannotExceed": "优惠码个数不能超过200",
-    "theValidityPeriodCannotExceedMonths": "有效期不能超过3个月",
-    "discountCannotBeGreaterThan": "折扣不能大于10",
-    "successfulProductionOfDiscountCode": "申请成功",
-    "applDiscCode": "申请优惠码"
-  },
-  "distributionSet": {
-    "distributionSettings": "分销设置",
-    "total": "共 ",
-    "leftTitle": " 条分销设置",
-    "rightAdd": "添加设备分销人",
-    "equipName": "设备名称",
-    "partners": "合作商",
-    "distProp": "分销比例",
-    "applTime": "申请时间",
-    "reviewed": "已审核",
-    "apprPend": "待审批",
-    "addDist": {
-      "title": "添加分销人",
-      "editTitle": "编辑分销人",
-      "clientId": "设备编码",
-      "autoBrought": "自动带出",
-      "clientIdPlace": "请选择设备编码",
-      "myDistProport": "我的分销比例",
-      "distInof": "分销信息",
-      "platDistRange": "平台分销比例范围为1-100",
-      "distPropRange": "分销比例范围为0-100",
-      "noZero": "平台分销比例最低为1%",
-      "notDelMore": "不能再删除了",
-      "submitSuccess": "提交成功",
-      "submitFailed": "提交失败",
-      "hasExamine": "已存在待审核记录,请勿重复提交"
-    }
-  },
   "home": {
     "theLatestMessageIsDisplayedHereYouHaveAMessageToRead": "这里显示最新的消息,您有一条消息待阅读",
     "totalEquipment": "总设备",
@@ -679,12 +527,8 @@
     "salesAmount": "销售额",
     "commonTools": "常用工具",
     "tradingManagement": "设备管理",
-    "discountCode": "优惠码",
-    "distributionSettings": "分销设置",
-    "accountPermission": "账号权限",
     "merchantManagement": "商户管理",
     "advertisingManagement": "广告管理",
-    "alarmHistory": "报警历史",
     "orderAnalysis": "订单分析",
     "shandeSubLedger": "杉德分账",
     "taskMessage": "任务消息",
@@ -710,97 +554,6 @@
       "sun": "周日"
     }
   },
-  "joinpayMch": {
-    "huifuAuditStatus": "汇付入驻状态",
-    "joinpayAuditStatus": "汇聚入驻状态",
-    "settlementAccount": "结算账号",
-    "withdrawalAccountNo": "提现账号",
-    "merchantNameLabel": "商户名称",
-    "merchantNamePlaceholder": "请输入商户名称",
-    "merchantNameTips": "必须与商家营业执照上的名称一致",
-    "merchantAccountLabel": "商户账号",
-    "merchantAccountPlaceholder": "请输入商户账号",
-    "merchantAbbreviationLabel": "商户简称",
-    "merchantAbbreviationPlaceholder": "请输入商户简称",
-    "merchantAbbreviationTips": "需与商户注册名称相关",
-    "merchantType": "商户类型",
-    "personal": "个人",
-    "individualBusinesses": "个体工商户",
-    "enterprise": "企业",
-    "contactNameLabel": "联系人姓名",
-    "contactNamePlaceholder": "请输入联系人姓名",
-    "cellPhoneLabel": "联系人手机",
-    "cellPhonePlaceholder": "请输入联系人手机",
-    "nameOfLegalPerson/IndividualLabel": "法人/个人姓名",
-    "nameOfLegalPerson/IndividualPlaceholder": "请输入法人/个人姓名",
-    "phoneNumberOfLegalPerson/IndividualLabel": "法人/个人手机号",
-    "phoneNumberOfLegalPerson/IndividualPlaceholder": "请输入法人/个人手机号",
-    "IDLabel": "身份证",
-    "IDPlaceholder": "请输入身份证",
-    "validityOfIDCard": "身份证有效期",
-    "pictureReview": "图片审核情况",
-    "reUpload": "重新上传",
-    "signingStatus": "签约状态",
-    "signAContract": "签约",
-    "accountType": "账户类型",
-    "debitCard": "借记卡",
-    "corporateAccount": "对公账户",
-    "bankAccountNameLabel": "账户名称",
-    "bankAccountNamePlaceholder": "请输入账户持有人姓名",
-    "bankAccountNameTips": "填写账户的持有人姓名,确保与银行卡上的姓名一致!",
-    "bankAccountLabel": "银行账号",
-    "bankAccountPlaceholder": "请输入银行账号,确保无误",
-    "interBankNoLabel": "联行号",
-    "interBankNoPlaceholder": "请输入联行号",
-    "businessLicenseNoLabel": "统一社会信用代码",
-    "businessLicenseNoPlaceholder": "请输入统一社会信用代码",
-    "validityOfBusinessLicenseLabel": "营业执照有效期",
-    "validityOfBusinessLicensePlaceholder": "请输入营业执照有效期",
-    "settlementMethod": "结算方式",
-    "autoSettlementByConvergence": "由汇聚自动结算",
-    "manuallySettledByMerchantPlatform": "由商户平台手工结算",
-    "settlementCycleType": "结算周期类型",
-    "weekDay": "工作日",
-    "naturalDay": "自然日",
-    "monthlySettlementDate": "月结日",
-    "settlementCycleLabel": "结算周期",
-    "settlementCyclePlaceholder": "请输入结算周期",
-    "natureOfBusinessLabel": "经营范围",
-    "natureOfBusinessPlaceholder": "请输入经营范围",
-    "businessAddressLabel": "经营地址",
-    "businessAddressPlaceholder": "请输入经营地址",
-    "submitDataForReview": "提交资料进行审核",
-    "thePlatformAdministratorIsReviewing": "平台管理员审核中",
-    "youCan": "你可以",
-    "withdrawAndRevise": "撤回重新修改",
-    "failedToPassTheReview": "审核不通过",
-    "clickHereToFillInTheInformationAgain": "点击这里重新填写资料",
-    "approvalPassed": "审核已通过",
-    "clickHereToFillInAgainAndSubmitForReview": "点击这里重新填写并提交审核",
-    "nextGoToUploadIDPhotos": "下一步,去上传证件照片",
-    "uploYourIdCard": "请上传身份证",
-    "uploPortrait": "上传人像面",
-    "uploNatiEmblem": "上传国徽面",
-    "upStatementCard": "请上传结算卡",
-    "statementCard": "结算卡正面",
-    "businessLicensePlace": "请上传企业营业执照",
-    "businessLicense": "企业营业执照",
-    "accountOpeningLicensePlace": "请上传开户许可证",
-    "accountOpeningLicense": "开户许可证照片",
-    "frontOfIDCardLabel": "身份证正面",
-    "frontOfIDCardPlaceholder": "请输入身份证正面图片路径",
-    "backOfIDCardLabel": "身份证背面",
-    "backOfIDCardPlaceholder": "请输入身份证背面图片路径",
-    "pictureOfBusinessLicenseLabel": "营业执照图片",
-    "pictureOfBusinessLicensePlaceholder": "请输入营业执照图片图片路径",
-    "submissions": "提交资料",
-    "submittedSuccessfully": "提交成功",
-    "submitFailed": "提交失败",
-    "withdrawalSucceeded": "撤回成功",
-    "uploadSucceeded": "上传成功",
-    "signingSuccessfully": "签约成功",
-    "exceedPictSize": "图片大小不能超过2M"
-  },
   "merchantManage": {
     "merchantManagement": "商户管理",
     "total": "共 ",
@@ -839,7 +592,6 @@
     "domesticOrNot": "是否国内",
     "yes": "是",
     "no": "否",
-    "discountCode": "0折优惠码",
     "paymentPlatform": "支付平台",
     "convergence": "汇聚",
     "huifuPaymnt": "汇付",
@@ -863,7 +615,6 @@
     "bankNo": "联行号",
     "theTwoPasswordsAreDifferent": "两次密码输入不相同",
     "modificationSucceeded": "修改成功",
-    "joinpayMch": "汇聚账号状态",
     "huifuMch": "汇付账号状态",
     "tips": "提醒",
     "autoLogin": "是否切换登陆?"
@@ -978,12 +729,8 @@
     "pleaseSelectAPattern": "请选择花型",
     "tradingManagement": "设备管理",
     "tradingView": "设备查看",
-    "distributionSettings": "分销设置",
-    "alarmHistory": "报警历史",
     "advertisingManagement": "广告管理",
     "taskMessage": "任务消息",
-    "discountCode": "优惠码",
-    "accountPermission": "账号权限",
     "orderExport": "订单导出",
     "shandeSubLedger": "杉德分账",
     "salesRanking": "销售排行",
@@ -1168,42 +915,6 @@
         "statePlace": "请选择状态",
         "filterBtn": "点击查询"
       }
-    },
-    "joinpayMchCheck": {
-      "convergence": "汇聚",
-      "huifu": "汇付",
-      "withAccoDetail": "提现账号详情",
-      "merchantName": "商户名称",
-      "shortName": "商户简称",
-      "merchantType": "商户类型",
-      "contactName": "联系人姓名",
-      "indiOrPersName": "法人/个人姓名",
-      "indiOrPersPhone": "法人/个人手机号",
-      "indiOrPersPhoneIdCard": "法人/个人身份证",
-      "idCardValid": "身份证有效期",
-      "accountType": "账号类型",
-      "bankAccountName": "银行账号名称",
-      "bankAccount": "银行账号",
-      "interBankNo": "联行号",
-      "settlMethod": "结算方式",
-      "settlCycle": "结算周期",
-      "businessNature": "经营范围",
-      "businessAddress": "经营地址",
-      "personal": "个人",
-      "indivBusines": "个体工商户",
-      "enterprise": "企业",
-      "debitCard": "借记卡",
-      "corporateAccount": "对公账户",
-      "autoSettByConvergence": "由汇聚自动结算",
-      "manuSettByMercPlatform": "由商户平台手工结算",
-      "day": "日",
-      "merchantID": "商户ID",
-      "phone": "联系人号码",
-      "email": "联系人邮箱",
-      "certNo": "身份证号",
-      "cardName": "卡户名",
-      "mp": "结算手机号",
-      "successful": "审核成功"
     }
   },
   "changePassword": {
@@ -1221,7 +932,7 @@
   "forgetPassword": {
     "header": "忘记密码",
     "usernameLabel": "账号名称",
-    "usernamePlaceholder": "请输入账号名称",
+    "usernamePlaceholder": "请输入账户手机号",
     "selectForgetPassword": "选择重置密码方式",
     "usernameRequired": "请输入账号名称",
     "phone": "手机号",

+ 0 - 7
src/router/index.js

@@ -132,13 +132,6 @@ const router = createRouter({
       component: () => import("@/views/feedback/FeedbackIndex.vue"),
       meta: { index: 1 },
     },
-    // 账号权限
-    {
-      path: "/accountPer",
-      name: "accountPer",
-      component: () => import("@/views/accountPer/index"),
-      meta: { index: 1 },
-    },
     // 任务消息/系统管理
     {
       path: "/taskMessage",

+ 0 - 97
src/service/accountPar/index.js

@@ -1,97 +0,0 @@
-import axios from '@/utils/axios';
-import { stringToUrl } from '@/common/js/utils';
-
-// 获取子账户列表
-export function getChildAdminList(params) {
-    return axios.get(`/SZWL-SERVER/tAdmin/getChildDrenAdminList?${stringToUrl(params)}`, params);
-}
-// 获取角色下拉
-export function getSysRoleList(params) {
-    return axios.get(`/SZWL-SERVER/sysRoleMenu/listRoleOption`,{params});
-}
-// 获取旗下的机器
-export function getEquipmentList(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/listEquipment?${stringToUrl(params)}`, params);
-}
-
-// 添加子账户
-export function addLoginUser(params) {
-    return axios.post(`/SZWL-SERVER/tAdmin/addLoginUser`, params);
-}
-// 修改子账户
-export function updataLoginUser(params) {
-    return axios.post(`/SZWL-SERVER/tAdmin/updateLoginUser`, params);
-}
-// 删除子账户
-export function deleteLoginUser(params) {
-    return axios.post(`/SZWL-SERVER/tAdmin/deleteLoginUser`, params);
-}
-
-
-
-
-// 获取商户列表
-export function tAdminPageAdmin(params) {
-    return axios.get(`/SZWL-SERVER/tAdmin/pageAdmin?${stringToUrl(params)}`, params);
-}
-// 获取优惠码列表
-export function getPromoCode(params) {
-    return axios.get(`/SZWL-SERVER/tPromoCode/pagePromoCode?${stringToUrl(params)}`, params);
-}
-
-// 获取旗下关联商家
-export function gettAdminList(params) {
-    return axios.get(`/SZWL-SERVER/tAdmin/listAdmin?${stringToUrl(params)}`, params);
-}
-// 获取标签管理
-export function gettLabelList(params) {
-    return axios.get(`/SZWL-SERVER/tLabel/list?${stringToUrl(params)}`, params);
-}
-// 获取标签详情
-export function gettLabel(params) {
-    return axios.get(`/SZWL-SERVER/tLabel/getOne?${stringToUrl(params)}`, params);
-}
-// 添加标签
-export function addtLabel(params) {
-    return axios.post(`/SZWL-SERVER/tLabel/add?${stringToUrl(params)}`, params);
-}
-// 删除标签
-export function deleteLabel(params) {
-    return axios.get(`/SZWL-SERVER/tLabel/delete?${stringToUrl(params)}`, params);
-}
-// 单个机器设置标签
-export function equipmentToLabel(params) {
-    return axios.get(`/SZWL-SERVER/tLabel/equipmentToLabel?${stringToUrl(params)}`, params);
-}
-
-
-
-// 获取APK列表
-export function getApkList(params) {
-    return axios.get(`/SZWL-SERVER/tApkInfo/pageApkInfo?${stringToUrl(params)}`)
-}
-// 添加APK
-export function addApk(params) {
-    return axios.post(`/SZWL-SERVER/tApkInfo/add`, params)
-}
-// 修改APK
-export function updateApk(params) {
-    return axios.post(`/SZWL-SERVER/tApkInfo/update`, params);
-}
-// 获取广告列表(分页)
-export function getAdList(params) {
-    return axios.get(`/SZWL-SERVER/tAd/pageAd?${stringToUrl(params)}`)   
-}
-// 新增广告
-export function addAd(params) {
-    return axios.post(`/SZWL-SERVER/tApkInfo/add`, params);
-}
-// 获取广告规则列表
-export function getTimeRuleList(params) {
-    return axios.get(`/SZWL-SERVER/tTimeRule/pageTimeRule?${stringToUrl(params)}`)   
-}
-
-// 获取商户下拉列表
-export function getAdminList(params) {
-    return axios.get(`/SZWL-SERVER/tAdmin/getAdminList?${stringToUrl(params)}`);
-}

+ 0 - 20
src/service/discountCode/index.js

@@ -1,20 +0,0 @@
-
-import axios from '../../utils/axios';
-import { stringToUrl } from '@/common/js/utils';
-
-// 获取优惠码列表
-export function getdiscountCodeList(params) {
-  return axios.get(`/SZWL-SERVER/tPromoCode/pagePromoCode?${stringToUrl(params)}`);
-}
-// 导出优惠码
-export function discountCodeExport(params) {
-  return axios.get(`/SZWL-SERVER/tPromoCode/export?${stringToUrl(params)}`, { responseType: 'blob' })
-}
-// 添加优惠码
-export function addCode(params) {
-  return axios.get(`/SZWL-SERVER/tPromoCode/add?${stringToUrl(params)}`);
-}
-// 批量删除优惠码
-export function deleteCode(params) {
-  return axios.post(`/SZWL-SERVER/tPromoCode/deletes`, params)
-}

+ 0 - 19
src/service/home/index.js

@@ -1,5 +1,4 @@
 import axios from '../../utils/axios'
-import { stringToUrl } from '@/common/js/utils';
 
 // 用户累计成交,Top5
 export function getTop5List() {
@@ -16,30 +15,12 @@ export function getListStockInfoForMonth() {
     return axios.get(`/index/listStockInfoForMonth`);
 }
 
-
 // 获取公告
 export function getPageNotice(params) {
     return axios.get(`/notificationInfo/pageNotificationInfo`, { params });
 }
 
-
-// 获取商家列表
-export function getAdminList(params) {
-    return axios.get(`/SZWL-SERVER/tAdmin/getAdminList?${stringToUrl(params)}`);
-}
 // 获取公告
 export function Api_getNotice(params) {
     return axios.get(`/tNotice/getNotice`, { params });
 }
-// 公告已读修改状态
-export function Api_getUpdateNotice(params) {
-    return axios.get(`/SZWL-SERVER/tNotice/updateNotice`, { params });
-}
-// 获取设备情况
-export function Api_postMachineNum(params) {
-    return axios.post(`/SZWL-SERVER/tEquipment/getMachineNum`, params );
-}
-// 查询是否有设备报警
-export function getIsAlarm(params) {
-    return axios.get(`/SZWL-SERVER/tAlarmRecord/isAlarm?${stringToUrl(params)}`);
-}

+ 0 - 35
src/service/labelMan/index.js

@@ -1,35 +0,0 @@
-import axios from '../../utils/axios';
-
-// 获取标签列表
-export function Api_getLabelList(params) {
-  return axios.get('/SZWL-SERVER/tLabel/list', { params });
-}
-// 获取商家列表
-export function Api_getListAdmin(params) {
-  return axios.get('/SZWL-SERVER/tAdmin/listAdmin', { params });
-}
-// 获取机器列表
-export function Api_getListEquipment(params) {
-  return axios.get('/SZWL-SERVER/tEquipment/listEquipment', { params });
-}
-
-// 添加
-export function Api_postAddLabel(params) {
-  return axios.post('/SZWL-SERVER/tLabel/add', params);
-}
-// 修改
-export function Api_postUpdateLabel(params) {
-  return axios.post('/SZWL-SERVER/tLabel/update', params);
-}
-// 删除
-export function Api_getDelLabel(params) {
-  return axios.post('/SZWL-SERVER/tLabel/delete', params);
-}
-// 单个机器添加标签
-export function Api_getEquipmentToLabel(params) {
-  return axios.get('/SZWL-SERVER/tLabel/equipmentToLabel', { params });
-}
-// 查询机器的标签列表
-export function Api_getGetEquipmentToLabel(params) {
-  return axios.get('/SZWL-SERVER/tLabel/getEquipmentToLabel', { params });
-}

+ 1 - 6
src/service/login/forget-password.js

@@ -2,16 +2,11 @@ import axios from '../../utils/axios'
 // import { stringToUrl } from '@/common/js/utils';
 
 // 发送验证码
-// export function sentForgetCode(params) {
-//   return axios.post(`/SZWL-SERVER/tMessageCode/sentForgetCode?${stringToUrl(params)}`, params);
-// }
-
-// 发送验证码
 export function sentForgetCode(params) {
   return axios.get(`/userLogin/sendVerificationCodeMessage?phone=${params.phone}`, params);
 }
 
-// 注册
+// 忘记密码提交
 export function checkForgetCode(params) {
   return axios.post(`/SZWL-SERVER/tMessageCode/checkForgetCode?ifForeign=${params.ifForeign}&phoneOrEmail=${params.phoneOrEmail}&code=${params.code}`, params);
 }

+ 0 - 6
src/service/login/index.js

@@ -1,10 +1,4 @@
 import axios from '../../utils/axios'
-// import { stringToUrl } from '@/common/js/utils';
-
-// 登录
-// export function login(params) {
-//   return axios.post(`/SZWL-SERVER/tAdmin/login?username=${params.username}&password=${params.password}&hostName=${params.hostName}`, params);
-// }
 
 // 登录 stock
 export function login(loginParam) {

+ 0 - 16
src/service/login/register.js

@@ -1,22 +1,6 @@
 import axios from '../../utils/axios';
-// import { stringToUrl } from '@/common/js/utils';
 
 
-// 发送验证码
-// export function sentRegisterCode(params) {
-//   return axios.post(`/SZWL-SERVER/tMessageCode/sentRegisterCode?${stringToUrl(params)}`, params);
-// }
-
-// 注册
-// export function tAdminSave(params) {
-//   return axios.post(`/SZWL-SERVER/tAdmin/save`, params);
-// }
-
-// 获取最后一次发送验证码的时间
-export function getLastSendTime(params) {
-  return axios.get(`/SZWL-SERVER/tMessageCode/getLastSendTime?phoneOrEmail=${params.phoneOrEmail}`, params);
-}
-
 // 注册股票账户
 export function addUserApply(params) {
   return axios.post(`/userLogin/addUserApply`, params);

+ 0 - 36
src/service/merchantManage/index.js

@@ -1,48 +1,12 @@
 import axios from '../../utils/axios';
-import { stringToUrl } from '@/common/js/utils';
 
-// 获取商户列表
-export function getAdminList(params) {
-  return axios.get(`/SZWL-SERVER/tAdmin/pageAdmin?${stringToUrl(params)}`);
-}
-// 获取账户基本详情
-// export function getAdmin(params) {
-//   return axios.get(`/SZWL-SERVER/tAdmin/getAdmin?${stringToUrl(params)}`);
-// }
 // 获取账户个人信息详情 getLoginInfo
 export function getLoginInfo() {
   return axios.get(`/myCenter/getLoginInfo`);
 }
 
-// 通过 adminId 获取上级账号信息
-export function getRelation(params) {
-  return axios.get(`/SZWL-SERVER/tAdmin/getRelation?${stringToUrl(params)}`);
-}
-// 通过 username 获取账号id
-export function getRelationAdminId(params) {
-  return axios.get(`/SZWL-SERVER/tAdmin/getRelationAdminId?${stringToUrl(params)}`);
-}
-// 获取账户基本详情-提现信息
-export function getAdminMch(params) {
-  return axios.get(`/SZWL-SERVER/tJoinpayMch/getMch?${stringToUrl(params)}`);
-}
-// 修改账户信息
-// export function updateAdmin(params) {
-//   // tAdmin/update
-//   return axios.post(`/SZWL-SERVER/tAdmin/update`, params);
-// }
-
 // 更改 用户关键信息和状态
 export function updateAdmin(params) {
   return axios.put(`/userInfo/updateUserInfo`, params);
 }
 
-// 获取汇付信息
-export function getHuifuMch(params) {
-  return axios.get(`/SZWL-SERVER/tHuifuMch/getHuifuMchCheck?${stringToUrl(params)}`);
-}
-// 切换登陆
-export function autoLoginMerchant(params) {
-  return axios.get(`/SZWL-SERVER/tAdmin/autoLogin?${stringToUrl(params)}`);
-}
-

+ 0 - 27
src/service/order/index.js

@@ -1,27 +0,0 @@
-import axios from '../../utils/axios';
-import { stringToUrl } from '@/common/js/utils';
-
-// 获取订单列表
-export function getOrderList(params) {
-  return axios.get(`/ORDER-SERVER/tOrder/pageOrder?${stringToUrl(params)}`);
-}
-// 获取商户下拉列表
-export function getAdminList(params) {
-    return axios.get(`/SZWL-SERVER/tAdmin/getAdminList?${stringToUrl(params)}`);
-}
-// 获取设备列表
-export function getEquipmentList(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/listEquipment?${stringToUrl(params)}`);
-}
-// 获取订单列表
-export function getProductList(params) {
-    return axios.get(`/SZWL-SERVER/tProduct/getProducts?${stringToUrl(params)}`);
-}
-// 退款
-export function refundOrder(params) {
-    return axios.post(`/SZWL-SERVER/tOrder/refund`, params);
-}
-// 微信退款
-export function refundWechatOrder(params) {
-  return axios.post(`/PAY-SERVER/wechatPay/refund`, params);
-}

+ 0 - 8
src/service/popPayment.js

@@ -1,8 +0,0 @@
-import axios from '../utils/axios';
-import { stringToUrl } from '@/common/js/utils';
-
-
-// 修改密码
-export function getOrderBySn(params) {
-  return axios.get(`/PAY-SERVER/tOrder/getOrderBySn?${stringToUrl(params)}`,params);
-}

+ 0 - 8
src/service/robotRanking.js

@@ -1,8 +0,0 @@
-import axios from '../utils/axios';
-import { stringToUrl } from '@/common/js/utils';
-
-// 获取机器排行数据
-export function getRankingList(params) {
-    return axios.post(`/ORDER-SERVER/tOrder/getEquipmentStatistics?${stringToUrl(params)}`, params);
-}
-  

+ 0 - 93
src/service/role/index.js

@@ -1,93 +0,0 @@
-import axios from '@/utils/axios';
-import { stringToUrl } from '@/common/js/utils';
-
-// 获取子账户列表
-export function getChildAdminList(params) {
-    return axios.get(`/SZWL-SERVER/tAdmin/getChildDrenAdminList?${stringToUrl(params)}`, params);
-}
-// 获取角色列表
-export function getSysRoleAdminList(params) {
-    return axios.get(`/SZWL-SERVER/sysRoleMenu/pageRoleOption?${stringToUrl(params)}`);
-}
-// 获取角色下拉
-export function getSysRoleList() {
-    return axios.get(`/SZWL-SERVER/sysRoleMenu/listRoleOption`);
-}
-// 添加角色
-export function addSysRole(params) {
-    return axios.post(`/SZWL-SERVER/sysRoleMenu/addSysRole`, params);
-}
-// 删除角色
-export function deleteSysRole(params) {
-    return axios.get(`/SZWL-SERVER/sysRoleMenu/deleteRoleOption?${stringToUrl(params)}`);
-}
-// 修改角色
-export function updateSysRole(params) {
-    return axios.post(`/SZWL-SERVER/sysRoleMenu/updateSysRole`, params);
-}
-
-// 获取旗下的机器
-export function getEquipmentList(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/listEquipment?${stringToUrl(params)}`, params);
-}
-
-// 获取商户列表
-export function tAdminPageAdmin(params) {
-    return axios.get(`/SZWL-SERVER/tAdmin/pageAdmin?${stringToUrl(params)}`, params);
-}
-// 获取优惠码列表
-export function getPromoCode(params) {
-    return axios.get(`/SZWL-SERVER/tPromoCode/pagePromoCode?${stringToUrl(params)}`, params);
-}
-
-// 获取旗下关联商家
-export function gettAdminList(params) {
-    return axios.get(`/SZWL-SERVER/tAdmin/listAdmin?${stringToUrl(params)}`, params);
-}
-// 获取标签管理
-export function gettLabelList(params) {
-    return axios.get(`/SZWL-SERVER/tLabel/list?${stringToUrl(params)}`, params);
-}
-// 获取标签详情
-export function gettLabel(params) {
-    return axios.get(`/SZWL-SERVER/tLabel/getOne?${stringToUrl(params)}`, params);
-}
-
-// 删除标签
-export function deleteLabel(params) {
-    return axios.get(`/SZWL-SERVER/tLabel/delete?${stringToUrl(params)}`, params);
-}
-// 单个机器设置标签
-export function equipmentToLabel(params) {
-    return axios.get(`/SZWL-SERVER/tLabel/equipmentToLabel?${stringToUrl(params)}`, params);
-}
-
-// 添加子账户
-export function addLoginUser(params) {
-    return axios.post(`/SZWL-SERVER/tAdmin/addLoginUser`, params);
-}
-
-// 获取APK列表
-export function getApkList(params) {
-    return axios.get(`/SZWL-SERVER/tApkInfo/pageApkInfo?${stringToUrl(params)}`)
-}
-// 添加APK
-export function addApk(params) {
-    return axios.post(`/SZWL-SERVER/tApkInfo/add`, params)
-}
-// 修改APK
-export function updateApk(params) {
-    return axios.post(`/SZWL-SERVER/tApkInfo/update`, params);
-}
-// 获取广告列表(分页)
-export function getAdList(params) {
-    return axios.get(`/SZWL-SERVER/tAd/pageAd?${stringToUrl(params)}`)   
-}
-// 新增广告
-export function addAd(params) {
-    return axios.post(`/SZWL-SERVER/tApkInfo/add`, params);
-}
-// 获取广告规则列表
-export function getTimeRuleList(params) {
-    return axios.get(`/SZWL-SERVER/tTimeRule/pageTimeRule?${stringToUrl(params)}`)   
-}

+ 0 - 46
src/service/taskMessage/index.js

@@ -1,46 +0,0 @@
-import axios from '../../utils/axios';
-import { stringToUrl } from '@/common/js/utils';
-
-// 获取设备初始化审批列表
-export function getTaskEquipmentList(params) {
-  return axios.get(`/SZWL-SERVER/tEquipmentApply/pageTEquipmentApply?${stringToUrl(params)}`);
-}
-// 获取提现账号审批列表
-export function getTaskJoinpayMchCheckList(params) {
-  return axios.get(`/SZWL-SERVER/tJoinpayMchCheck/pageMch?${stringToUrl(params)}`);
-}
-// 获取提现账号详情
-export function gettJoinpayMchCheckInfo(params) {
-  return axios.get(`/SZWL-SERVER/tJoinpayMchCheck/selectOne?${stringToUrl(params)}`);
-}
-// 提现账号审批
-export function changetJoinpayMchCheckStatus(params) {
-  return axios.get(`/SZWL-SERVER/tJoinpayMchCheck/shenhe?${stringToUrl(params)}`);
-}
-// 汇付账号入驻审批
-export function auditAddMerchant(params) {
-  return axios.get(`/SZWL-SERVER/tHuifuMch/auditAddMerchant?${stringToUrl(params)}`);
-}
-// 汇付账号修改审批
-export function auditUpdateMerchant(params) {
-  return axios.get(`/SZWL-SERVER/tHuifuMch/auditUpdateMerchant?${stringToUrl(params)}`);
-}
-// 获取设备列表
-export function getEquipmentList(params) {
-  return axios.get(`/SZWL-SERVER/tEquipment/listEquipment?${stringToUrl(params)}`);
-}
-// 设备审批
-export function changeStatus(params) {
-  return axios.get(`/SZWL-SERVER/tEquipmentApply/changeStatus`, { params });
-}
-// 获取分销审批列表
-export function getTaskProportionList(params) {
-  return axios.get(`/SZWL-SERVER/tProportion/pageProportionAdmin?${stringToUrl(params)}`);
-}
-// 分销审批
-export function changeProportionStatus(params) {
-  return axios.get(`/SZWL-SERVER/tProportionCheck/shenhe?${stringToUrl(params)}`);
-}
-
-
-

+ 0 - 89
src/service/test.js

@@ -1,94 +1,5 @@
 import axios from '../utils/axios';
-import { stringToUrl } from '@/common/js/utils';
 
-// 获取商户列表
-export function tAdminPageAdmin(params) {
-    return axios.get(`/SZWL-SERVER/tAdmin/pageAdmin?${stringToUrl(params)}`, params);
-}
-// 获取优惠码列表
-export function getPromoCode(params) {
-    return axios.get(`/SZWL-SERVER/tPromoCode/pagePromoCode?${stringToUrl(params)}`, params);
-}
-// 获取旗下的机器
-export function getEquipmentList(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/listEquipment?${stringToUrl(params)}`, params);
-}
-// 获取旗下关联商家
-export function gettAdminList(params) {
-    return axios.get(`/SZWL-SERVER/tAdmin/listAdmin?${stringToUrl(params)}`, params);
-}
-// 获取标签管理
-export function gettLabelList(params) {
-    return axios.get(`/SZWL-SERVER/tLabel/list?${stringToUrl(params)}`, params);
-}
-// 获取标签详情
-export function gettLabel(params) {
-    return axios.get(`/SZWL-SERVER/tLabel/getOne?${stringToUrl(params)}`, params);
-}
-// 添加标签
-export function addtLabel(params) {
-    return axios.post(`/SZWL-SERVER/tLabel/add?${stringToUrl(params)}`, params);
-}
-// 删除标签
-export function deleteLabel(params) {
-    return axios.get(`/SZWL-SERVER/tLabel/delete?${stringToUrl(params)}`, params);
-}
-// 单个机器设置标签
-export function equipmentToLabel(params) {
-    return axios.get(`/SZWL-SERVER/tLabel/equipmentToLabel?${stringToUrl(params)}`, params);
-}
-// 获取子账户列表
-export function getChildAdminList(params) {
-    return axios.get(`/SZWL-SERVER/tAdmin/getChildDrenAdminList?${stringToUrl(params)}`, params);
-}
-// 添加子账户
-export function addLoginUser(params) {
-    return axios.post(`/SZWL-SERVER/tAdmin/addLoginUser`, params);
-}
-// 获取角色下拉
-export function getSysRoleList() {
-    return axios.get(`/SZWL-SERVER/sysRoleMenu/listRoleOption`);
-}
-// 获取APK列表
-export function getApkList(params) {
-    return axios.get(`/SZWL-SERVER/tApkInfo/pageApkInfo?${stringToUrl(params)}`)
-}
-// 添加APK
-export function addApk(params) {
-    return axios.post(`/SZWL-SERVER/tApkInfo/add`, params)
-}
-// 修改APK
-export function updateApk(params) {
-    return axios.post(`/SZWL-SERVER/tApkInfo/update`, params);
-}
-// 获取广告列表(分页)
-export function getAdList(params) {
-    return axios.get(`/SZWL-SERVER/tAd/pageAd?${stringToUrl(params)}`)   
-}
-// 新增广告
-export function addAd(params) {
-    return axios.post(`/SZWL-SERVER/tApkInfo/add`, params);
-}
-// 获取广告规则列表
-export function getTimeRuleList(params) {
-    return axios.get(`/SZWL-SERVER/tTimeRule/pageTimeRule?${stringToUrl(params)}`)   
-}
-// 添加分销人
-export function getProportion(params) {
-    return axios.post(`/SZWL-SERVER/tProportion/getOne?${stringToUrl(params)}`)
-}
-// 提交审批或修改
-export function saveProportion(params) {
-    return axios.post(`/SZWL-SERVER/tProportion/save`, params)
-}
-// 提现账号回显
-export function getJoinPayMch(params) {
-    return axios.post(`/SZWL-SERVER/tJoinpayMch/getOne?${stringToUrl(params)}`, params)
-}
-// 保存提现账号
-export function saveJoinPayMch(params) {
-    return axios.post(`/SZWL-SERVER/tJoinpayMch/save`, params)
-}
 // 上传图片
 export function uploadPic(params) {
     return axios.post(`/tHuifuMch/uploadPic`, params)

+ 0 - 221
src/service/trading/index.js

@@ -1,5 +1,4 @@
 import axios from '../../utils/axios';
-import { stringToUrl } from '@/common/js/utils';
 
 
 // 获取买卖挂单列表
@@ -16,223 +15,3 @@ export function addPendOrder(params) {
 export function queryAllowPendNum() {
     return axios.get(`/tradeOrder/queryAllowPendNum`);
 }
-
-// 获取设备列表
-export function getDeviceList(params) {
-    return axios.post(`/SZWL-SERVER/tEquipment/findList?${stringToUrl(params)}`, params);
-}
-
-// 获取设备详情
-export function getDeviceDetal(params) {
-    return axios.post(`/SZWL-SERVER/tEquipment/findById?${stringToUrl(params)}`, params);
-}
-
-// 获取花型种类下拉列表
-export function getGoodsNumber(params) {
-    return axios.get(`/SZWL-SERVER/tGoodsData/getGoodsNumber?${stringToUrl(params)}`);
-}
-
-// 修改设备详情
-export function updateDevice(params) {
-    return axios.post(`/SZWL-SERVER/tEquipment/update?${stringToUrl(params)}`, params);
-}
-
-// 消除报警
-export function eliminate(params) {
-    return axios.post(`/SZWL-SERVER/tEquipment/eliminate?${stringToUrl(params)}`, params);
-}
-
-// 重启炉头/开启关闭炉头
-export function setFurnace(params) {
-    return axios.post(`/SZWL-SERVER/tEquipment/onOff?${stringToUrl(params)}`, params);
-}
-
-// 睡眠
-export function sleepEquipment(params) {
-    return axios.post(`/SZWL-SERVER/tEquipment/sleep?${stringToUrl(params)}`, params);
-}
-
-// 远程开门
-export function openDoor(params) {
-    return axios.post(`/SZWL-SERVER/tEquipment/openDoor?${stringToUrl(params)}`, params);
-}
-
-// 新版远程开门,包含内门外门
-export function Api_openDoor(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/openDoors`, { params })
-}
-
-// 系统脱机
-export function deviceTuoji(params) {
-    return axios.post(`/SZWL-SERVER/tEquipment/tuoji?${stringToUrl(params)}`, params);
-}
-
-// 音量调解
-export function updateVolume(params) {
-    return axios.post(`/SZWL-SERVER/tEquipment/updateVolume?${stringToUrl(params)}`, params);
-}
-
-// 获取商品下拉列表
-export function selectProducts(params) {
-    return axios.get(`/SZWL-SERVER/tProduct/selectProducts?${stringToUrl(params)}`);
-}
-
-// 远程做糖
-export function doSugar(params) {
-    return axios.get(`/SZWL-SERVER/tSugarDo/doSugar?${stringToUrl(params)}`);
-}
-
-// 查询做糖状态
-export function selectSugarStatus(params) {
-    return axios.get(`/SZWL-SERVER/tSugarDo/selectSugarStatus?${stringToUrl(params)}`);
-}
-
-// 今日做糖列表
-export function selectSugarList(params) {
-    return axios.get(`/SZWL-SERVER/tSugarDo/selectSugarList?${stringToUrl(params)}`);
-}
-
-// 查询定时开关列表
-export function getAlaramClockList(params) {
-    return axios.get(`/SZWL-SERVER/tAlarmClock/list?${stringToUrl(params)}`);
-}
-
-// 新增闹钟
-export function addAlaramClock(params) {
-    return axios.post(`/SZWL-SERVER/tAlarmClock/add?${stringToUrl(params)}`, params);
-}
-
-// 删除闹钟
-export function deleteAlaramClock(params) {
-    return axios.post(`/SZWL-SERVER/tAlarmClock/delete?${stringToUrl(params)}`, params);
-}
-
-// 闹钟回显
-export function getAlaramClock(params) {
-    return axios.post(`/SZWL-SERVER/tAlarmClock/selectOne?${stringToUrl(params)}`, params);
-}
-
-// 修改闹钟
-export function alaramClockUpdate(params) {
-    return axios.post(`/SZWL-SERVER/tAlarmClock/updata`, params);
-}
-
-// 获取旗下的机器
-export function getListEquipment(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/listEquipment?${stringToUrl(params)}`)
-}
-
-// 设备充值
-export function rechargeAjax(params) {
-    return axios.get(`/SZWL-SERVER/tOrder/equipmentPay?${stringToUrl(params)}`)
-}
-
-// 获取参数设置
-export function getParameters(params) {
-    return axios.post(`/SZWL-SERVER/tParameters/getParameters`, params)
-}
-
-// 修改参数设置
-export function updateParameters(params) {
-    return axios.post(`/SZWL-SERVER/tParameters/updateParameters`, params)
-}
-
-// 修改湿度区间参数
-export function humidityParameters(params) {
-    return axios.post(`/SZWL-SERVER/tEquipment/humidityParameters`, params)
-}
-
-// 启用物料监控
-export function enableMaterial(params) {
-    return axios.post(`/SZWL-SERVER/tParameters/enableMaterial`, params)
-}
-
-// 分销人回显
-export function getProportion(params) {
-    return axios.post(`/SZWL-SERVER/tProportion/getOne?${stringToUrl(params)}`)
-}
-
-// 提交审批或修改
-export function saveProportion(params) {
-    return axios.post(`/SZWL-SERVER/tProportion/save`, params)
-}
-
-// 单个/批量修改商品价格
-export function Api_getUpdaProdPrice(params) {
-    return axios.get(`/SZWL-SERVER/tProduct/updateProduct`, { params })
-}
-
-// 一键补料
-export function Api_getReplenishment(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/buliao`, { params })
-}
-
-// 远程
-export function Api_getTApkInfo_updateApk(params) {
-    return axios.get(`/SZWL-SERVER/tApkInfo/updateApk`, { params })
-}
-
-// 修改优惠码开关状态
-export function Api_getDiscCodeStatus(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/updateCouponStatus`, { params })
-}
-
-// 修改睡眠描述
-export function changeSleepDesc(params) {
-    return axios.get(`/SZWL-SERVER/tEquipmentDesc/updateSleepDesc`, { params })
-}
-
-// 删除设备
-export function delOneDevice(params) {
-    return axios.post(`/SZWL-SERVER/tEquipmentDeleted/delOneDevice`, params)
-}
-
-// 屏蔽/显示商品
-export function updateProductsShow(params) {
-    return axios.post(`/SZWL-SERVER/tProduct/updateProductsShow`, params)
-}
-
-// 远程修改机器密码
-export function updateDevicePassword(params) {
-    return axios.post(`/SZWL-SERVER/tEquipment/updatePassword`, params)
-}
-
-// 定制Logo
-export function customLogo(params) {
-    return axios.post(`/SZWL-SERVER/tLogo/customLogo`, params)
-}
-
-// 日志下载
-export function downloadLog(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/downloadLog?${stringToUrl(params)}`, { responseType: 'blob', timeout: 12000 });
-}
-
-// 获取DIY花型列表信息
-export function selectDIYFlowers(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/selectDIYFlowers?${stringToUrl(params)}`);
-}
-
-// 修改DIY花型功能开关状态
-export function updateDIYFlowerStatus(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/updateDIYFlowerStatus?${stringToUrl(params)}`);
-}
-
-// 修改DIY花型的形状或是否显示
-export function updateDIYProductShow(params) {
-    return axios.post(`/SZWL-SERVER/tEquipment/updateDIYProductShow`, params);
-}
-
-// 日志上传
-export function uploadLog(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/uploadLog?${stringToUrl(params)}`);
-}
-
-// 查询日志
-export function queryLog(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/queryLog?${stringToUrl(params)}`);
-}
-
-// 远程锁机
-export function updateLockStatus(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/updateLockStatus`, { params })
-}

+ 0 - 15
src/service/typeSelectList.js

@@ -1,15 +0,0 @@
-import axios from '../utils/axios';
-import { stringToUrl } from '@/common/js/utils';
-
-// 获取商户下拉列表
-export function getAdminList(params) {
-    return axios.get(`/SZWL-SERVER/tAdmin/getAdminList?${stringToUrl(params)}`);
-}
-// 获取设备列表
-export function getEquipmentList(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/listEquipment?${stringToUrl(params)}`);
-}
-// 获取订单列表
-export function getProductList(params) {
-    return axios.get(`/SZWL-SERVER/tProduct/getProducts?${stringToUrl(params)}`);
-}

+ 0 - 157
src/styles/accountPer/index.less

@@ -1,157 +0,0 @@
-.accountPerPage {
-    width: 100%;
-
-    .accountPerBox {
-        width: 100%;
-        height: calc(100% - 44px);
-        overflow: auto;
-        // background: #fff url('../../assets/accountPer/pageBg.png') top center no-repeat;
-        // background-size: 100%;
-
-        .searchRow {
-            width: 90%;
-            height: 50px;
-            margin: 0 auto;
-            align-items: center;
-
-            .bd3 {
-                width: 87px;
-                height: 16px;
-
-                .outer4 {
-                    width: 20px;
-                    height: 26px;
-                    background: url("../../assets/accountPer/icon.png") top center no-repeat;
-                    background-size: 100%;
-                }
-
-                .txt2 {
-                    width: 65px;
-                    height: 14px;
-                    overflow-wrap: break-word;
-                    color: rgba(64, 77, 116, 1);
-                    font-size: 15px;
-                    font-family: 'OPPOSans', PingFangSC-Semibold;
-                    text-align: left;
-                    white-space: nowrap;
-                    line-height: 15px;
-                    display: block;
-                    font-weight: bold;
-
-                    .discountNumber {
-                        font-size: 18px;
-                        color: red;
-                    }
-                }
-            }
-
-            .operBox {
-                display: flex;
-                flex-wrap: nowrap;
-                justify-content: flex-end;
-
-                .listBox,
-                .addBox,
-                .searchBox {
-                    display: flex;
-                    flex-wrap: nowrap;
-                    flex-direction: column;
-                    align-items: center;
-                    padding: 5px;
-                }
-
-                .iconImg {
-                    width: 25px;
-                }
-            }
-        }
-
-        .listBox {
-            border-top: 1px solid #e7eaf7;
-
-            .listItem {
-                position: relative;
-
-                .itemBox {
-                    width: 100%;
-                    padding: 1.5em 1em;
-                    line-height: 1.8;
-                    border-bottom: 1px solid #e7eaf7;
-                }
-
-                .tipBox {
-                    position: absolute;
-                    top: 1em;
-                    right: 1em;
-                    font-size: 1.5em;
-                    color: #4DC193;
-                    display: flex;
-
-                    &.isUseTip {
-                        color: #df5e4c;
-                    }
-
-                    .outer2 {
-                        width: 6px;
-                        height: 12px;
-                        background: url('../../assets/right.png') top center no-repeat;
-                        background-size: 100%;
-                        margin-top: 4px;
-                        margin-left: .4em;
-                    }
-                }
-            }
-        }
-
-        .section1 {
-            background-color: rgba(223, 223, 229, 1);
-            border-radius: 9px;
-            height: 18px;
-            width: 38px;
-        }
-    }
-
-    .van-switch--on {
-        background-color: #FF3456;
-    }
-
-    .van-button--primary {
-        border-color: #FF3456;
-        background-color: #FF3456;
-    }
-
-    .van-button--danger {
-        border-color: #df5e4c;
-        background-color: #df5e4c;
-    }
-
-    .van-checkbox__icon--checked .van-icon {
-        border-color: #FF3456;
-        background-color: #FF3456;
-    }
-}
-
-.codeSearch {
-    width: 100%;
-
-    .codeSearchPopup {
-        width: 90%;
-    }
-
-    .content {
-        padding-top: 1em;
-    }
-
-    .field .van-field__label {
-        width: auto;
-    }
-
-}
-
-.van-cascader__option--selected {
-    color: #FF3456;
-}
-
-.van-tabs__line {
-    background-color: #FF3456 !important;
-}

+ 0 - 112
src/styles/alarmHistory/index.less

@@ -1,112 +0,0 @@
-.alarmHistoryPage {
-    width: 100%;
-
-    .alarmHistoryBox {
-        width: 100%;
-        height: calc(100% - 44px);
-        overflow: auto;
-
-        // background: #fff url('../../assets/alarmHistory/pageBg.png') top center no-repeat;
-        // background-size: 100%;
-        .searchRow {
-            width: 90%;
-            height: 48px;
-            margin: 0 auto;
-            background: rgba(255, 255, 255, 1) url("../../assets/home/line.png") bottom center no-repeat;
-            background-size: 100%;
-            align-items: center;
-
-            .bd3 {
-                width: 87px;
-                height: 16px;
-
-                .outer4 {
-                    width: 16px;
-                    height: 20px;
-                    background: url("../../assets/alarmHistory/icon.png") top center no-repeat;
-                    background-size: 100%;
-                }
-
-                .txt2 {
-                    width: 65px;
-                    height: 14px;
-                    overflow-wrap: break-word;
-                    color: rgba(64, 77, 116, 1);
-                    font-size: 15px;
-                    font-family: 'OPPOSans', PingFangSC-Semibold;
-                    text-align: left;
-                    white-space: nowrap;
-                    line-height: 15px;
-                    display: block;
-                    font-weight: bold;
-
-                    .discountNumber {
-                        font-size: 18px;
-                        color: red;
-                    }
-                }
-            }
-
-            .main5 {
-                width: auto;
-                cursor: pointer;
-
-                .label2 {
-                    width: 20px;
-                    height: 20px;
-                    margin-right: 5px;
-                }
-            }
-        }
-
-        .listBox {
-            .listItem {
-                width: 100%;
-                background: url("../../assets/home/line.png") bottom center no-repeat;
-                background-size: 100%;
-                position: relative;
-                display: inline-block;
-
-                .itemBox {
-                    width: 92%;
-                    margin: 20px auto;
-                    font-size: 12px;
-                    line-height: 1.64;
-
-                    .itemRow {
-                        width: 100%;
-                    }
-
-                    .itemTitle {
-                        color: #8787a6;
-                    }
-
-                    .discount {
-                        padding-left: 2em;
-                    }
-                }
-            }
-        }
-    }
-
-    .van-button--primary {
-        border-color: #FF3456;
-        background-color: #FF3456;
-    }
-}
-
-.codeSearch {
-    width: 100%;
-
-    .codeSearchPopup {
-        width: 90%;
-    }
-
-    .content {
-        padding-top: 1em;
-    }
-
-    .field .van-field__label {
-        width: auto;
-    }
-}

+ 0 - 23
src/styles/buyConfList/index.less

@@ -87,29 +87,6 @@
           width: 87px;
           height: 16px;
   
-          .outer4 {
-            width: 20px;
-            height: 26px;
-            background: url("../../assets/alarmHistory/icon.png") top center no-repeat;
-            background-size: 100%;
-  
-            &.equipmentIcon {
-              background: url("../../assets/taskMessage/deviceIcon.png") top center no-repeat;
-              background-size: 100%;
-            }
-  
-            &.joinPayMchCheckIcon {
-              background: url("../../assets/taskMessage/withIcon.png") top center no-repeat;
-              background-size: 100%;
-            }
-  
-            &.proportionIcon {
-              background: url("../../assets/taskMessage/retailIcon.png") top center no-repeat;
-              background-size: 100%;
-              background-position: center top -2px;  /* 向上移动 2 像素 */
-            }
-          }
-  
           .txt2 {
             width: 65px;
             height: 14px;

+ 0 - 208
src/styles/discountCode/index.less

@@ -1,208 +0,0 @@
-.discountCodePage {
-    width: 100%;
-
-    .discountCodeBox {
-        width: 100%;
-        height: calc(100% - 44px);
-        overflow: auto;
-        // background: #fff url('../../assets/discountCode/pageBg.png') top center no-repeat;
-        // background-size: 100%;
-
-        .searchRow {
-            width: 90%;
-            height: 48px;
-            margin: 0 auto;
-            background: rgba(255, 255, 255, 1) url("../../assets/home/line.png") bottom center no-repeat;
-            background-size: 100%;
-            align-items: center;
-
-            .bd3 {
-                width: 87px;
-                height: 16px;
-
-                .outer4 {
-                    width: 20px;
-                    height: 26px;
-                    background: url("../../assets/discountCode/icon.png") top center no-repeat;
-                    background-size: 100%;
-                }
-
-                .txt2 {
-                    width: 65px;
-                    height: 14px;
-                    overflow-wrap: break-word;
-                    color: rgba(64, 77, 116, 1);
-                    font-size: 15px;
-                    font-family: 'OPPOSans', PingFangSC-Semibold;
-                    text-align: left;
-                    white-space: nowrap;
-                    line-height: 15px;
-                    display: block;
-                    font-weight: bold;
-
-                    .discountNumber {
-                        font-size: 18px;
-                        color: red;
-                    }
-                }
-            }
-
-            .main5 {
-                width: auto;
-                
-                .label2 {
-                    width: 20px;
-                    height: 20px;
-                    margin-right: 5px;
-                    cursor: pointer;
-                }
-            }
-        }
-
-        .tabButtomBox {
-            width: 100%;
-            height: 50px;
-
-            .tabBox {
-                width: 40%;
-                align-items: center;
-                justify-content: space-around;
-
-                .active {
-                    color: #FF3456;
-                    position: relative;
-                    height: 100%;
-                    line-height: 50px;
-
-                    &::after {
-                        content: '';
-                        width: 100%;
-                        height: 3px;
-                        position: absolute;
-                        bottom: 0;
-                        left: 0;
-                        background-color: #FF3456;
-                    }
-                }
-            }
-
-            .buttomBox {
-                width: 60%;
-                justify-content: flex-end;
-                align-items: center;
-
-                // 导出 
-                .buttonItem {
-                    cursor: pointer;
-                    width: 55px;
-                    line-height: 1.6;
-                    font-size: 12px;
-                    margin-right: 15px;
-                    text-align: center;
-                    background-color: #EDF0FC;
-                    color: #e16959;
-                    border: 1px solid #7b91ea;
-                    position: relative;
-                }
-            }
-        }
-
-        .intervalRow {
-            width: 100%;
-            height: 10px;
-            background-color: #f5f5f5;
-        }
-
-        .listBox {
-            .listItem {
-                width: 100%;
-                background: url("../../assets/home/line.png") bottom center no-repeat;
-                background-size: 100%;
-                position: relative;
-                display: inline-block;
-
-                .itemBox {
-                    width: 92%;
-                    margin: 20px auto;
-                    font-size: 12px;
-                    line-height: 1.64;
-
-                    .itemRow {
-                        width: 100%;
-                    }
-
-                    .itemTitle {
-                        color: #8787a6;
-                    }
-
-                    .discount {
-                        padding-left: 2em;
-                    }
-                }
-
-                // 使用,未使用
-                .tipBox {
-                    position: absolute;
-                    top: 20px;
-                    right: 4%;
-                    width: 21%;
-                    line-height: 2.2;
-                    text-align: center;
-                    background-color: #FF3456;
-                    color: #fff;
-
-                    &.isUseTip {
-                        background-color: #8787a6;
-                    }
-                }
-
-                .checkedBox {
-                    position: absolute;
-                    top: 40px;
-                    right: 10%;          
-                }
-
-            }
-        }
-
-    }
-
-    .van-button--primary {
-        border-color: #FF3456;
-        background-color: #FF3456;
-    }
-}
-
-.discountCodePage {
-    .van-field__button {
-        width: 150px;
-    }
-
-    .van-field {
-        width: 100%;
-        display: flex;
-        align-items: center; //上下对齐
-        justify-content: space-between;
-    }
-
-    .van-radio__icon--checked .van-icon {
-        background-color: #FF3456;
-        border-color: #FF3456;
-    }
-}
-
-.codeSearch {
-    width: 100%;
-
-    .codeSearchPopup {
-        width: 90%;
-    }
-
-    .content {
-        padding-top: 1em;
-    }
-
-    .field .van-field__label {
-        width: auto;
-    }
-}

+ 0 - 98
src/styles/distributionSet/index.less

@@ -1,98 +0,0 @@
-.distributionSetIdx {
-    .van-tabs--line .van-tabs__wrap {
-        height: 30px;
-    }
-
-    .van-pull-refresh {
-        height: calc(100vh - 120px);
-        overflow: auto;
-    }
-
-    .headCon {
-        .leftImg {
-            width: 19px;
-            height: 19px;
-            background: url('../../assets/distributionSet/leftIcon.png') top center no-repeat;
-            background-size: 100%;
-        }
-
-        .leftTxt {
-            color: #434d74;
-
-            .leftNum {
-                padding-left: 5px;
-                color: #df5e4c;
-            }
-        }
-
-        .rightCon {
-            color: #FF3456;
-        }
-    }
-
-    .van-tabs__line {
-        background-color: #FF3456 !important;
-    }
-
-    .van-tab--active .van-tab__text--ellipsis {
-        color: #FF3456;
-    }
-
-    .contentCon {
-        height: calc(100% - 120px);
-
-        .content {
-            margin-top: 6px;
-
-            .titleName {
-                color: #8787a6;
-            }
-
-            .valueName {
-                color: #404d74;
-            }
-
-            .valueName1 {
-                width: 90px;
-                display: inline-block;
-            }
-
-            .effective {
-                color: #4dc193;
-            }
-        }
-
-        .approval {
-            color: #df5e4c;
-        }
-    }
-}
-
-.distributionDetailIdx {
-    overflow: auto;
-
-    .kBordBott {
-        color: #404d74;
-    }
-
-    .noPaddingTopCell {
-        .van-cell {
-            padding-right: 0;
-            width: 250px;
-        }
-    }
-
-    .noPaddingRCell {
-        padding-right: var(--van-cell-horizontal-padding);
-
-        .van-cell {
-            padding-right: 0;
-            width: 250px;
-        }
-    }
-
-    .van-button--primary {
-        border-color: #FF3456;
-        background-color: #FF3456;
-    }
-}

+ 0 - 211
src/styles/joinpayMch/index.less

@@ -1,211 +0,0 @@
-.shandeMchPage {
-    width: 100%;
-
-    &.page1 {
-        background: #fff url('../../assets/joinPayMch/top1.png') top center no-repeat;
-        background-size: 100%;
-    }
-
-    &.page2 {
-        background: #fff url('../../assets/joinPayMch/top2.png') top center no-repeat;
-        background-size: 100%;
-    }
-
-    &.page3 {
-        background: #fff url('../../assets/joinPayMch/top3.png') top center no-repeat;
-        background-size: 100%;
-    }
-
-    .simple-header {
-        background: transparent;
-        color: #fff;
-    }
-
-    .van-radio__icon .van-icon {
-        width: 1em;
-        height: 1em;
-        line-height: 1;
-    }
-
-    &.page4 {
-        .simple-header {
-            background: #fff;
-            color: #404d74;
-        }
-    }
-
-    .topSpeed {
-        width: 100%;
-        height: 8.3em;
-
-        &.page1 {
-            background: #fff url('../../assets/joinPayMch/top1.png') bottom center no-repeat;
-            background-size: 100%;
-        }
-
-        &.page2 {
-            background: #fff url('../../assets/joinPayMch/top2.png') bottom center no-repeat;
-            background-size: 100%;
-        }
-
-        &.page3 {
-            background: #fff url('../../assets/joinPayMch/top3.png') bottom center no-repeat;
-            background-size: 100%;
-        }
-    }
-
-    .shandeMchBox {
-        width: 100%;
-        height: calc(100% - 44px);
-        background-color: #fff;
-        overflow: auto;
-        overflow-x: hidden;
-
-        .intervalRow {
-            width: 100%;
-            height: 10px;
-            background-color: #f5f5f5;
-        }
-
-        .joinPayMch2 {
-            display: flex;
-            flex-wrap: wrap;
-            justify-content: center;
-        }
-    }
-
-    .requiredLeft {
-        .van-cell__title {
-            width: 35%;
-            position: relative;
-
-            &::after {
-                content: '*';
-                color: red;
-                position: absolute;
-                left: -.6em;
-            }
-        }
-    }
-
-    .custom-input {
-        .van-cell__title {
-            width: 35%;
-            position: relative;
-
-            &::after {
-                content: '*';
-                color: red;
-                position: absolute;
-                left: -.6em;
-            }
-        }
-    }
-
-    .cell-input::after {
-        box-sizing: border-box;
-        content: "";
-        pointer-events: none;
-        bottom: 0;
-        display: block;
-        border-bottom: 1px solid #ebedf0;
-        transform: scaleY(.5);
-        margin: 0 15px;
-    }
-
-
-    .van-popover__wrapper {
-        width: 100%;
-    }
-
-    .upLoaderRow {
-        .baseRow {
-            width: 100%;
-            height: 20px;
-            margin-left: 15px;
-            margin-top: 5px;
-            justify-content: flex-start;
-
-            .group2 {
-                background-color: rgba(255, 52, 86, 1);
-                border-radius: 2px;
-                width: 4px;
-                height: 16px;
-                margin-top: 4px;
-            }
-
-            .baseText {
-                width: 150px;
-                height: 20px;
-                overflow-wrap: break-word;
-                color: rgba(64, 77, 116, 1);
-                font-size: 14px;
-                font-family: PingFangSC-Medium;
-                text-align: left;
-                white-space: nowrap;
-                line-height: 20px;
-                display: block;
-                margin-left: 15px;
-            }
-        }
-
-        .cardRow {
-            width: 100%;
-            display: flex;
-
-            .cardLi {
-                width: 50%;
-                text-align: center;
-                padding: 1em;
-            }
-        }
-    }
-
-    .van-radio__icon--checked .van-icon {
-        background-color: #FF3456;
-        border-color: #FF3456;
-    }
-
-    .van-calendar__day--start-end {
-        background-color: #FF3456 !important;
-    }
-
-    .van-calendar__selected-day {
-        background-color: #FF3456 !important;
-    }
-
-    .van-calendar__day--start {
-        background-color: #FF3456 !important;
-    }
-
-    .van-calendar__day--middle {
-        color: #FF3456 !important;
-    }
-
-    .van-calendar__day--end {
-        background-color: #FF3456 !important;
-    }
-
-    .van-calendar__confirm {
-        border-color: #FF3456 !important;
-        background-color: #FF3456 !important;
-    }
-
-    .van-button--primary {
-        border-color: #FF3456;
-        background-color: #FF3456;
-    }
-
-    .van-field__label {
-        width: 35%;
-    }
-
-
-}
-
-.van-popover__content {
-    width: auto;
-    height: 25px;
-    padding: 0 10px;
-    padding-top: 8px;
-}

+ 0 - 23
src/styles/pendingOrderList/index.less

@@ -87,29 +87,6 @@
           width: 87px;
           height: 16px;
   
-          .outer4 {
-            width: 20px;
-            height: 26px;
-            background: url("../../assets/alarmHistory/icon.png") top center no-repeat;
-            background-size: 100%;
-  
-            &.equipmentIcon {
-              background: url("../../assets/taskMessage/deviceIcon.png") top center no-repeat;
-              background-size: 100%;
-            }
-  
-            &.joinPayMchCheckIcon {
-              background: url("../../assets/taskMessage/withIcon.png") top center no-repeat;
-              background-size: 100%;
-            }
-  
-            &.proportionIcon {
-              background: url("../../assets/taskMessage/retailIcon.png") top center no-repeat;
-              background-size: 100%;
-              background-position: center top -2px;  /* 向上移动 2 像素 */
-            }
-          }
-  
           .txt2 {
             width: 65px;
             height: 14px;

+ 0 - 222
src/styles/role/index.less

@@ -1,222 +0,0 @@
-.accountPerPage {
-  width: 100%;
-
-  .accountPerBox {
-    width: 100%;
-    height: calc(100% - 44px);
-    overflow: auto;
-    // background: #fff url('../../assets/accountPer/pageBg.png') top center no-repeat;
-    // background-size: 100%;
-
-    .searchRow {
-      width: 90%;
-      height: 50px;
-      margin: 0 auto;
-      align-items: center;
-
-      .bd3 {
-        width: 87px;
-        height: 16px;
-
-        .outer4 {
-          width: 20px;
-          height: 26px;
-          background: url("../../assets/accountPer/icon.png") top center no-repeat;
-          background-size: 100%;
-        }
-
-        .txt2 {
-          width: 65px;
-          height: 14px;
-          overflow-wrap: break-word;
-          color: rgba(64, 77, 116, 1);
-          font-size: 15px;
-          font-family: 'OPPOSans', PingFangSC-Semibold;
-          text-align: left;
-          white-space: nowrap;
-          line-height: 15px;
-          display: block;
-          font-weight: bold;
-
-          .discountNumber {
-            font-size: 18px;
-            color: red;
-          }
-        }
-      }
-
-      .operBox {
-        display: flex;
-        flex-wrap: nowrap;
-        justify-content: flex-end;
-
-        .listBox,
-        .addBox,
-        .searchBox {
-          display: flex;
-          flex-wrap: nowrap;
-          flex-direction: column;
-          align-items: center;
-          padding: 5px;
-        }
-
-        .iconImg {
-          width: 25px;
-        }
-      }
-    }
-
-    .listBox {
-      border-top: 1px solid #e7eaf7;
-
-      .listItem {
-        .itemBox {
-          width: 100%;
-          padding: 1.5em 1em;
-          line-height: 1.8;
-          border-bottom: 1px solid #e7eaf7;
-          display: flex;
-
-          .roleBox {
-            width: 70%;
-
-            .itemRow {
-              width: 100%;
-              display: flex;
-              flex-wrap: wrap;
-
-              .roleItem {
-                width: 33%;
-              }
-            }
-          }
-
-          .operBox {
-            width: 30%;
-            display: flex;
-            align-items: flex-start;
-            justify-content: center;
-
-            .iconImg {
-              width: 1em;
-              height: 1em;
-              margin-right: 0.3em;
-            }
-
-            .operSet,
-            .operDelter {
-              display: flex;
-            }
-
-            .operText {
-              font-size: 1em;
-              line-height: 1.3;
-            }
-
-            .editImg {
-              width: 1.2em;
-              height: 1.2em;
-              background: url("../../assets/edit.png") top center no-repeat;
-              background-size: 100%;
-            }
-
-            .operSet {
-              color: #FF3456;
-              padding-right: 0.5em;
-              margin-right: 0.5em;
-              border-right: 1px solid;
-            }
-
-            .operDelter {
-              color: #df5e4c;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-.operCheckBox {
-  .block5 {
-    background-color: rgba(215, 215, 226, 1);
-    border-radius: 2px;
-    width: 310px;
-    height: 1px;
-    margin: 0 auto;
-    margin-top: 25px;
-  }
-
-  .word10 {
-    width: 143px;
-    height: 13px;
-    overflow-wrap: break-word;
-    color: rgba(64, 77, 116, 1);
-    font-size: 13px;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 13px;
-    display: block;
-    margin: 33px auto;
-  }
-
-  .block6 {
-    width: 265px;
-    height: 34px;
-    margin: 20px auto;
-
-    .mod7 {
-      border-radius: 17px;
-      height: 34px;
-      border: 1px solid rgba(255, 52, 86, 1);
-      width: 120px;
-      justify-content: center;
-      align-items: center;
-
-      .info5 {
-        width: 60px;
-        height: 13px;
-        overflow-wrap: break-word;
-        color: rgba(255, 52, 86, 1);
-        font-size: 15px;
-        font-family: PingFangSC-Medium;
-        text-align: center;
-        white-space: nowrap;
-        line-height: 15px;
-        display: block;
-      }
-    }
-
-    .mod8 {
-      background-color: rgba(255, 52, 86, 1);
-      border-radius: 17px;
-      height: 34px;
-      width: 120px;
-      justify-content: center;
-      align-items: center;
-
-      .info6 {
-        width: 30px;
-        height: 13px;
-        overflow-wrap: break-word;
-        color: rgba(255, 255, 255, 1);
-        font-size: 15px;
-        font-family: PingFangSC-Medium;
-        text-align: center;
-        white-space: nowrap;
-        line-height: 15px;
-        display: block;
-      }
-    }
-  }
-}
-
-.van-checkbox__icon--checked .van-icon {
-  border-color: #FF3456;
-  background-color: #FF3456;
-}
-
-.van-button--primary {
-  border-color: #FF3456;
-  background-color: #FF3456;
-}

+ 0 - 23
src/styles/sellConfList/index.less

@@ -87,29 +87,6 @@
           width: 87px;
           height: 16px;
   
-          .outer4 {
-            width: 20px;
-            height: 26px;
-            background: url("../../assets/alarmHistory/icon.png") top center no-repeat;
-            background-size: 100%;
-  
-            &.equipmentIcon {
-              background: url("../../assets/taskMessage/deviceIcon.png") top center no-repeat;
-              background-size: 100%;
-            }
-  
-            &.joinPayMchCheckIcon {
-              background: url("../../assets/taskMessage/withIcon.png") top center no-repeat;
-              background-size: 100%;
-            }
-  
-            &.proportionIcon {
-              background: url("../../assets/taskMessage/retailIcon.png") top center no-repeat;
-              background-size: 100%;
-              background-position: center top -2px;  /* 向上移动 2 像素 */
-            }
-          }
-  
           .txt2 {
             width: 65px;
             height: 14px;

+ 0 - 23
src/styles/taskAccountList/index.less

@@ -87,29 +87,6 @@
         width: 87px;
         height: 16px;
 
-        .outer4 {
-          width: 20px;
-          height: 26px;
-          background: url("../../assets/alarmHistory/icon.png") top center no-repeat;
-          background-size: 100%;
-
-          &.equipmentIcon {
-            background: url("../../assets/taskMessage/deviceIcon.png") top center no-repeat;
-            background-size: 100%;
-          }
-
-          &.joinPayMchCheckIcon {
-            background: url("../../assets/taskMessage/withIcon.png") top center no-repeat;
-            background-size: 100%;
-          }
-
-          &.proportionIcon {
-            background: url("../../assets/taskMessage/retailIcon.png") top center no-repeat;
-            background-size: 100%;
-            background-position: center top -2px;  /* 向上移动 2 像素 */
-          }
-        }
-
         .txt2 {
           width: 65px;
           height: 14px;

+ 0 - 22
src/styles/taskMessage/index.less

@@ -122,28 +122,6 @@
         width: 87px;
         height: 16px;
 
-        .outer4 {
-          width: 20px;
-          height: 26px;
-          background: url("../../assets/alarmHistory/icon.png") top center no-repeat;
-          background-size: 100%;
-
-          &.equipmentIcon {
-            background: url("../../assets/taskMessage/deviceIcon.png") top center no-repeat;
-            background-size: 100%;
-          }
-
-          &.joinPayMchCheckIcon {
-            background: url("../../assets/taskMessage/withIcon.png") top center no-repeat;
-            background-size: 100%;
-          }
-
-          &.proportionIcon {
-            background: url("../../assets/taskMessage/retailIcon.png") top center no-repeat;
-            background-size: 100%;
-          }
-        }
-
         .txt2 {
           width: 65px;
           height: 14px;

+ 0 - 27
src/styles/transactionList/index.less

@@ -91,33 +91,6 @@
         width: 87px;
         height: 16px;
 
-        .outer4 {
-          width: 20px;
-          height: 26px;
-          background: url("../../assets/alarmHistory/icon.png") top center
-            no-repeat;
-          background-size: 100%;
-
-          &.equipmentIcon {
-            background: url("../../assets/taskMessage/deviceIcon.png") top
-              center no-repeat;
-            background-size: 100%;
-          }
-
-          &.joinPayMchCheckIcon {
-            background: url("../../assets/taskMessage/withIcon.png") top center
-              no-repeat;
-            background-size: 100%;
-          }
-
-          &.proportionIcon {
-            background: url("../../assets/taskMessage/retailIcon.png") top
-              center no-repeat;
-            background-size: 100%;
-            background-position: center top -2px; /* 向上移动 2 像素 */
-          }
-        }
-
         .txt2 {
           width: 65px;
           height: 14px;

+ 0 - 316
src/views/accountPer/add.vue

@@ -1,316 +0,0 @@
-<template>
-  <!-- 新增账号 -->
-  <div class="accountPerPage flex-col">
-    <s-header :name="pageTitle" :noback="false"></s-header>
-    <div class="accountPerBox flex-col">
-      <van-form @submit="onSubmit">
-        <van-field v-model="username" name="username" :label="$t('accountPer.usernameLabel')" :readonly="isUserName"
-          :placeholder="$t('accountPer.usernamePlaceholder')" :rules="[
-            { required: true, message: $t('accountPer.usernamePlaceholder') },
-          ]" />
-        <van-field v-model="password" name="password" type="password" :label="$t('accountPer.passwordLabel')"
-          :placeholder="passwordPlaceholder" :rules="[
-            { required: havePassword, message: $t('accountPer.passwordPlaceholder') },
-          ]" />
-        <van-field v-model="name" name="name" :label="$t('accountPer.nameLabel')"
-          :placeholder="$t('accountPer.namePlaceholder')" :rules="[
-            { required: true, message: $t('accountPer.namePlaceholder') },
-          ]" />
-        <van-field v-model="phone" name="phone" :label="$t('accountPer.phoneLabel')"
-          :placeholder="$t('accountPer.phonePlaceholder')" :rules="[
-            { required: true, message: $t('accountPer.phonePlaceholder') },
-          ]" />
-        <van-field v-model="roleText" is-link readonly :label="$t('accountPer.roleLabel')"
-          :placeholder="$t('accountPer.rolePlaceholder')" @click="roleShow = true" />
-        <div class="van-cell van-field">
-          <div class="van-cell__title van-field__label">
-            <label id="van-field-4-label" for="van-field-4-input">{{ $t("accountPer.setUp") }}:</label>
-          </div>
-          <div class="van-cell__value">
-            <div class="van-field__body">
-              <van-switch v-model="isEnabled" size="20px" class="o-mr-10" /><span>{{
-                $t("accountPer.startOrNot")
-              }}</span>
-            </div>
-          </div>
-        </div>
-        <van-field colon :border="false" @click-input="busiEquipInpClk" readonly clearable
-          v-model="cofficentForm.equipmentNames" :label="$t('accountPer.manageMachinesLabel')"
-          :placeholder="$t('accountPer.manageMachinesPlaceholder')" :rules="[
-            { required: true, message: $t('accountPer.manageMachinesPlaceholder') },
-          ]">
-          <template #right-icon>
-            <div class="l-flex-RC">
-              <van-icon v-if="cofficentForm.equipmentNames" @click="cofficentForm.equipmentNames = ''; equipmentIds = ''"
-                class="o-mr-6" name="clear" />
-              <van-icon @click="busiEquipInpClk" name="arrow" />
-            </div>
-          </template>
-        </van-field>
-        <!-- 操作 -->
-        <van-row justify="space-around" style="padding: 1em">
-          <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em" native-type="submit">{{
-            $t("accountPer.submit") }}</van-button>
-        </van-row>
-        <van-row justify="space-around" style="padding: 1em" v-if="pageTitle === $t('accountPer.modifyAccount')">
-          <van-button span="5" round type="danger" style="height: 2em; padding: 0 2em" @click="deleteLoginUserFun()">{{
-            $t("accountPer.delete") }}</van-button>
-        </van-row>
-      </van-form>
-    </div>
-    <van-popup v-model:show="roleShow" round position="bottom">
-      <van-cascader v-model="roleList" :title="$t('accountPer.rolePlaceholder')" :options="roleOptions"
-        @close="roleShow = false" @finish="onRoleFinish" />
-    </van-popup>
-    <!-- 机器弹窗 -->
-    <kSelectPop @selconfirm="selEquipConfirm" ref="kSelectPopEquipRef" :selOptions="selEquipOptions" @searchData="searchEquData"
-      :selTitleAndName="['name', 'id']"></kSelectPop>
-  </div>
-</template>
-
-<script>
-// 导入选择组件
-import kSelectPop from "../../components/commom/kSelectPop/index.vue";
-import { onMounted, reactive, toRefs, ref } from "vue";
-import sHeader from "@/components/SimpleHeader";
-import { showFailToast, showSuccessToast, showToast } from 'vant';
-import {
-  getSysRoleList,
-  getEquipmentList,
-  addLoginUser,
-  updataLoginUser,
-  deleteLoginUser,
-} from "../../service/accountPar/index";
-import { getLoginUser, styleUrl } from "@/common/js/utils";
-import md5 from "js-md5";
-import { useRouter } from "vue-router";
-import { useI18n } from "vue-i18n";
-
-export default {
-  components: { sHeader, kSelectPop },
-  setup() {
-    const { t } = useI18n();
-    const router = useRouter();
-    const user = getLoginUser();
-    const roleShow = ref(false);
-    const roleText = ref("");
-    const roleOptions = ref([]);
-    const onRoleFinish = ({ selectedOptions }) => {
-      roleShow.value = false;
-      roleText.value = selectedOptions[0].text;
-    };
-    const equipmentIdShow = ref(false);
-    const equipmentIdText = ref("");
-    const equipmentIdsOptions = ref([]);
-    const onEquipmentIdFinish = ({ selectedOptions }) => {
-      equipmentIdShow.value = false;
-      equipmentIdText.value = selectedOptions[0].text;
-    };
-    const passwordPlaceholder = ref("");
-    const havePassword = ref(true);
-    const isUserName = ref(false);
-    let addParams = reactive({
-      username: "",
-      password: "",
-      name: "",
-      phone: "",
-      isEnabled: true,
-      roleList: "",
-      equipmentIds: "",
-      companyType: "0",
-    });
-    const cofficentForm = ref({
-      equipmentNames: "",
-    });
-    const pageTitle = ref("");
-    onMounted(async () => {
-      // 加载样式
-      styleUrl('accountPer');
-      let accoutPerSet = localStorage.getItem("accoutPerSet");
-      if (accoutPerSet) {
-        pageTitle.value = t("accountPer.modifyAccount");
-        accoutPerSet = JSON.parse(accoutPerSet);
-        addParams.id = accoutPerSet.id;
-        addParams.username = accoutPerSet.username;
-        isUserName.value = true;
-        addParams.name = accoutPerSet.name;
-        addParams.phone = accoutPerSet.phone;
-        addParams.isEnabled = accoutPerSet.isEnabled;
-        addParams.roleList = accoutPerSet.roleList[0];
-        addParams.equipmentIds = accoutPerSet.equipmentIds;
-        havePassword.value = false;
-        passwordPlaceholder.value = t('accountPer.editPasswordPlaceholder')
-      } else {
-        pageTitle.value = t("accountPer.addAccount");
-        passwordPlaceholder.value = t('accountPer.passwordPlaceholder');
-        havePassword.value = true;
-      }
-      getSysRoleListFun();
-      getEquipmentListFun();
-    });
-    // 获取角色下拉列表
-    const getSysRoleListFun = async () => {
-      const { data } = await getSysRoleList({ adminId: user.id });
-      if (data.code === "00000") {
-        roleOptions.value = data.data.map((item) => {
-          return { text: item.label, value: item.value };
-        });
-        if (pageTitle.value === t("accountPer.modifyAccount")) {
-          roleText.value = roleOptions.value.filter(
-            (v) => v.value === addParams.roleList
-          )[0].text;
-        }
-      } else {
-        showFailToast(data.message);
-      }
-    };
-
-    const searchEquData = (e) => {
-      // console.log("设备列表", e);
-      selEquipOptions.value = e;
-    }
-    // 获取机器下拉
-    const getEquipmentListFun = async () => {
-      const { data } = await getEquipmentList({ adminId: user.id });
-      if (data.code === "00000") {
-        if (data.data.length > 0) {
-          // 将id转成字符串类型,解决选中问题
-          data.data.forEach((item) => {
-            item.id = item.id + "";
-          });
-        }
-        selEquipOptions.value = data.data;
-        if (addParams.equipmentIds != null) {
-          const list = addParams.equipmentIds.split(',');
-          const listName = [];
-          // 根据id找到对应的name
-          selEquipOptions.value.forEach(item => {
-            list.forEach(item1 => {
-              if (item.id === item1) {
-                listName.push(item.name);
-              }
-            })
-          })
-          cofficentForm.value.equipmentNames = listName.join(",");
-        }
-      } else {
-        showFailToast(data.message);
-      }
-    };
-
-    const onSubmit = async () => {
-      let params = { adminId: user.id };
-      params = Object.assign({ adminId: user.id }, addParams);
-      if (params.password !== "") {
-        params.password = md5(params.password);
-      }
-      params.roleList = [params.roleList];
-      // if (params.equipmentIds !== 'all') {
-      //   params.equipmentIds= [params.equipmentIds];
-      // }
-      if (pageTitle.value === t("accountPer.modifyAccount")) {
-        // delete params.password;
-        const { data } = await updataLoginUser(params);
-        if (data.code === "00000") {
-          showSuccessToast(t("accountPer.successfullyModifiedTheAccount"));
-          // router.push("/accountPer");
-          router.replace("/accountPer");
-        } else {
-          showFailToast(t("accountPer.failedToModifyTheAccount"), data.message);
-        }
-        console.log("onSubmit", data);
-      } else {
-        const { data } = await addLoginUser(params);
-        if (data.code === "00000") {
-          showSuccessToast(t("accountPer.accountAddedSuccessfully"));
-          // router.push("/accountPer");
-          router.replace("/accountPer");
-        } else if (data.code === 'A0201') {
-          showToast(t("accountPer.accountNameExists"));
-        } else {
-          showFailToast(t("accountPer.failedToAddAccount"), data.message);
-        }
-        console.log("onSubmit", data);
-      }
-    };
-    const deleteLoginUserFun = async () => {
-      const params = {
-        adminId: user.id,
-        id: addParams.id,
-      };
-      const { data } = await deleteLoginUser(params);
-      if (data.code === "00000") {
-        showSuccessToast(t("accountPer.successfullyDeletedTheAccount"));
-        router.push("/accountPer");
-      } else {
-        showFailToast(t("accountPer.failedToDeleteTheAccount"), data.message);
-      }
-    };
-    // 点击机器列表
-    const busiEquipInpClk = () => {
-      if (cofficentForm.value.equipmentNames) {
-        let list = cofficentForm.value.equipmentNames.split(",");
-        console.log(list, "list");
-        kSelectPopEquipRef.value.selPopOpen(list);
-      } else {
-        kSelectPopEquipRef.value.selPopOpen();
-      }
-    };
-    // 机器选择弹窗
-    const selEquipOptions = ref([]);
-    const kSelectPopEquipRef = ref(null);
-    // 机器弹窗的确定按钮
-    const selEquipConfirm = (e, e1) => {
-      console.log("e", e);
-      console.log("e1", e1);
-      if (e.length > 0) {
-        // const list = [];
-        // // 根据id找到对应的name
-        // selEquipOptions.value.forEach(item => {
-        //   e.forEach(item1 => {
-        //     if (item.id === item1) {
-        //       list.push(item.name);
-        //     }
-        //   })
-        // })
-        // console.log("list", list)
-        cofficentForm.value.equipmentNames = e.join(",");
-        addParams.equipmentIds = e1.join(",");
-        console.log("equipmentNames", cofficentForm.value.equipmentNames);
-        console.log("equipmentIds", addParams.equipmentIds);
-      } else {
-        cofficentForm.value.equipmentNames = "";
-        addParams.equipmentIds = '';
-      }
-      kSelectPopEquipRef.value.selPopClose();
-    };
-    return {
-      pageTitle,
-      roleShow,
-      roleText,
-      roleOptions,
-      onRoleFinish,
-      equipmentIdShow,
-      equipmentIdText,
-      equipmentIdsOptions,
-      onEquipmentIdFinish,
-      ...toRefs(addParams),
-      onSubmit,
-      deleteLoginUserFun,
-      selEquipOptions,
-      kSelectPopEquipRef,
-      selEquipConfirm,
-      cofficentForm,
-      busiEquipInpClk,
-      havePassword,
-      passwordPlaceholder,
-      isUserName,
-      searchEquData,
-    };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-@import "../../common/style/common.less";
-</style>

+ 0 - 0
src/views/accountPer/index.vue


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff