Compare commits

...

No commits in common. "main" and "master" have entirely different histories.
main ... master

3205 changed files with 31715 additions and 502778 deletions

25
.gitignore vendored
View File

@ -1 +1,26 @@
# Build and Release Folders
bin-debug/
bin-release/
[Oo]bj/
[Bb]in/
.idea
# Other files and folders
.settings/
# Executables
*.swf
*.air
*.ipa
*.apk
# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
# should NOT be excluded as they contain compiler settings and other important
# information for Eclipse / Flash Builder.
/gasStation-uni/uni_modules/
/gasStation-uni/unpackage/
/gasStation-uni/node_modules/
/pos-uni/unpackage/
node_modules

8
.idea/.gitignore vendored
View File

@ -1,8 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ApifoxUploaderProjectSetting">
<option name="apiAccessToken" value="APS-7sVwcf15GIEFsfvgul8y3dd7N3tedf6H" />
<option name="apiApiOverwriteMode" value="覆盖所有字段" />
<option name="apiProjectIds">
<array>
<option value="&lt;byte-array&gt;rO0ABXNyADZjb20uaXRhbmdjZW50LmlkZWEucGx1Z2luLmFwaS5hY2NvdW50LlByb2plY3RBbmRNb2R1bGUAAAAAAAAAAQIAFVoABmVuYWJsZUwACG1vZHVsZUlkdAASTGphdmEvbGFuZy9TdHJpbmc7TAAGb3RoZXIxcQB+AAFMAAdvdGhlcjEwcQB+AAFMAAdvdGhlcjExcQB+AAFMAAdvdGhlcjEycQB+AAFMAAZvdGhlcjJxAH4AAUwABm90aGVyM3EAfgABTAAGb3RoZXI0cQB+AAFMAAZvdGhlcjVxAH4AAUwABm90aGVyNnEAfgABTAAGb3RoZXI3cQB+AAFMAAZvdGhlcjhxAH4AAUwABm90aGVyOXEAfgABTAAKcGF0aEJlZm9yZXEAfgABTAANcHJvamVjdEZvbGRlcnEAfgABTAAPcHJvamVjdEZvbGRlcklkcQB+AAFMAAlwcm9qZWN0SWRxAH4AAUwAC3Byb2plY3ROYW1lcQB+AAFMAAxzY2hlbWFGb2xkZXJxAH4AAUwACHNjaGVtYUlkcQB+AAF4cAB0AAZoaWRkZW5wcHBwcHBwcHBwcHB0AApwYXRoQmVmb3JldAANcHJvamVjdEZvbGRlcnQAD3Byb2plY3RGb2xkZXJJZHQAC3Byb2plY3ROYW1ldAAIaGlkZGVuSWR0AABxAH4ACQ==&lt;/byte-array&gt;" />
<option value="&lt;byte-array&gt;rO0ABXNyADZjb20uaXRhbmdjZW50LmlkZWEucGx1Z2luLmFwaS5hY2NvdW50LlByb2plY3RBbmRNb2R1bGUAAAAAAAAAAQIAFVoABmVuYWJsZUwACG1vZHVsZUlkdAASTGphdmEvbGFuZy9TdHJpbmc7TAAGb3RoZXIxcQB+AAFMAAdvdGhlcjEwcQB+AAFMAAdvdGhlcjExcQB+AAFMAAdvdGhlcjEycQB+AAFMAAZvdGhlcjJxAH4AAUwABm90aGVyM3EAfgABTAAGb3RoZXI0cQB+AAFMAAZvdGhlcjVxAH4AAUwABm90aGVyNnEAfgABTAAGb3RoZXI3cQB+AAFMAAZvdGhlcjhxAH4AAUwABm90aGVyOXEAfgABTAAKcGF0aEJlZm9yZXEAfgABTAANcHJvamVjdEZvbGRlcnEAfgABTAAPcHJvamVjdEZvbGRlcklkcQB+AAFMAAlwcm9qZWN0SWRxAH4AAUwAC3Byb2plY3ROYW1lcQB+AAFMAAxzY2hlbWFGb2xkZXJxAH4AAUwACHNjaGVtYUlkcQB+AAF4cAF0ABFmdWludC1hcHBsaWNhdGlvbnBwcHBwcHBwcHBwcHQAAHQACeagueebruW9lXQAATB0AAk1MTQ5MzA4LjB0AAbmsrnnq5lxAH4ABXEAfgAG&lt;/byte-array&gt;" />
</array>
</option>
<option name="apiSyncFolder" value="true" />
<option name="treeNodes" value="&lt;byte-array&gt;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&lt;/byte-array&gt;" />
<option name="treeNodesJTree" value="&lt;byte-array&gt;rO0ABXNyACFqYXZheC5zd2luZy50cmVlLkRlZmF1bHRUcmVlTW9kZWynvpEmGsXl2QMAA1oAEmFza3NBbGxvd3NDaGlsZHJlbkwADGxpc3RlbmVyTGlzdHQAJUxqYXZheC9zd2luZy9ldmVudC9FdmVudExpc3RlbmVyTGlzdDtMAARyb290dAAbTGphdmF4L3N3aW5nL3RyZWUvVHJlZU5vZGU7eHAAc3IAI2phdmF4LnN3aW5nLmV2ZW50LkV2ZW50TGlzdGVuZXJMaXN0kUjMLXPfDt4DAAB4cHB4c3IAJ2phdmF4LnN3aW5nLnRyZWUuRGVmYXVsdE11dGFibGVUcmVlTm9kZcRYv/zyqHHgAwADWgAOYWxsb3dzQ2hpbGRyZW5MAAhjaGlsZHJlbnQAEkxqYXZhL3V0aWwvVmVjdG9yO0wABnBhcmVudHQAIkxqYXZheC9zd2luZy90cmVlL011dGFibGVUcmVlTm9kZTt4cAFzcgAQamF2YS51dGlsLlZlY3RvctmXfVuAO68BAwADSQARY2FwYWNpdHlJbmNyZW1lbnRJAAxlbGVtZW50Q291bnRbAAtlbGVtZW50RGF0YXQAE1tMamF2YS9sYW5nL09iamVjdDt4cAAAAAAAAAACdXIAE1tMamF2YS5sYW5nLk9iamVjdDuQzlifEHMpbAIAAHhwAAAACnNxAH4ABgFzcQB+AAoAAAAAAAAAA3VxAH4ADQAAAApzcQB+AAYBcHEAfgAPdXEAfgANAAAAAnQACnVzZXJPYmplY3RzcgAuY29tLml0YW5nY2VudC5pZGVhLnBsdWdpbi5hcGkuYWNjb3VudC5UcmVlTm9kZQAAAAAAAAABAgALTAAHYWxsUGF0aHQAEkxqYXZhL2xhbmcvU3RyaW5nO0wACGNoaWxkcmVudAAPTGphdmEvdXRpbC9NYXA7TAAIZnVsbFBhdGhxAH4AFkwAA2tleXEAfgAWTAAEbmFtZXEAfgAWTAAIcGFyZW50SWRxAH4AFkwACXByb2plY3RJZHEAfgAWTAALcHJvamVjdE5hbWVxAH4AFkwABnRlYW1JZHEAfgAWTAAIdGVhbU5hbWVxAH4AFkwABHR5cGV0ADBMY29tL2l0YW5nY2VudC9pZGVhL3BsdWdpbi9hcGkvYWNjb3VudC9Ob2RlVHlwZTt4cHQAGeS4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&lt;/byte-array&gt;" />
</component>
</project>

View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="fuint-application" />
<module name="fuint-utils" />
<module name="fuint-repository" />
<module name="fuint-framework" />
<module name="fuint-payment" />
<module name="fuint-quartz" />
</profile>
</annotationProcessing>
</component>
</project>

View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="oil" uuid="4255010b-d3cd-4300-989c-d9a8910e1e0e">
<driver-ref>mysql.8</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mysql://47.94.122.58:3306</jdbc-url>
<jdbc-additional-properties>
<property name="com.intellij.clouds.kubernetes.db.host.port" />
<property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
<property name="com.intellij.clouds.kubernetes.db.container.port" />
</jdbc-additional-properties>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>
</project>

View File

@ -1,541 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EasyCodeTableSetting">
<option name="tableInfoMap">
<map>
<entry key="oilsystem.active_birthday">
<value>
<TableInfoDTO>
<option name="comment" value="生日有礼表" />
<option name="fullColumn">
<list>
<ColumnInfoDTO>
<option name="comment" value="主键" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="id" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动名称" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="name" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动时间类型0永久有效1自定义" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="activeTimeType" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动开始时间" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="activeStartTime" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动结束时间" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="activeEndTime" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="通知内容" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="noticeContent" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动详情" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="activityDetails" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动奖品 0优惠券 2成长值 3积分" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="courtesyReward" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="赠送积分" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="points" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="赠送成长值" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="growthValue" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="创建者" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="createBy" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="创建时间" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="createTime" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="更新者" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="updateBy" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="更新时间" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="updateTime" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
</list>
</option>
<option name="name" value="ActiveBirthday" />
<option name="preName" value="" />
<option name="saveModelName" value="fuint-application" />
<option name="savePackageName" value="com.fuint.business.marketingActivity.activeBirthday" />
<option name="savePath" value="./fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeBirthday" />
<option name="templateGroupName" value="Default" />
</TableInfoDTO>
</value>
</entry>
<entry key="oilsystem.active_birthday_child">
<value>
<TableInfoDTO>
<option name="fullColumn">
<list>
<ColumnInfoDTO>
<option name="comment" value="主键" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="id" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="生日活动id" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="activeBirthdayId" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="券id" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="vouchersId" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="券数量" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="giftCardTotal" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="创建者" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="createBy" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="创建时间" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="createTime" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="更新者" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="updateBy" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="更新时间" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="updateTime" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
</list>
</option>
<option name="name" value="ActiveBirthdayChild" />
<option name="preName" value="" />
<option name="saveModelName" value="fuint-application" />
<option name="savePackageName" value="com.fuint.business.marketingActivity.activeBirthday" />
<option name="savePath" value="./fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeBirthday" />
<option name="templateGroupName" value="Default" />
</TableInfoDTO>
</value>
</entry>
<entry key="oilsystem.active_user_recharge">
<value>
<TableInfoDTO>
<option name="comment" value="推荐会员充值有礼" />
<option name="fullColumn">
<list>
<ColumnInfoDTO>
<option name="comment" value="主键" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="id" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="所属连锁店id" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="chainStoreId" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="所属店铺id" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="storeId" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动名称" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="name" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动时间类型0永久有效1自定义" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="activeTimeType" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动开始时间" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="activeStartTime" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动结束时间" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="activeEndTime" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="获赠次数限制" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="frequencyLimit" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="可使用支付方式" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="paymentType" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="适用会员等级" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="userGradeIds" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动奖品 0优惠券 2成长值 3积分" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="courtesyReward" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="赠送积分" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="points" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="赠送成长值" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="growthValue" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="创建者" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="createBy" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="创建时间" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="createTime" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="更新者" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="updateBy" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="更新时间" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="updateTime" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
</list>
</option>
<option name="name" value="ActiveUserRecharge" />
<option name="preName" value="" />
<option name="saveModelName" value="fuint-application" />
<option name="savePackageName" value="com.fuint.business.marketingActivity.activeUserRecharge" />
<option name="savePath" value="./fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeUserRecharge" />
<option name="templateGroupName" value="Default" />
</TableInfoDTO>
</value>
</entry>
<entry key="oilsystem.active_user_recharge_child">
<value>
<TableInfoDTO>
<option name="comment" value="推荐会员充值有礼子表" />
<option name="fullColumn">
<list>
<ColumnInfoDTO>
<option name="comment" value="主键" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="id" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="生日活动id" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="activeUserRechargeId" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="券id" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="vouchersId" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="券数量" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="giftCardTotal" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="创建者" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="createBy" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="创建时间" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="createTime" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="更新者" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="updateBy" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="更新时间" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="updateTime" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
</list>
</option>
<option name="name" value="ActiveUserRechargeChild" />
<option name="preName" value="" />
<option name="saveModelName" value="fuint-application" />
<option name="savePackageName" value="com.fuint.business.marketingActivity.activeUserRecharge" />
<option name="savePath" value="./fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeUserRecharge" />
<option name="templateGroupName" value="Default" />
</TableInfoDTO>
</value>
</entry>
<entry key="oilsystem.open_card_gift">
<value>
<TableInfoDTO>
<option name="comment" value="营销中心-开卡有礼" />
<option name="fullColumn">
<list>
<ColumnInfoDTO>
<option name="comment" value="主键" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="id" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="连锁店id" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="chainStoreId" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="油站id" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="storeId" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动名称" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="name" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动时间类型0永久有效1自定义" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="activityTimeType" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动时间前" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="activityTimeFront" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动时间后" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="activityTimeAfter" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="通知内容" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="noticeContent" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动详情" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="activityDetails" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="活动奖品(多选):赠送积分、赠送成长值、赠送优惠券" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="activityPrize" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="赠送积分数量" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="givePoints" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="赠送成长值" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="giveGrowthValue" />
<option name="type" value="java.lang.Integer" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="赠送优惠信息" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="giveCoupon" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="创建时间" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="createTime" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="创建人" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="createBy" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="更新时间" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="updateTime" />
<option name="type" value="java.util.Date" />
</ColumnInfoDTO>
<ColumnInfoDTO>
<option name="comment" value="更新人" />
<option name="custom" value="false" />
<option name="ext" value="{}" />
<option name="name" value="updateBy" />
<option name="type" value="java.lang.String" />
</ColumnInfoDTO>
</list>
</option>
<option name="name" value="OpenCardGift" />
<option name="preName" value="" />
<option name="saveModelName" value="fuint-application" />
<option name="savePackageName" value="com.fuint.business.marketingActivity.openCardGift" />
<option name="savePath" value="./fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift" />
<option name="templateGroupName" value="Default" />
</TableInfoDTO>
</value>
</entry>
</map>
</option>
</component>
</project>

View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/fuintBackend/fuint-application/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/fuintBackend/fuint-application/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/fuintBackend/fuint-framework/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/fuintBackend/fuint-framework/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/fuintBackend/fuint-payment/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/fuintBackend/fuint-payment/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/fuintBackend/fuint-quartz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/fuintBackend/fuint-quartz/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/fuintBackend/fuint-repository/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/fuintBackend/fuint-repository/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/fuintBackend/fuint-utils/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/fuintBackend/fuint-utils/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/fuintBackend/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/fuintBackend/src/main/resources" charset="UTF-8" />
</component>
</project>

View File

@ -1,68 +0,0 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="AliAccessStaticViaInstance" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AliArrayNamingShouldHaveBracket" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AliControlFlowStatementWithoutBraces" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AliDeprecation" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AliEqualsAvoidNull" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AliLongLiteralsEndingWithLowercaseL" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AliMissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AliWrapperTypeEquality" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAbstractClassShouldStartWithAbstractNaming" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAbstractMethodOrInterfaceMethodMustUseJavadoc" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAvoidApacheBeanUtilsCopy" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAvoidCallStaticSimpleDateFormat" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAvoidCommentBehindStatement" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAvoidComplexCondition" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAvoidConcurrentCompetitionRandom" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAvoidDoubleOrFloatEqualCompare" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAvoidManuallyCreateThread" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAvoidMissUseOfMathRandom" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAvoidNegationOperator" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAvoidNewDateGetTime" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAvoidPatternCompileInMethod" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAvoidReturnInFinally" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAvoidStartWithDollarAndUnderLineNaming" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAvoidUseTimer" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaBigDecimalAvoidDoubleConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaBooleanPropertyShouldNotStartWithIs" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaClassCastExceptionWithSubListToArrayList" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaClassCastExceptionWithToArray" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaClassMustHaveAuthor" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaClassNamingShouldBeCamel" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaCollectionInitShouldAssignCapacity" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaCommentsMustBeJavadocFormat" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaConcurrentExceptionWithModifyOriginSubList" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaConstantFieldShouldBeUpperCase" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaCountDownShouldInFinally" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaDontModifyInForeachCircle" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaEnumConstantsMustHaveComment" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaExceptionClassShouldEndWithException" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaIbatisMethodQueryForList" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaLockShouldWithTryFinally" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaLowerCamelCaseVariableNaming" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaMethodReturnWrapperType" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaMethodTooLong" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaPackageNaming" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaPojoMustOverrideToString" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaPojoMustUsePrimitiveField" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaPojoNoDefaultValue" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaRemoveCommentedCode" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaServiceOrDaoClassShouldEndWithImpl" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaSneakyThrowsWithoutExceptionType" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaStringConcat" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaSwitchExpression" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaSwitchStatement" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaTestClassShouldEndWithTestNaming" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaThreadLocalShouldRemove" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaThreadPoolCreation" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaThreadShouldSetName" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaTransactionMustHaveRollback" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaUndefineMagicConstant" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaUnsupportedExceptionWithModifyAsList" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaUseQuietReferenceNotation" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaUseRightCaseForDateFormat" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MapOrSetKeyShouldOverrideHashCodeEquals" enabled="true" level="WARNING" enabled_by_default="true" />
</profile>
</component>

View File

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://maven.aliyun.com/repository/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
</component>
</project>

View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/fuintBackend/pom.xml" />
</list>
</option>
<option name="workspaceImportForciblyTurnedOn" value="true" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/oil-station.iml" filepath="$PROJECT_DIR$/.idea/oil-station.iml" />
</modules>
</component>
</project>

View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.idea/dataSources" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

View File

@ -1,124 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

View File

@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
VUE_APP_SERVER_URL = 'http://192.168.31.178:8080/'
VUE_APP_SERVER_URL = 'http://192.168.31.178:8081/'
# http://192.168.0.121:8080/

View File

@ -1 +0,0 @@
Enter the absolute path where the nvm-windows zip file is extracted/copied to:

View File

@ -42,9 +42,9 @@
"axios": "0.24.0",
"bignumber.js": "^9.1.2",
"clipboard": "2.0.8",
"core-js": "^3.38.1",
"core-js": "3.25.3",
"crypto-js": "^4.2.0",
"echarts": "^5.5.1",
"echarts": "4.9.0",
"element-tiptap": "^1.27.1",
"element-ui": "2.15.12",
"file-saver": "2.0.5",

View File

@ -113,7 +113,7 @@
top: 0;
width: 51%;
height: 100%;
background: #fe8c4a;
background: #409EFF;
z-index: 1000;
-webkit-transform: translateX(0);
-ms-transform: translateX(0);

View File

@ -20,9 +20,7 @@
<style >
.app-container{
width: 100%;
//height: 100vh;
background: #f6f8f9;
box-sizing: border-box;
padding: 10px;
}
</style>

View File

@ -41,14 +41,6 @@ export function eitList(data) {
data: data
})
}
// 修改上下架
export function updateStatus(data) {
return request({
url: 'business/marketingActivity/cardValue/updateStatus',
method: 'put',
data: data
})
}
//删除列表
export function deletedelById(id) {
return request({
@ -57,34 +49,4 @@ export function deletedelById(id) {
})
}
export function cardValueRule(data) {
return request({
url: 'cardValueRule/nowRule',
method: 'get',
params: data
})
}
export function saveOrUpdate(data) {
return request({
url: 'cardValueRule/saveOrUpdate',
method: 'post',
data: data
})
}
// 订单查询
export function cardValueRecordList(data) {
return request({
url: 'business/marketingActivity/activeExchange/cardValueOrders',
method: 'get',
params: data
})
}
// 订单查询
export function cardValueRecordLists(data) {
return request({
url: 'business/marketingActivity/cardValueRecord/getCardValueByCardValueId',
method: 'post',
params: data
})
}

View File

@ -1,28 +0,0 @@
import request from '@/utils/request'
export function getActiveBirthday(id) {
return request({
url: 'activeBirthday/'+id,
method: 'get',
})
}
export function addActiveBirthday(data) {
return request({
url: 'activeBirthday',
method: 'post',
data:data
})
}
export function editActiveBirthday(data) {
return request({
url: 'activeBirthday',
method: 'put',
data:data
})
}
export function deleteActiveBirthday(id) {
return request({
url: 'activeBirthday/'+id,
method: 'delete',
})
}

View File

@ -27,7 +27,7 @@ export function listActiveConsumption(query) {
//优惠券
export function listFavorable(query) {
return request({
url: 'cardCoupon',
url: 'business/marketingActivity/cardFavorable',
method: 'get',
params: query
})
@ -106,27 +106,3 @@ export function looklooklook(id) {
})
}
export function getInfoActivity(id) {
return request({
url: 'business/marketingActivity/activeConsumption/selectById/'+id,
method: 'get',
})
}
export function addActivity(data) {
return request({
url: 'business/marketingActivity/activeConsumption/add',
method: 'post',
data:data
})
}
export function editActivity(data) {
return request({
url: 'business/marketingActivity/activeConsumption/updateActiveConsumption',
method: 'put',
data:data
})
}

View File

@ -68,28 +68,3 @@ export function delActiveNewlyweds(id) {
method: 'delete'
})
}
// 根据id查询开卡有礼信息
export function getInfoActiveNewlyweds(id) {
return request({
url: '/business/marketingActivity/activeNewlyweds/getInfoById/'+id,
method: 'get'
})
}
// 添加开卡有礼信息
export function insertActiveNewlyweds(data) {
return request({
url: '/business/marketingActivity/activeNewlyweds/add',
method: 'post',
data:data
})
}
// 修改开卡有礼信息
export function editActiveNewlyweds1(data) {
return request({
url: '/business/marketingActivity/activeNewlyweds/update',
method: 'put',
data:data
})
}

View File

@ -1,28 +0,0 @@
import request from '@/utils/request'
export function getActivePopUp(id) {
return request({
url: 'activePopUp/'+id,
method: 'get',
})
}
export function addActivePopUp(data) {
return request({
url: 'activePopUp',
method: 'post',
data:data
})
}
export function editActivePopUp(data) {
return request({
url: 'activePopUp',
method: 'put',
data:data
})
}
export function deleteActivePopUp(id) {
return request({
url: 'activePopUp/'+id,
method: 'delete',
})
}

View File

@ -73,29 +73,3 @@ export function delActiveRecommend(id) {
method: 'delete'
})
}
//
export function getActiveRecommendInfo(id) {
return request({
url: '/business/marketingActivity/activeRecommend/getInfoById/'+id ,
method: 'get'
})
}
//
export function insertActiveRecommend(data) {
return request({
url: '/business/marketingActivity/activeRecommend/add',
method: 'post',
data:data
})
}
//
export function updateActiveRecommend1(data) {
return request({
url: '/business/marketingActivity/activeRecommend/update',
method: 'put',
data:data
})
}

View File

@ -1,28 +0,0 @@
import request from '@/utils/request'
export function getActiveSubPrice(id) {
return request({
url: 'business/activeSubPrice/'+id,
method: 'get',
})
}
export function addActiveSubPrice(data) {
return request({
url: 'business/activeSubPrice/add',
method: 'post',
data:data
})
}
export function editActiveSubPrice(data) {
return request({
url: 'business/activeSubPrice/update',
method: 'put',
data:data
})
}
export function deleteActiveSubPrice(id) {
return request({
url: 'business/activeSubPrice/del/'+id,
method: 'delete',
})
}

View File

@ -1,28 +0,0 @@
import request from '@/utils/request'
export function getActiveUserConsume(id) {
return request({
url: 'activeUserConsume/'+id,
method: 'get',
})
}
export function addActiveUserConsume(data) {
return request({
url: 'activeUserConsume',
method: 'post',
data:data
})
}
export function editActiveUserConsume(data) {
return request({
url: 'activeUserConsume',
method: 'put',
data:data
})
}
export function deleteActiveUserConsume(id) {
return request({
url: 'activeUserConsume/'+id,
method: 'delete',
})
}

View File

@ -1,28 +0,0 @@
import request from '@/utils/request'
export function getActiveUserRecharge(id) {
return request({
url: 'activeUserRecharge/'+id,
method: 'get',
})
}
export function addActiveUserRecharge(data) {
return request({
url: 'activeUserRecharge',
method: 'post',
data:data
})
}
export function editActiveUserRecharge(data) {
return request({
url: 'activeUserRecharge',
method: 'put',
data:data
})
}
export function deleteActiveUserRecharge(id) {
return request({
url: 'activeUserRecharge/'+id,
method: 'delete',
})
}

View File

@ -1,66 +0,0 @@
import request from '@/utils/request'
// 查询优惠券活动列表
export function listCardCoupon(query) {
return request({
url: 'cardCoupon',
method: 'get',
params: query
})
}
// 查询优惠券剩余数量>0的
export function getCardCouponNum(query) {
return request({
url: 'cardCoupon/queryByNum',
method: 'get',
params: query
})
}
// 根据id优惠券活动列表
export function getCardCoupon(id) {
return request({
url: 'cardCoupon/'+id,
method: 'get',
})
}
// 添加优惠券活动信息
export function addCardCoupon(data) {
return request({
url: 'cardCoupon',
method: 'post',
data: data
})
}
// 修改优惠券活动信息
export function editCardCoupon(data) {
return request({
url: 'cardCoupon',
method: 'put',
data: data
})
}
// 删除优惠券活动信息
export function deleteCardCoupon(id) {
return request({
url: 'cardCoupon/'+id,
method: 'delete',
})
}
export function CardCouponDelete(id) {
return request({
url: 'cardCoupon/delete/'+id,
method: 'delete',
})
}
export function getCoupon(id) {
return request({
url: 'cardCoupon/isOnLine/'+id,
method: 'get',
})
}

View File

@ -1,53 +1,13 @@
import request from '@/utils/request'
// 上传文件
export function uploadFile(data,activeNum,interType) {
return request({
url: '/cardGiftActive/importCardInfo?activeNum='+activeNum+'&interType='+interType,
method: 'post',
data: data,
headers: {
'Content-Type': 'multipart/form-data'
}
})
}
// 分页查询列表
export function getList(query) {
return request({
url: '/cardGiftActive',
url: 'business/marketingActivity/cardGift',
method: 'get',
params: query
})
}
//修改
export function updateId(data) {
return request({
url: '/cardGiftActive',
method: 'put',
data: data
})
}
//新增
export function add(data) {
return request({
url: '/cardGiftActive',
method: 'post',
data: data
})
}
//下载模板
export function downloadTemplate() {
return request({
url: 'business/marketingActivity/cardGift/template',
method: 'get',
responseType: 'blob'
})
}
export function getListtj(query) {
return request({
url: 'business/marketingActivity/cardGift/list/11',
@ -136,17 +96,3 @@ export function getwei() {
method: 'get',
})
}
export function encryptData(id) {
return request({
url: 'cardGiftActive/encryptData?activeId='+id,
method: 'post',
})
}
export function exportCardInfo(id) {
return request({
url: 'cardGiftActive/exportCardInfo?activeId='+id,
method: 'post',
responseType:'blob',
})
}

View File

@ -64,12 +64,4 @@ export function getstatistics() {
})
}
export function cardFuleOrders() {
return request({
url: 'business/marketingActivity/cardFuleOrders',
method: 'get',
})
}

View File

@ -1,43 +0,0 @@
import request from '@/utils/request'
// 查询开卡有礼信息
export function getOpenCardInfo() {
return request({
url: 'openCardGift',
method: 'get',
})
}
// 根据id查询开卡有礼信息
export function getOpenCardById(id) {
return request({
url: 'openCardGift/'+id,
method: 'get',
})
}
// 添加开卡有礼信息
export function addOpenCardBy(data) {
return request({
url: 'openCardGift',
method: 'post',
data:data
})
}
// 添加开卡有礼信息
export function editOpenCardBy(data) {
return request({
url: 'openCardGift',
method: 'put',
data:data
})
}
// 根据id删除开卡有礼信息
export function deleteOpenCard(id) {
return request({
url: 'openCardGift/'+id,
method: 'delete',
})
}

View File

@ -1,26 +0,0 @@
import request from "@/utils/request";
// 查询油罐列表
export function pageActive(data) {
return request({
url: 'business/marketingActivity/activeApplet/page',
method: 'get',
params: data
})
}
// 删除活动信息
export function deleteActive(id) {
return request({
url: 'business/marketingActivity/activeApplet/delete/'+id,
method: 'delete',
})
}
// 修改活动状态
export function editActiveStatus(id) {
return request({
url: 'business/marketingActivity/activeApplet/editStatus/'+id,
method: 'get',
})
}

View File

@ -9,14 +9,6 @@ export function getOrderListApi(query) {
})
}
export function getOrderInfoById(id) {
return request({
url: '/business/allOrderInfo/'+id,
method: 'get',
})
}
// 分页查询所有的订单信息
export function getSumPayMoneyApi(query) {
return request({
@ -44,27 +36,6 @@ export function getTradingPageApi(query) {
})
}
export function getTradingOnsPageApi(query) {
return request({
url: 'business/allOrderInfo/tradingList',
method: 'get',
params: query
})
}
// 油站端 - 财务报表 -交易对账-交易明细 表格数据
export function transactionList(query) {
return request({
url: 'business/allOrderInfo/transactionList',
method: 'get',
params: query
})
}
export function getInstituionListApi(query) {
return request({
url: 'business/allOrderInfo/runningWaterByInstituion',
@ -73,6 +44,14 @@ export function getInstituionListApi(query) {
})
}
export function getInstituionListApi2(query) {
return request({
url: 'business/allOrderInfo/runningWaterByInstituion2',
method: 'get',
params: query
})
}
export function getNoneListApi(query) {
return request({
@ -136,15 +115,6 @@ export function getTissueByDataApi(query) {
})
}
// 油站端- 交易明细-统计数据
export function orderStatistics(query) {
return request({
url: 'business/allOrderInfo/orderStatistics',
method: 'get',
params: query
})
}
export function exportExcelTradingApi(data) {
@ -183,279 +153,3 @@ export function exportExcelDayApi(data) {
data: data // 通过 data 参数传递需要的数据
});
}
// 油站首页核心数据
export function getTotalAmount() {
return request({
url: 'business/allOrderInfo/getTotalAmount',
method: 'get',
});
}
// 油站首页数据展示
export function getDataBoard(query) {
return request({
url: 'business/allOrderInfo/getDataBoard',
method: 'get',
params:query
});
}
// 油站首页 数据看板
export function getDataBoardNew(query) {
return request({
url: 'business/allOrderInfo/getDataBoardNew',
method: 'get',
params:query
});
}
// 油站首页数据分析
export function getDataAnalysis(query) {
return request({
url: 'business/allOrderInfo/getDataAnalysis',
method: 'get',
params:query
});
}
// 油站首页 数据分析 第一个饼状图
export function getOilPercentage(query) {
return request({
url: 'business/allOrderInfo/getOilPercentage',
method: 'get',
params:query
});
}
// 油站首页 数据分析 第二个饼状图
export function getOilAndGoodsPercentage(query) {
return request({
url: 'business/allOrderInfo/getOilAndGoodsPercentage',
method: 'get',
params:query
});
}
// 油站首页 数据分析 第三个饼状图
export function getOilAndGoodsAndVipAndPoints(query) {
return request({
url: 'business/allOrderInfo/getOilAndGoodsAndVipAndPoints',
method: 'get',
params:query
});
}
// 油站首页数据展示
export function getDataShow(query) {
return request({
url: 'business/allOrderInfo/getDataShow',
method: 'get',
params:query
});
}
// 油站首页数据展示
export function getDataCount(query) {
return request({
url: 'business/allOrderInfo/getDataCount',
method: 'get',
params:query
});
}
// 根据字典类型查询字典数据信息
export function getDicts(dictType) {
return request({
url: '/system/dict/data/type/' + dictType,
method: 'get'
})
}
// 根据字典类型查询字典数据信息
export function getStaffByStorId() {
return request({
url: '/business/allOrderInfo/getStaffByStorId',
method: 'post'
})
}
//油站交易对账导出
export function exportExcelOrderMsgsApi(data) {
return request({
url: 'business/allOrderInfo/exportExcelOrderMsgApi',
method: 'post',
responseType: 'blob', // 表明响应类型为二进制流
data: data // 通过 data 参数传递需要的数据
});
}
export function exportExcelBackOrderMsgsApi(data) {
return request({
url: 'business/allOrderInfo/exportExcelBackOrderMsgsApi',
method: 'post',
responseType: 'blob', // 表明响应类型为二进制流
data: data // 通过 data 参数传递需要的数据
});
}
// 交接班-交易对账EXCEL导出
export function exportExcelHandoverOrderApi(data) {
return request({
url: 'business/allOrderInfo/exportExcelHandoverOrder',
method: 'post',
responseType: 'blob', // 表明响应类型为二进制流
data: data // 通过 data 参数传递需要的数据
});
}
export function getTradingNewPageApi(query) {
return request({
url: 'business/allOrderInfo/tradingNewList',
method: 'get',
params: query
})
}
export function getTissueByDataNewsApi(query) {
return request({
url: 'business/allOrderInfo/getTradingNewData',
method: 'get',
params: query
})
}
export function getInstituionListApi2(query) {
return request({
url: 'business/allOrderInfo/getInstituionListApi2',
method: 'get',
params: query
})
}
export function getInstituionListApi6(query) {
return request({
url: 'business/allOrderInfo/getInstituionListApi3',
method: 'get',
params: query
})
}
export function getInstituionListApi7(query) {
return request({
url: 'business/allOrderInfo/getInstituionListApi7',
method: 'get',
params: query
})
}
export function getInstituionListApi9(query) {
return request({
url: 'business/allOrderInfo/getInstituionListApi9',
method: 'get',
params: query
})
}
export function getInstituionListApi11(query) {
return request({
url: 'business/allOrderInfo/getInstituionListApi11',
method: 'get',
params: query
})
}
export function getRunningWaterByDataApi13(query) {
return request({
url: 'business/allOrderInfo/getRunningWaterByDataApi13',
method: 'get',
params: query
})
}
export function getInstituionListApi15(query) {
return request({
url: 'business/allOrderInfo/getInstituionListApi15',
method: 'get',
params: query
})
}
export function getRunningWaterByDataApi17(query) {
return request({
url: 'business/allOrderInfo/getRunningWaterByDataApi17',
method: 'get',
params: query
})
}
export function getInstituionListApi19(query) {
return request({
url: 'business/allOrderInfo/getInstituionListApi19',
method: 'get',
params: query
})
}
export function getRunningWaterByDataApi21(query) {
return request({
url: 'business/allOrderInfo/getRunningWaterByDataApi21',
method: 'get',
params: query
})
}
export function getInstituionListApi23(query) {
return request({
url: 'business/allOrderInfo/getInstituionListApi23',
method: 'get',
params: query
})
}
export function getRunningWaterByDataApi25(query) {
return request({
url: 'business/allOrderInfo/getRunningWaterByDataApi25',
method: 'get',
params: query
})
}
export function getInstituionListApi27(query) {
return request({
url: 'business/allOrderInfo/getInstituionListApi27',
method: 'get',
params: query
})
}
export function getRunningWaterByDataApi29(query) {
return request({
url: 'business/allOrderInfo/getRunningWaterByDataApi29',
method: 'get',
params: query
})
}
export function findOrderStatistics(query) {
return request({
url: 'business/allOrderInfo/findOrderStatistics',
method: 'get',
params: query
})
}

View File

@ -33,11 +33,3 @@ export function dutyEdit(data) {
data: data
})
}
export function getByRoleIdApi(query) {
return request({
url: '/backendApi/account/getByRoleId',
method: 'get',
params: query
})
}

View File

@ -1,6 +1,6 @@
import request from '@/utils/request'
// 查询反馈信息列表
// 查询挂账信息列表
export function listFeekBack(query) {
return request({
url: '/business/userManager/feedback/list',
@ -8,28 +8,3 @@ export function listFeekBack(query) {
params: query
})
}
// 查询反馈信息列表
export function getFeekBack(id) {
return request({
url: '/business/userManager/feedback/'+id,
method: 'get',
})
}
// 查询反馈信息列表
export function editFeekBack(data) {
return request({
url: '/business/userManager/feedback',
method: 'put',
data: data
})
}
// 查询反馈信息列表
export function deleteFeekBack(id) {
return request({
url: '/business/userManager/feedback/'+id,
method: 'delete',
})
}

View File

@ -35,14 +35,6 @@ export function editFleetMember(data) {
data: data
})
}
// 修改车队成员额度
export function editFleetMemberLimit(data) {
return request({
url: 'fleetMember/editLimitPC',
method: 'put',
data: data
})
}
// 删除车队成员信息
export function deleteFleetMember(id) {

View File

@ -44,25 +44,11 @@ export function printLocallyApi(data) {
data: data
})
}
export function handoverShiftPrintingReceipts(data) {
return request({
url: '/business/handoverRecord/handoverShiftPrintingReceipts',
method: 'post',
data: data
})
}
export function handoverShiftPrintingReceiptss(data) {
return request({
url: '/business/handoverRecord/handoverShiftPrintingReceiptss',
method: 'post',
data: data
})
}
export function handoverShiftPrintingReceiptsfor(data) {
export function getHandoverByOrderNoApi(data) {
return request({
url: '/business/handoverRecord/handoverShiftPrintingReceiptsfor',
method: 'post',
data: data
url: '/business/allOrderInfo/getHandoverByOrderNo',
method: 'get',
params: data
})
}

View File

@ -1,64 +0,0 @@
import request from '@/utils/request'
// 查询首页店铺数量信息
export function storeTotalIndex(query) {
return request({
url: '/backendApi/store/getStoreTotal',
method: 'get',
params: query
})
}
// 查询首页店铺金额信息
export function storeAmountIndex(query) {
return request({
url: '/business/allOrderInfo/getAmount',
method: 'get',
params: query
})
}
// 查询首页店铺金额信息
export function storeAmountIndex1(query) {
return request({
url: '/business/allOrderInfo/getAmount1',
method: 'get',
params: query
})
}
// 查询首页店铺金额信息
export function selectStoreAmount(query) {
return request({
url: '/backendApi/store/selectStoreAmount',
method: 'get',
params: query
})
}
// 查询首页店铺金额信息
export function getStoreAmountByTime(query) {
return request({
url: '/backendApi/store/getStoreAmountByTime',
method: 'get',
params: query
})
}
// 查询首页店铺金额信息
export function getAccountInfo(query) {
return request({
url: '/system/dept/getInfo',
method: 'get',
params: query
})
}
export function resetPwd(data) {
return request({
url: '/backendApi/account/resetPwd',
method: 'post',
data: data
})
}

View File

@ -2,49 +2,54 @@ import request from "@/utils/request";
// 查询油罐列表
export function getGiftApi(data) {
return request({
url: 'business/integral/integralGift/queryByPage',
method: 'get',
params: data
})
}
// 新增有关信息
export function insertGiftApi(data) {
return request({
url: 'business/integral/integralGift',
method: 'post',
data: data
})
}
// 修改有关信息
export function updateGiftApi(data) {
return request({
url: 'business/integral/integralGift',
method: 'put',
data: data
})
}
return request({
url: 'business/integral/integralGift/queryByPage',
method: 'get',
params: data
})
}
// 新增有关信息
export function insertGiftApi(data) {
return request({
url: 'business/integral/integralGift',
method: 'post',
data: data
})
}
// 修改有关信息
export function updateGiftApi(data) {
return request({
url: 'business/integral/integralGift',
method: 'put',
data: data
})
}
// 修改库存
export function updateGiftInventoryApi(data) {
return request({
url: 'business/integral/integralGift/updateInventory',
method: 'get',
params: data
})
}
// 修改库存
export function updateGiftInventoryApi(data) {
return request({
url: 'business/integral/integralGift/updateInventory',
method: 'get',
params: data
})
}
//获取全部 剩余数量 >0 的优惠券
export function getCardCoupon(data) {
return request({
url: 'cardCoupon/queryByNum',
method: 'get',
params: data
})
}
//兑换券
export function getCardFavorableApi(data) {
return request({
url: 'business/marketingActivity/cardFavorable?pageNo=1&pageSize=10',
method: 'get',
params: data
})
}
//优惠券
export function getCardExchangeApi(data) {
return request({
url: 'business/marketingActivity/cardExchange?pageNo=1&pageSize=10',
method: 'get',
params: data
})
}

View File

@ -41,7 +41,7 @@ export function getOilPresetList(data) {
return request({
url: 'business/petrolStationManagement/oilPresetPrices/getList',
method: 'get',
params: data
data: data
})
}
@ -79,28 +79,6 @@ export function insertOilPresePricesApi(data) {
data: data
})
}
// 修改预设
export function updateOilPresePricesApi(data) {
return request({
url: 'business/petrolStationManagement/oilPresetPrices',
method: 'put',
data: data
})
}
// 删除预设
export function deleteOilPresePricesApi(id) {
return request({
url: 'business/petrolStationManagement/oilPresetPrices/'+id,
method: 'delete',
})
}
// 删除预设
export function getOilPresePricesApi(id) {
return request({
url: 'business/petrolStationManagement/oilPresetPrices/'+id,
method: 'get',
})
}
export function stopJobApi(data) {
return request({

View File

@ -61,13 +61,3 @@ export function exportExcelHangBillApi(data) {
data: data // 通过 data 参数传递需要的数据
});
}
// 导出积分商城订单
export function exportExcelPointsApi(data) {
return request({
url: 'business/integral/integralOrders/exportExcel',
method: 'post',
responseType: 'blob', // 表明响应类型为二进制流
data: data // 通过 data 参数传递需要的数据
});
}

View File

@ -52,14 +52,6 @@ export function oilNumberList() {
// data: data
})
}
// 查询所有油号
export function oilNumberList1() {
return request({
url: '/business/petrolStationManagement/oilNumber/getList2',
method: 'get',
// data: data
})
}
// 查询所有油号
export function oilNumbers() {

View File

@ -51,20 +51,3 @@ export function listMerchantConfigRecord(query) {
params: query
})
}
// 根据id删除商户配置信息
export function deleteMerchant(id) {
return request({
url: '/api/merchantConfig/'+id,
method: 'delete',
})
}
// 添加商户使用状态
export function addMerchantApi(data) {
return request({
url: '/api/merchantConfig',
method: 'post',
data: data,
})
}

View File

@ -1,66 +0,0 @@
import request from '@/utils/request'
// 查询支付参数配置信息
export function listPaymentParameterPage(query) {
return request({
url: '/paymentParameterConfig',
method: 'get',
params: query,
})
}
// 修改支付参数配置信息
export function editPaymentParameter(data) {
return request({
url: '/paymentParameterConfig',
method: 'put',
data: data,
})
}
// 添加支付参数配置信息
export function addPaymentParameter(data) {
return request({
url: '/paymentParameterConfig',
method: 'post',
data: data,
})
}
// 根据id查询支付参数配置信息
export function paymentParameterInfo(id) {
return request({
url: '/paymentParameterConfig/'+id,
method: 'get',
})
}
// 根据id删除支付参数配置信息
export function deletePaymentParameter(id) {
return request({
url: '/paymentParameterConfig/'+id,
method: 'delete',
})
}
// 根据id查询支付参数配置信息
export function getPaymentParameter(id) {
return request({
url: '/paymentParameterConfig/getInfo/'+id,
method: 'get',
})
}
// 根据deptId查询支付参数配置信息
export function getPaymentParameterByDeptId(deptId) {
return request({
url: '/paymentParameterConfig/getListByDeptId/'+deptId,
method: 'get',
})
}

View File

@ -1,68 +0,0 @@
import request from '@/utils/request'
// 查询支付配置规则列表
export function listRuleConfig(query) {
return request({
url: '/api/ruleConfig',
method: 'get',
params: query,
})
}
export function listRuleConfigs(query) {
return request({
url: '/api/ruleConfig/selectList',
method: 'get',
params: query,
})
}
// 查询支付配置规则列表
export function getRuleConfig(id) {
return request({
url: '/api/ruleConfig/'+id,
method: 'get',
})
}
// 查询支付配置规则列表
export function addRuleConfig(query) {
return request({
url: '/api/ruleConfig',
method: 'post',
data: query,
})
}
// 查询支付配置规则列表
export function editRuleConfig(query) {
return request({
url: '/api/ruleConfig',
method: 'put',
data: query,
})
}
// 查询支付配置规则列表
export function enableRuleConfig(query) {
return request({
url: '/api/ruleConfig/enableRule',
method: 'post',
data: query,
})
}
// 查询支付配置规则列表
export function deleteRuleConfig(id) {
return request({
url: '/api/ruleConfig/'+id,
method: 'delete',
})
}
// 查询支付配置规则列表
export function getOilGunList(query) {
return request({
url: '/business/petrolStationManagement/oilGun/queryByPage',
method: 'get',
params: query,
})
}

View File

@ -7,12 +7,6 @@ export function getListByPageApi(query) {
params: query
})
}
export function getInfoByPageApi(id) {
return request({
url: 'oilEngineConfig/'+id,
method: 'get',
})
}
export function addOilEngineConfigApi(data) {
return request({
url: 'oilEngineConfig',

View File

@ -1,37 +0,0 @@
import request from '@/utils/request'
// 分页查询所有的订单信息
export function getListApi(query) {
return request({
url: 'hardwareStore',
method: 'get',
params: query
})
}
//
export function deleteApi(ids) {
return request({
url: 'hardwareStore?idList=' + ids,
method: 'delete'
})
}
//
export function saveApi(data) {
return request({
url: 'hardwareStore',
method: 'post',
data: data
})
}
// 保存修改信息
export function updateApi(data) {
return request({
url: 'hardwareStore',
method: 'put',
data: data
})
}

View File

@ -134,12 +134,3 @@ export function delOilTag(id) {
method: 'delete'
})
}
// 删除员工
export function getStaffByDeptId(deptId) {
return request({
url: '/business/member/staff/getStaffByDeptId/' + deptId,
method: 'get'
})
}

View File

@ -41,19 +41,3 @@ export function updateStoreRule(data) {
data: data
})
}
// 保存店铺
export function getStoreListByDeptId(deptId) {
return request({
url: 'backendApi/store/getStoreByDeptId/'+deptId,
method: 'get',
})
}
// 保存店铺
export function selectStoreListByDeptId() {
return request({
url: 'backendApi/store/selectStoreByDeptId',
method: 'get',
})
}

View File

@ -1,79 +0,0 @@
import request from '@/utils/request'
// 查询会员列表
export function getUserNum() {
return request({
url: '/userTranslate/selectUserNum',
method: 'get',
})
}
// 查询会员列表
export function getAmount() {
return request({
url: '/userTranslate/selectAmountStatistics',
method: 'get',
})
}
// 查询会员列表
export function getGrantPoints() {
return request({
url: '/userTranslate/selectGrantPointsStatistics',
method: 'get',
})
}
// 查询会员列表
export function getConsumePoints() {
return request({
url: '/userTranslate/selectConsumePointsStatistics',
method: 'get',
})
}
// 查询会员列表
export function getUserOverview() {
return request({
url: '/userTranslate/selectUserOverview',
method: 'get',
})
}
// 查询会员列表
export function getUserSex() {
return request({
url: '/userTranslate/selectUserSex',
method: 'get',
})
}
// 查询会员列表
export function getStoredValue() {
return request({
url: '/userTranslate/selectStoredValue',
method: 'get',
})
}
// 查询会员列表
export function getSource() {
return request({
url: '/userTranslate/selectSource',
method: 'get',
})
}
// 查询会员列表
export function getUserAge() {
return request({
url: '/userTranslate/selectUserAge',
method: 'get',
})
}
// 查询会员列表
export function getByYear() {
return request({
url: '/userTranslate/selectByYear',
method: 'get',
})
}
// 查询会员列表
export function getByMonth() {
return request({
url: '/userTranslate/selectByMonth',
method: 'get',
})
}

View File

@ -1,39 +0,0 @@
import request from '@/utils/request'
// 分页查询所有的订单信息
export function getAppListApi(query) {
return request({
url: 'sys/sysApp/queryByPage',
method: 'get',
params: query
})
}
//
export function deleteAppApi(AppId) {
return request({
url: 'sys/sysApp/' + AppId,
method: 'delete'
})
}
//
export function saveAppApi(data) {
return request({
url: 'sys/sysApp',
method: 'post',
data: data
})
}
// 保存修改信息
export function updateAppApi(data) {
return request({
url: 'sys/sysApp',
method: 'put',
data: data
})
}

View File

@ -1,37 +0,0 @@
import request from '@/utils/request'
// 分页查询所有的订单信息
export function getBannerListApi(query) {
return request({
url: 'sys/sysBanner/queryByPage',
method: 'get',
params: query
})
}
//
export function deleteBannerApi(bannerId) {
return request({
url: 'sys/sysBanner/' + bannerId,
method: 'delete'
})
}
//
export function saveBannerApi(data) {
return request({
url: 'sys/sysBanner',
method: 'post',
data: data
})
}
// 保存修改信息
export function updateBannerApi(data) {
return request({
url: 'sys/sysBanner',
method: 'put',
data: data
})
}

View File

@ -1,37 +0,0 @@
import request from '@/utils/request'
// 分页查询所有的订单信息
export function getListApi(query) {
return request({
url: 'hardwareStore',
method: 'get',
params: query
})
}
//
export function deleteApi(ids) {
return request({
url: 'hardwareStore?idList=' + ids,
method: 'delete'
})
}
//
export function saveApi(data) {
return request({
url: 'hardwareStore',
method: 'post',
data: data
})
}
// 保存修改信息
export function updateApi(data) {
return request({
url: 'hardwareStore',
method: 'put',
data: data
})
}

View File

@ -1,46 +0,0 @@
import request from '@/utils/request'
// 分页查询所有的订单信息
export function getLinkManageListApi(query) {
return request({
url: 'linkManage',
method: 'get',
params: query
})
}
// 分页查询所有的订单信息
export function getLinkManageInfo(id) {
return request({
url: 'linkManage/'+id,
method: 'get',
})
}
//
export function deleteLinkManageApi(LinkManageId) {
return request({
url: 'linkManage/' + LinkManageId,
method: 'delete'
})
}
//
export function saveLinkManageApi(data) {
return request({
url: 'linkManage',
method: 'post',
data: data
})
}
// 保存修改信息
export function updateLinkManageApi(data) {
return request({
url: 'linkManage',
method: 'put',
data: data
})
}

View File

@ -1,75 +0,0 @@
import request from '@/utils/request'
// 分页查询所有的订单信息
export function getListApi(query) {
return request({
url: 'messageTemplate',
method: 'get',
params: query
})
}
//
export function deleteApi(ids) {
return request({
url: 'messageTemplate?idList=' + ids,
method: 'delete'
})
}
//
export function saveApi(data) {
return request({
url: 'messageTemplate',
method: 'post',
data: data
})
}
// 保存修改信息
export function updateApi(data) {
return request({
url: 'messageTemplate',
method: 'put',
data: data
})
}
export function getNameListApi(name) {
return request({
url: 'messageTemplate/getMessageTemplate?name=' + name,
method: 'get'
})
}
export function sendMessageSaveApi(data) {
return request({
url: 'MessageRecord',
method: 'post',
data: data
})
}
export function messageRecordListApi(query) {
return request({
url: 'MessageRecord',
method: 'get',
params: query
})
}
export function selectChildList(query) {
return request({
url: 'MessageRecord/selectChildList',
method: 'get',
params: query
})
}
export function getOneApi(id) {
return request({
url: 'messageTemplate/' + id,
method: 'get'
})
}

View File

@ -1,51 +0,0 @@
import request from '@/utils/request'
// 分页查询所有的订单信息
export function getCostListApi(query) {
return request({
url: 'MessageCost',
method: 'get',
params: query
})
}
//
export function getInfoApi(id) {
return request({
url: 'MessageCost/' + id,
method: 'get'
})
}
//
export function deleteCostApi(id) {
return request({
url: 'MessageCost/' + id,
method: 'delete'
})
}
//
export function saveCostApi(data) {
return request({
url: 'MessageCost',
method: 'post',
data: data
})
}
// 保存修改信息
export function updateCostApi(data) {
return request({
url: 'MessageCost',
method: 'put',
data: data
})
}
export function getCostReListApi(query) {
return request({
url: 'MessageCost/getRechargeList',
method: 'get',
params: query
})
}

View File

@ -1,43 +0,0 @@
import request from '@/utils/request'
// 分页查询所有的订单信息
export function getCostListApi(query) {
return request({
url: 'MessageCost',
method: 'get',
params: query
})
}
//
export function getInfoApi(id) {
return request({
url: 'MessageCost/' + id,
method: 'get'
})
}
//
export function deleteCostApi(id) {
return request({
url: 'MessageCost/' + id,
method: 'delete'
})
}
//
export function saveMessageRechargeRecordApi(data) {
return request({
url: 'MessageRechargeRecord',
method: 'post',
data: data
})
}
// 保存修改信息
export function updateCostApi(data) {
return request({
url: 'MessageCost',
method: 'put',
data: data
})
}

View File

@ -1,39 +0,0 @@
import request from '@/utils/request'
// 分页查询所有的订单信息
export function getPayListApi(query) {
return request({
url: 'api/merchantConfig/list',
method: 'get',
params: query
})
}
//
export function deletePayApi(PayId) {
return request({
url: 'api/merchantConfig/' + PayId,
method: 'delete'
})
}
//
export function savePayApi(data) {
return request({
url: 'api/merchantConfig',
method: 'post',
data: data
})
}
// 保存修改信息
export function updatePayApi(data) {
return request({
url: 'api/merchantConfig',
method: 'put',
data: data
})
}

View File

@ -1,18 +0,0 @@
import request from '@/utils/request'
//
export function addReceiptPrinting(data) {
return request({
url: 'receiptPrinting/addReceiptPrinting',
method: 'post',
data: data
})
}
export function getApi() {
return request({
url: 'receiptPrinting/queryReceiptPrintingList',
method: 'get'
})
}

View File

@ -1,45 +0,0 @@
import request from '@/utils/request'
// 分页查询所有的订单信息
export function getListApi(query) {
return request({
url: 'sysLog',
method: 'get',
params: query
})
}
// 分页查询所有的订单信息
export function getList1Api(query) {
return request({
url: 'sysLog/list',
method: 'get',
params: query
})
}
//
export function deleteApi(ids) {
return request({
url: 'sysLog?idList=' + ids,
method: 'delete'
})
}
//
export function saveApi(data) {
return request({
url: 'sysLog',
method: 'post',
data: data
})
}
// 保存修改信息
export function updateApi(data) {
return request({
url: 'sysLog',
method: 'put',
data: data
})
}

View File

@ -1,44 +0,0 @@
import request from '@/utils/request'
// 分页查询所有的订单信息
export function getNotificationlogList(query) {
return request({
url: 'sysNotificationlog/queryByPage',
method: 'get',
params: query
})
}
// 分页查询所有的订单信息
export function getSysNotifyList(query) {
return request({
url: 'sysNotify/queryByPage',
method: 'get',
params: query
})
}
export function deleteSysNotifyApi(PayId) {
return request({
url: 'sysNotificationlog/' + PayId,
method: 'delete'
})
}
//
export function saveSysNotificationApi(data) {
return request({
url: 'sysNotificationlog',
method: 'post',
data: data
})
}
// 保存修改信息
export function updateSysNotificationApi(data) {
return request({
url: 'sysNotificationlog',
method: 'put',
data: data
})
}

View File

@ -1,52 +0,0 @@
import request from '@/utils/request'
// 分页查询所有的订单信息
export function getSysNotifyList(query) {
return request({
url: 'sysNotify/queryByPage',
method: 'get',
params: query
})
}// 分页查询所有的订单信息
export function getSendNotifyApi(query) {
return request({
url: 'sysNotify/sendNotify',
method: 'get',
params: query
})
}
//
export function deleteSysNotifyApi(PayId) {
return request({
url: 'sysNotify/' + PayId,
method: 'delete'
})
}
//
export function saveSysNotifyApi(data) {
return request({
url: 'sysNotify',
method: 'post',
data: data
})
}
// 保存修改信息
export function updateSysNotifyApi(data) {
return request({
url: 'sysNotify',
method: 'put',
data: data
})
}
// 根据id查询通知信息
export function getSysNotifyInfo(id) {
return request({
url: 'sysNotify/'+id,
method: 'get',
})
}

View File

@ -151,22 +151,3 @@ export function partnerVerifyPass(data) {
data: data
})
}
// 查询部门下拉树结构
export function selectChildByDeptId(data) {
return request({
url: '/system/dept/selectChildByDeptId',
method: 'get',
params: data
})
}
// 查询用户列表
export function listUser1(query) {
return request({
url: '/backendApi/account/list',
method: 'get',
params: query
})
}

View File

@ -45,9 +45,9 @@ export function delAccount(userId) {
}
// 用户密码重置
export function resetAccountPwd(acctId, password) {
export function resetAccountPwd(userId, password) {
const data = {
acctId,
userId,
password
}
return request({

View File

@ -109,22 +109,3 @@ export function authUserSelectAll(data) {
params: data
})
}
// 查询部门下拉树结构
export function selectChildByDeptId(data) {
return request({
url: '/system/dept/selectChildByDeptId',
method: 'get',
params: data
})
}
// 查询菜单下拉树结构
export function treeselect(params) {
return request({
url: 'backendApi/source/treeselect',
method: 'get',
params: params
})
}

View File

@ -1,40 +0,0 @@
import request from '@/utils/request'
// 查询会员标签列表
export function listUserDiscount(query) {
return request({
url: '/userDiscount',
method: 'get',
params: query
})
}
// 根据id查询会员标签
export function getUserDiscount(id) {
return request({
url: '/userDiscount/'+id,
method: 'get',
})
}
// 添加会员标签
export function addUserDiscount(data) {
return request({
url: '/userDiscount',
method: 'post',
data: data
})
}
// 修改会员标签
export function editUserDiscount(data) {
return request({
url: '/userDiscount',
method: 'put',
data: data
})
}
// 删除会员标签
export function deleteUserDiscount(id) {
return request({
url: '/userDiscount/'+id,
method: 'delete',
})
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 354 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 834 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 872 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1012 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 813 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 575 B

View File

@ -98,7 +98,7 @@
border-radius: 4px;
}
.el-button--warning{
background: linear-gradient( 90deg, #fe8c4a 0%, #fe8c4a 100%) !important;
background: linear-gradient( 90deg, #409EFF 0%, #409EFF 100%) !important;
color: white !important;
border: 0px !important;
}

View File

@ -124,14 +124,3 @@
.el-pagination.is-background .el-pager li:hover{
color: #FF9655 !important;/*hover时候的文字颜色*/
}
/* 修改选中状态的背景色 */
.el-radio .el-radio__input.is-checked .el-radio__inner {
background-color: #FF9655; /* 你想要的任何颜色 */
border-color: #FF9655;
}
/* 修改选中状态的文字颜色 */
.el-radio .el-radio__input.is-checked+ .el-radio__label {
color: #FF9655 !important; /* 文字颜色 */
}

View File

@ -4,7 +4,7 @@
**/
/* theme color */
$--color-primary:#fe8c4a;
$--color-primary:#409EFF;
$--color-success: #13ce66;
$--color-warning: #ffba00;
$--color-danger: #ff4949;

View File

@ -121,7 +121,7 @@ aside {
//main-container全局样式
.app-container {
padding: 10px;
padding: 20px;
.el-form--inline .el-form-item {
margin-right: 44px;

View File

@ -2,7 +2,6 @@
#app {
.main-container {
background: #f6f8f9 !important;
min-height: 100%;
transition: margin-left .28s;
//margin-left: $base-sidebar-width;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 KiB

View File

@ -105,8 +105,6 @@ export default {
this.fileList = [];
return [];
}
},
deep: true,
immediate: true

View File

@ -83,14 +83,12 @@ export default {
})
},
initAMap() {
console.log("86",this.pform)
let _this = this;
AMapLoader.load({
key: "b5abec514cab7c71cb0572765131e6fc", // WebKey load
version: "2.0", // JSAPI 1.4.15
plugins: ["AMap.Geocoder", "AMap.AutoComplete","AMap.DistrictSearch","AMap.PlaceSearch","AMap.Autocomplete"], // 使'AMap.Scale'
}).then((AMap) => {
console.log("93")
this.map = new AMap.Map("container", {
viewMode: "2D", //3D
zoom: 17, //
@ -104,8 +102,6 @@ export default {
});
//
this.AutoComplete = new AMap.AutoComplete({ city: "全国" });
//
this.setMapMarker();
//;
this.map.on("click", (e) => {
//
@ -117,21 +113,18 @@ export default {
this.setMapMarker();
});
}).catch(() => {});
},
//
setMapMarker() {
console.log("18")
//
this.map.setFitView();
this.marker = new AMap.Marker({
map: this.map,
position: [this.form.lng, this.form.lat],
});
//
// this.toGeoCoder();
// this.map.setFitView();
this.toGeoCoder();
this.map.setFitView();
this.map.add(this.marker);
},
//

View File

@ -53,7 +53,7 @@ export default {
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
.fixed-header {
//padding-right: 17px;
padding-right: 17px;
}
}
</style>

View File

@ -2,117 +2,99 @@
<div class="navbar">
<div class="title-logo">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
@toggleClick="toggleSideBar"/>
<!-- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>-->
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
<!-- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>-->
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
<div>
{{ storeName || "百业兴智慧油站" }}欢迎您
{{storeName || "百业兴智慧油站"}}欢迎您
</div>
</div>
<div class="right-box">
<div class="d-s">
<search id="header-search" class="right-menu-item"/>
<!-- <div class="icon-img">-->
<!-- <img src="../../../src/assets/new/t-sousuo.png" alt="">-->
<!-- </div>-->
<!-- 搜索-->
<!-- </div>-->
<search id="header-search" class="right-menu-item" />
<span style="margin-right: 10px; ">搜索</span>
<div class="d-s" @click="click">
<div class="icon-img">
<img src="../../../src/assets/new/t-fangda.png" alt="">
</div>
放大
<div class="d-s" @click="click" >
<div class="icon-img">
<img src="../../../src/assets/new/t-fangda.png" alt="">
</div>
<div class="d-s" @click="goToWebsite()">
<div class="icon-img">
<img src="../../../src/assets/new/t-sjdp.png" alt="">
</div>
收银台
放大
</div>
<div class="d-s" @click="goToWebsite()" >
<div class="icon-img">
<img src="../../../src/assets/new/t-sjdp.png" alt="">
</div>
<div class="d-s" @click="prompt()">
<div class="icon-img">
<img src="../../../src/assets/new/t-syt.png" alt="">
</div>
数据大屏
收银台
</div>
<div class="d-s" @click="prompt()" >
<div class="icon-img">
<img src="../../../src/assets/new/t-syt.png" alt="">
</div>
数据大屏
</div>
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
<img :src="avatar" class="user-avatar">
<span class="j-kuang">
{{ roleName }}
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
<img :src="avatar" class="user-avatar">
<span class="j-kuang">
系统管理员
</span>
<span class="user-name">{{ name }}</span>
<i class="el-icon-caret-bottom"/>
</div>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="prsswrod()">
<span>修改密码</span>
</el-dropdown-item>
<el-dropdown-item divided @click.native="logout">
<span>退出登录</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span class="user-name">{{ name }}</span>
<i class="el-icon-caret-bottom"/>
</div>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="setting = true">
<span>布局设置</span>
</el-dropdown-item>
<el-dropdown-item divided @click.native="logout">
<span>退出登录</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</div>
<!-- 修改密码弹窗-->
<el-dialog
title="修改密码"
:visible.sync="dialogVisible"
width="30%"
:modal-append-to-body="false"
:append-to-body="true"
:before-close="handleClose">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm">
<el-form-item label="新密码" prop="password">
<el-input v-model="ruleForm.password" show-password></el-input>
</el-form-item>
<el-form-item label="重复密码" prop="passwords">
<el-input show-password v-model="ruleForm.passwords"></el-input>
</el-form-item>
<el-form-item>
<el-button @click="resetForm('ruleForm')">取消</el-button>
<el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
</el-form-item>
</el-form>
</el-dialog>
<!-- <div class="right-menu">-->
<!-- <template v-if="device!=='mobile'">-->
<!-- <span v-if="day>=0 && day<11" class="right-menu-item hover-effect" style="color: #ff1f1f; margin-right: 10px">油站有效期还剩{{day}}</span>-->
<!-- <search id="header-search" class="right-menu-item" />-->
<!-- <ScreenData class="right-menu-item hover-effect" style="font-size: 24px"></ScreenData>-->
<!-- <screenfull id="screenfull" class="right-menu-item hover-effect" />-->
<!-- <div class="right-menu">-->
<!-- <template v-if="device!=='mobile'">-->
<!-- <span v-if="day>=0 && day<11" class="right-menu-item hover-effect" style="color: #ff1f1f; margin-right: 10px">油站有效期还剩{{day}}</span>-->
<!-- <search id="header-search" class="right-menu-item" />-->
<!-- <ScreenData class="right-menu-item hover-effect" style="font-size: 24px"></ScreenData>-->
<!-- <screenfull id="screenfull" class="right-menu-item hover-effect" />-->
<!-- <div title="收银台" class="right-menu-item hover-effect " style="font-size: 24px">-->
<!-- <i class="el-icon-s-shop" @click="goToCashier()"></i>-->
<!-- </div>-->
<!-- <FuintDoc id="fuint-doc" class="right-menu-item hover-effect" />-->
<!--&lt;!&ndash; <i class="right-menu-item hover-effect el-icon-s-shop" @click="goToCashier()"></i>&ndash;&gt;-->
<!-- </template>-->
<!-- <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">-->
<!-- <div class="avatar-wrapper">-->
<!-- <img :src="avatar" class="user-avatar">-->
<!-- <span class="user-name">{{ name }}</span>-->
<!-- <i class="el-icon-caret-bottom"/>-->
<!-- </div>-->
<!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item @click.native="setting = true">-->
<!-- <span>布局设置</span>-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item divided @click.native="logout">-->
<!-- <span>退出登录</span>-->
<!-- </el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
<!-- </div>-->
<!-- <div title="收银台" class="right-menu-item hover-effect " style="font-size: 24px">-->
<!-- <i class="el-icon-s-shop" @click="goToCashier()"></i>-->
<!-- </div>-->
<!-- <FuintDoc id="fuint-doc" class="right-menu-item hover-effect" />-->
<!--&lt;!&ndash; <i class="right-menu-item hover-effect el-icon-s-shop" @click="goToCashier()"></i>&ndash;&gt;-->
<!-- </template>-->
<!-- <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">-->
<!-- <div class="avatar-wrapper">-->
<!-- <img :src="avatar" class="user-avatar">-->
<!-- <span class="user-name">{{ name }}</span>-->
<!-- <i class="el-icon-caret-bottom"/>-->
<!-- </div>-->
<!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item @click.native="setting = true">-->
<!-- <span>布局设置</span>-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item divided @click.native="logout">-->
<!-- <span>退出登录</span>-->
<!-- </el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
<!-- </div>-->
</div>
</template>
<script>
import {mapGetters} from 'vuex'
import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import TopNav from '@/components/TopNav'
import Hamburger from '@/components/Hamburger'
@ -125,49 +107,14 @@ import {getCountdownApi} from "@/api/store";
import {ljStoreInfo} from "@/api/staff/store";
import screenfull from "screenfull";
import {getToken} from "@/utils/auth";
import {getAccountInfo, resetPwd} from "@/api/indexBanner";
export default {
data() {
var validatePass = (rule, value, callback) => {
if (value === '') {
callback(new Error('请输入密码'));
} else {
if (this.ruleForm.passwords !== '') {
this.$refs.ruleForm.validateField('passwords');
}
callback();
}
};
var validatePass2 = (rule, value, callback) => {
if (value === '') {
callback(new Error('请再次输入密码'));
} else if (value !== this.ruleForm.password) {
callback(new Error('两次输入密码不一致!'));
} else {
callback();
}
};
return {
//
day: -1,
storeName: "",
isFullscreen: false,
dialogVisible: false,
accountId: "",
ruleForm: {},
rules: {
password: [
{required: true, message: '请输入新密码', trigger: 'blur'},
{min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur'},
{validator: validatePass, trigger: 'blur'}
],
passwords: [
{required: true, message: '请输入密码', trigger: 'blur'},
{min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur'},
{validator: validatePass2, trigger: 'blur'}
],
}
storeName:"",
isFullscreen: false
}
},
components: {
@ -185,8 +132,7 @@ export default {
'sidebar',
'avatar',
'name',
'device',
'roleName'
'device'
]),
setting: {
get() {
@ -210,57 +156,12 @@ export default {
this.getStore()
},
methods: {
handleClose(done) {
this.$confirm('确认关闭?')
.then(_ => {
done();
})
.catch(_ => {
});
},
prsswrod() {
this.dialogVisible = !this.dialogVisible
getAccountInfo().then(res => {
this.accountId = res.data.accountId
})
},
submitForm(formName) {
if (this.ruleForm.password !== this.ruleForm.passwords) {
this.$message({
type: 'info',
message: '两次密码不一致'
});
return
}
this.$refs[formName].validate((valid) => {
if (valid) {
let data = {
acctId: this.accountId,
password: this.ruleForm.password,
}
resetPwd(data).then(res => {
console.log(res)
if (res.code == 200) {
this.dialogVisible = false
this.$store.dispatch('LogOut').then(() => {
location.href = '/';
})
}
})
}
});
},
resetForm(formName) {
this.dialogVisible = false
this.$refs[formName].resetFields();
},
prompt() {
this.$message({message: '此功能暂未开放,敬请期待', type: 'warning'})
prompt(){
this.$message({ message: '此功能暂未开放,敬请期待', type: 'warning' })
},
goToWebsite() {
// window.open('https://cashier.youkerr.com/')
window.open(this.cashierUrl + "?token=" + getToken())
window.open(this.cashierUrl+"?token="+getToken())
this.toggleFullscreen()
},
toggleFullscreen() {
@ -288,20 +189,19 @@ export default {
this.$store.dispatch('LogOut').then(() => {
location.href = '/';
})
}).catch(() => {
});
}).catch(() => {});
},
goToCashier() {
window.open(this.cashierUrl + '#/homeindex?id=0')
window.open(this.cashierUrl+'#/homeindex?id=0')
},
getStore() {
getStore(){
ljStoreInfo().then(res => {
this.storeName = res.data.name
})
},
//
getCountdown() {
getCountdownApi().then(res => {
getCountdownApi().then(res=> {
if (res.code === 200) {
this.day = res.data
}
@ -309,7 +209,7 @@ export default {
},
click() {
if (!screenfull.isEnabled) {
this.$message({message: '你的浏览器不支持全屏', type: 'warning'})
this.$message({ message: '你的浏览器不支持全屏', type: 'warning' })
return false
}
screenfull.toggle()
@ -332,44 +232,38 @@ export default {
</script>
<style lang="scss" scoped>
.right-box {
.right-box{
display: flex;
align-items: center;
}
.d-s {
.d-s{
display: flex;
align-items: center;
margin-right: 10px;
cursor: pointer;
}
.icon-img {
.icon-img{
width: 28px;
height: 28px;
margin-right: 5px;
img {
img{
width: 100%;
height: 100%;
}
}
.avatar-wrapper {
img {
.avatar-wrapper{
img{
width: 28px;
height: 28px;
margin-right: 10px;
}
display: flex;
align-items: center;
}
.j-kuang {
.j-kuang{
box-sizing: border-box;
padding: 2px 2px;
font-weight: 400;
@ -379,7 +273,6 @@ export default {
border-radius: 2px 2px 2px 2px;
margin-right: 10px;
}
.navbar {
height: 60px;
overflow: hidden;
@ -396,21 +289,19 @@ export default {
align-items: center;
justify-content: space-between;
position: relative;
.hamburger-container {
line-height: 46px;
height: 100%;
float: left;
cursor: pointer;
transition: background .3s;
-webkit-tap-highlight-color: transparent;
-webkit-tap-highlight-color:transparent;
&:hover {
background: rgba(0, 0, 0, .025)
}
}
.title-logo {
.title-logo{
//position: absolute;
//top: 50%; /* 50% */
//left: 50%; /* 50% */

View File

@ -2,9 +2,7 @@
<div v-if="!item.hidden">
<template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
<app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path, onlyOneChild.query)">
<el-menu-item v-if="!isCollapse" :index="resolvePath(onlyOneChild.path)"
ref="menu"
@open="handleOpen" style="padding-left: 20px;height: 48px" :class="{'submenu-title-noDropdown':!isNest}">
<el-menu-item v-if="!isCollapse" :index="resolvePath(onlyOneChild.path)" style="padding-left: 20px;height: 48px" :class="{'submenu-title-noDropdown':!isNest}">
<!-- <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />-->
<span style="margin-left: 30px" v-if="onlyOneChild.meta.title!='系统首页'">{{onlyOneChild.meta.title}}</span>
<div v-else style="background-color: white;width: 200px;height: 100%;position: fixed;left: 0px">
@ -13,9 +11,7 @@
<span>{{onlyOneChild.meta.title}}</span>
</div>
</el-menu-item>
<el-menu-item v-if="isCollapse" :index="resolvePath(onlyOneChild.path)"
ref="menu"
@open="handleOpen" style="padding-left: 20px;height: 60px" :class="{'submenu-title-noDropdown':!isNest}">
<el-menu-item v-if="isCollapse" :index="resolvePath(onlyOneChild.path)" style="padding-left: 20px;height: 60px" :class="{'submenu-title-noDropdown':!isNest}">
<!-- <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />-->
<span style="margin-left: 30px" v-if="onlyOneChild.meta.title!='系统首页'">{{onlyOneChild.meta.title}}</span>
<div v-else style="background-color: white;width: 70px;height: 100%;position: fixed;left: 0px;text-align: center">
@ -27,8 +23,7 @@
</app-link>
</template>
<el-submenu v-else ref="subMenu" :style="{'height':isCollapse ? '60px':''}"
@open="handleOpen" :index="resolvePath(item.path)" popper-append-to-body >
<el-submenu v-else ref="subMenu" :style="{'height':isCollapse ? '60px':''}" :index="resolvePath(item.path)" popper-append-to-body >
<template slot="title">
<div v-if="!isCollapse" >
<!-- <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />-->
@ -40,7 +35,7 @@
<img src="@/assets/menu_icon/caiwu.png" v-if="!activeMenu.includes('/financialStatement')" style="width: 25px;height: 25px;"/>
<img src="@/assets/menu_icon/caiwu_b.png" v-else style="width: 25px;height: 25px;"/>
</span>
<span style="margin-right: 10px;" v-if="item.meta.title=='油站设置'">
<span style="margin-right: 10px;" v-if="item.meta.title=='门店管理'">
<img src="@/assets/menu_icon/shouye.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/staff') && !activeMenu.includes('/feedBack') && !activeMenu.includes('/duty')" style="width: 21px;height: 21px;"/>
<img src="@/assets/menu_icon/shouye_b.png" v-else style="width: 21px;height: 21px;"/>
</span>
@ -56,7 +51,7 @@
<img src="@/assets/menu_icon/youqiang.png" v-if="!activeMenu.includes(item.path)" style="width: 21px;height: 21px;"/>
<img src="@/assets/menu_icon/youqiang_b.png" v-else style="width: 21px;height: 21px;"/>
</span>
<span style="margin-right: 10px;" v-if="item.meta.title=='便利店管理'">
<span style="margin-right: 10px;" v-if="item.meta.title=='便利店'">
<img src="@/assets/menu_icon/car.png" v-if="!activeMenu.includes('/convenience')" style="width: 21px;height: 21px;"/>
<img src="@/assets/menu_icon/car_b.png" v-else style="width: 21px;height: 21px;"/>
</span>
@ -89,7 +84,7 @@
<img src="@/assets/menu_icon/caiwu1.png" v-if="!activeMenu.includes('/financialStatement')" style="width: 25px;height: 25px;"/>
<img src="@/assets/menu_icon/caiwu1_b.png" v-else style="width: 25px;height: 25px;"/>
</span>
<span style="margin-right: 10px;" v-if="item.meta.title=='油站设置'">
<span style="margin-right: 10px;" v-if="item.meta.title=='门店管理'">
<img src="@/assets/menu_icon/shouye.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/staff') && !activeMenu.includes('/feedBack') && !activeMenu.includes('/duty')" style="width: 25px;height: 25px;"/>
<img src="@/assets/menu_icon/shouye_b.png" v-else style="width: 25px;height: 25px;"/>
</span>
@ -105,7 +100,7 @@
<img src="@/assets/menu_icon/chedui.png" v-if="!activeMenu.includes('/fleet')" style="width: 21px;height: 21px;"/>
<img src="@/assets/menu_icon/chedui_b.png" v-else style="width: 21px;height: 21px;"/>
</span>
<span style="margin-right: 10px;" v-if="item.meta.title=='便利店管理'">
<span style="margin-right: 10px;" v-if="item.meta.title=='便利店'">
<img src="@/assets/menu_icon/car.png" v-if="!activeMenu.includes('/convenience')" style="width: 25px;height: 25px;"/>
<img src="@/assets/menu_icon/car_b.png" v-else style="width: 25px;height: 25px;"/>
</span>
@ -179,23 +174,10 @@ export default {
data() {
this.onlyOneChild = null
return {
defaultActive:"",
keyIndex: 0
}
},
watch:{
$route () {
//
if (this.$route.path == '/index') {
this.$refs.menu.close(this.keyIndex);
this.$refs.subMenu.close(this.keyIndex);
}
defaultActive:""
}
},
methods: {
handleOpen(key) {
this.keyIndex = key;
},
hasOneShowingChild(children = [], parent) {
if (!children) {
children = [];

View File

@ -2,11 +2,11 @@
<div :class="{'has-logo':showLogo}"
:style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground},
{width: isCollapse ? '70px !important' : '200px !important' }">
<logo v-if="showLogo" :collapse="isCollapse"/>
<!-- <div class="store-info" v-if="storeName">-->
<!-- <div class="name">{{ storeName }}</div>-->
<!-- <div class="role" v-if="role">{{ role }}</div>-->
<!-- </div>-->
<logo v-if="showLogo" :collapse="isCollapse" />
<!-- <div class="store-info" v-if="storeName">-->
<!-- <div class="name">{{ storeName }}</div>-->
<!-- <div class="role" v-if="role">{{ role }}</div>-->
<!-- </div>-->
<el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
<div v-if="isCollapse" style="width: 70px;">
<el-menu
@ -19,8 +19,6 @@
:collapse-transition="false"
style="margin-bottom: 80px;height: 60px"
mode="vertical"
ref="menu"
@open="handleOpen"
>
<sidebar-item
v-for="(route, index) in sidebarRouters"
@ -43,8 +41,6 @@
:collapse-transition="false"
style="margin-bottom: 80px;height: 48px"
mode="vertical"
ref="menu"
@open="handleOpen"
>
<sidebar-item
v-for="(route, index) in sidebarRouters"
@ -60,19 +56,19 @@
</template>
<script>
import {mapGetters, mapState} from "vuex";
import { mapGetters, mapState } from "vuex";
import Logo from "./Logo";
import SidebarItem from "./SidebarItem";
import variables from "@/assets/styles/variables.scss";
export default {
components: {SidebarItem, Logo},
components: { SidebarItem, Logo },
computed: {
...mapState(["settings"]),
...mapGetters(["sidebarRouters", "sidebar"]),
activeMenu() {
const route = this.$route;
const {meta, path} = route;
const { meta, path } = route;
// if set path, the sidebar will highlight the path you set
if (meta.activeMenu) {
return meta.activeMenu;
@ -86,10 +82,10 @@ export default {
return variables;
},
isCollapse() {
if (!this.sidebar.opened) {
if (!this.sidebar.opened){
document.documentElement.style.setProperty('--sidebar-width', '70px');
document.documentElement.style.setProperty('--sidebar-height', '60px');
} else {
}else {
document.documentElement.style.setProperty('--sidebar-width', '200px');
document.documentElement.style.setProperty('--sidebar-height', '48px');
}
@ -113,28 +109,8 @@ export default {
return '商户管理员';
}
}
},
data() {
return {
keyIndex: 0
}
},
watch:{
$route () {
//
if (this.$route.path == '/index') {
this.$refs.menu.close(this.keyIndex);
}
}
},
methods: {
handleOpen(key) {
this.keyIndex = key;
}
}
}
};
</script>
<style lang="scss" scoped>
@ -151,7 +127,6 @@ export default {
border-radius: 8px;
margin: 0px 6px 10px 6px;
cursor: pointer;
.name {
font-weight: bold;
font-size: 14px;
@ -159,7 +134,6 @@ export default {
text-align: center;
overflow: hidden;
}
.role {
font-size: 10px;
margin-top: 3px;

View File

@ -82,8 +82,8 @@ export default {
activeStyle(tag) {
if (!this.isActive(tag)) return {};
return {
"background-color": '#fe8c4a',
"border-color": '#fe8c4a',
"background-color": '#409EFF',
"border-color": '#409EFF',
};
},
isAffix(tag) {

View File

@ -14,12 +14,14 @@
</div>
</div>
</template>
<script>
import RightPanel from '@/components/RightPanel'
import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
import ResizeMixin from './mixin/ResizeHandler'
import { mapState } from 'vuex'
import variables from '@/assets/styles/variables.scss'
export default {
name: 'Layout',
components: {

View File

@ -55,12 +55,12 @@ Vue.prototype.getName = getName
Vue.prototype.download = download
Vue.prototype.handleTree = handleTree
Vue.prototype.imgurl = 'http://192.168.0.138:8008'
// Vue.prototype.pcUrl = 'http://127.0.0.1:83/'
// Vue.prototype.cashierUrl = 'http://127.0.0.1:84/homeindex' // 收银台
// Vue.prototype.pcUrl = 'http://127.0.0.1:83/#/homeindex' // 收银台
// Vue.prototype.ztUrl = 'http://127.0.0.1:82/' // 中台
// Vue.prototype.pcUrl = 'http://192.168.0.178:83/'
// Vue.prototype.cashierUrl = 'http://192.168.31.178:84/homeindex' // 收银台
// Vue.prototype.pcUrl = 'http://192.168.31.178:83/#/homeindex' // 收银台
// Vue.prototype.ztUrl = 'http://192.168.31.178:82/' // 中台
Vue.prototype.cashierUrl = 'https://cashier.youkerr.com/homeindex' // 收银台
Vue.prototype.caUrl = 'http://127.0.0.1:83/' // 收银台校色跳转链接
Vue.prototype.caUrl = 'http://192.168.31.178:83/' // 收银台校色跳转链接
Vue.prototype.pcUrl = 'https://www.youkerr.com/' // 收银台
Vue.prototype.ztUrl = 'https://oil.youkerr.com/' // 中台
const Collapse= false

View File

@ -92,8 +92,6 @@ export const constantRoutes = [
name: 'resourceOilstore',
meta: { title: '系统首页1', icon: 'dashboard', affix: true }
},
// {
// path: 'resource_oilstore',
// component: () => import('@/views/index'),
@ -108,12 +106,6 @@ export const constantRoutes = [
name: 'resource_oilstore',
meta: { title: '系统首页', icon: 'dashboard', affix: true }
},
// {
// path: '/shopowner',
// component: () => import('@/views/shopowner'),
// name: 'shopowner',
// meta: { title: '系统新首页', icon: 'dashboard', affix: true }
// },
{
path: '/account',
component: Layout,

View File

@ -7,7 +7,6 @@ const getters = {
token: state => state.user.token,
avatar: state => state.user.avatar,
name: state => state.user.name,
roleName: state => state.user.roleName,
introduction: state => state.user.introduction,
roles: state => state.user.roles,
permissions: state => state.user.permissions,

View File

@ -22,9 +22,6 @@ const user = {
SET_NAME: (state, name) => {
state.name = name
},
SET_ROLE_NAME: (state, roleName) => {
state.roleName = roleName
},
SET_AVATAR: (state, avatar) => {
state.avatar = avatar
},
@ -108,7 +105,7 @@ const user = {
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
getInfo().then(res => {
console.log("22222223",res.data.accountInfo)
console.log("22222223")
const user = res.data.accountInfo
const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/avatar.png") : process.env.VUE_APP_BASE_API + user.avatar;
@ -119,7 +116,6 @@ const user = {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_NAME', user.accountName)
commit('SET_ROLE_NAME', user.roleName)
commit('SET_AVATAR', avatar)
commit('SET_MERCHANT_ID', user.merchantId)
commit('SET_MERCHANT_NAME', user.merchantName)

Some files were not shown because too many files have changed in this diff Show More