From 907ec8bf7687f8feaf4efbad3c98c585c31fc0e8 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 21 八月 2025 10:53:23 +0800
Subject: [PATCH] 优化
---
/dev/null | 10 ---
admin/src/components/business/OperaCategoryWindow.vue | 3
admin/src/views/business/member.vue | 15 ++++
.idea/jarRepositories.xml | 5 +
.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml | 20 ++++++
small-program/App.vue | 3
admin/src/components/business/OperaMemberDetailWindow.vue | 2
admin/src/views/business/orders.vue | 26 +++++++-
server/services/src/main/resources/application-dev.yml | 17 +----
.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml | 20 ++++++
server/admin/src/main/java/com/doumee/api/business/OrdersController.java | 1
admin/src/views/business/categoryFee.vue | 4
12 files changed, 90 insertions(+), 36 deletions(-)
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 5a2f139..8a9daaf 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -7,6 +7,11 @@
<option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
</remote-repository>
<remote-repository>
+ <option name="id" value="nexus" />
+ <option name="name" value="Nexus" />
+ <option name="url" value="http://47.97.118.181:8089/nexus/content/groups/public/" />
+ </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" />
diff --git a/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_12.xml b/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_12.xml
deleted file mode 100644
index b8af198..0000000
--- a/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_12.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: com.github.wechatpay-apiv3:wechatpay-java:0.2.12">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.12/wechatpay-java-0.2.12.jar!/" />
- </CLASSES>
- <SOURCES>
- <root url="jar://$PROJECT_DIR$/../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.12/wechatpay-java-0.2.12-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml b/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml
new file mode 100644
index 0000000..c3cb5b4
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml
@@ -0,0 +1,20 @@
+<component name="libraryTable">
+ <library name="Maven: com.github.wechatpay-apiv3:wechatpay-java:0.2.15">
+ <CLASSES>
+<<<<<<< HEAD:.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_12.xml
+ <root url="jar://$PROJECT_DIR$/../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.12/wechatpay-java-0.2.12.jar!/" />
+ </CLASSES>
+ <SOURCES>
+ <root url="jar://$PROJECT_DIR$/../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.12/wechatpay-java-0.2.12-sources.jar!/" />
+=======
+ <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.15/wechatpay-java-0.2.15.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.15/wechatpay-java-0.2.15-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.15/wechatpay-java-0.2.15-sources.jar!/" />
+>>>>>>> 6f806bd04000f63bdb165abe749c08e21210762c:.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_12.xml b/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_12.xml
deleted file mode 100644
index be5b957..0000000
--- a/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_12.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: com.github.wechatpay-apiv3:wechatpay-java-core:0.2.12">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.12/wechatpay-java-core-0.2.12.jar!/" />
- </CLASSES>
- <SOURCES>
- <root url="jar://$PROJECT_DIR$/../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.12/wechatpay-java-core-0.2.12-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml b/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml
new file mode 100644
index 0000000..7445cd0
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml
@@ -0,0 +1,20 @@
+<component name="libraryTable">
+ <library name="Maven: com.github.wechatpay-apiv3:wechatpay-java-core:0.2.15">
+ <CLASSES>
+<<<<<<< HEAD:.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_12.xml
+ <root url="jar://$PROJECT_DIR$/../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.12/wechatpay-java-core-0.2.12.jar!/" />
+ </CLASSES>
+ <SOURCES>
+ <root url="jar://$PROJECT_DIR$/../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.12/wechatpay-java-core-0.2.12-sources.jar!/" />
+=======
+ <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.15/wechatpay-java-core-0.2.15.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.15/wechatpay-java-core-0.2.15-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.15/wechatpay-java-core-0.2.15-sources.jar!/" />
+>>>>>>> 6f806bd04000f63bdb165abe749c08e21210762c:.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/admin/src/components/business/OperaCategoryWindow.vue b/admin/src/components/business/OperaCategoryWindow.vue
index 6eabf8c..326f991 100644
--- a/admin/src/components/business/OperaCategoryWindow.vue
+++ b/admin/src/components/business/OperaCategoryWindow.vue
@@ -72,7 +72,7 @@
sortnum: null,
name: '',
type: null,
- detail:null,
+ detail: null,
remark: null,
detailList: [''],
icon: '',
@@ -115,6 +115,7 @@
name: '',
detail: null,
type: type,
+ remark: null,
detailList: [''],
icon: '',
iconFull: '',
diff --git a/admin/src/components/business/OperaMemberDetailWindow.vue b/admin/src/components/business/OperaMemberDetailWindow.vue
index 5f2867e..e253099 100644
--- a/admin/src/components/business/OperaMemberDetailWindow.vue
+++ b/admin/src/components/business/OperaMemberDetailWindow.vue
@@ -211,7 +211,7 @@
total: 0,
tableData: {},
tableData1: {},
- tableData2:[],
+ tableData2: [],
page0: 1,
page1: 1,
loading: false,
diff --git a/admin/src/views/business/categoryFee.vue b/admin/src/views/business/categoryFee.vue
index 9817526..8e5631d 100644
--- a/admin/src/views/business/categoryFee.vue
+++ b/admin/src/views/business/categoryFee.vue
@@ -2,7 +2,7 @@
<TableLayout :permissions="['business:category:query']">
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:category:create', 'business:category:delete']">
- <li><el-button type="primary" @click="$refs.operaCategoryWindow.open('鏂板缓椁愭爣閰嶇疆',null,searchForm.type)" icon="el-icon-plus" v-permissions="['business:category:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaCategoryWindow.open('鏂板缓鎵嬬画璐归厤缃�',null,searchForm.type)" icon="el-icon-plus" v-permissions="['business:category:create']">鏂板缓</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:category:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
@@ -42,7 +42,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaCategoryWindow.open('缂栬緫椁愭爣閰嶇疆', row,searchForm.type)" icon="el-icon-edit" v-permissions="['business:category:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.operaCategoryWindow.open('缂栬緫鎵嬬画璐归厤缃�', row,searchForm.type)" icon="el-icon-edit" v-permissions="['business:category:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:category:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
diff --git a/admin/src/views/business/member.vue b/admin/src/views/business/member.vue
index 44d5d41..1caeacf 100644
--- a/admin/src/views/business/member.vue
+++ b/admin/src/views/business/member.vue
@@ -66,7 +66,7 @@
<el-table-column prop="createTime" label="娉ㄥ唽鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="autoReciveStatus" label="鎺ュ彈鑷姩娲惧崟" min-width="100px">
<template slot-scope="{row}">
- {{row.autoReciveStatus ==1?"鏄�":"鍚�"}}
+ {{row.autoReceiveStatus ==1?"鏄�":"鍚�"}}
</template>
</el-table-column>
<!-- <el-table-column label="鐘舵��">
@@ -110,7 +110,7 @@
export default {
name: 'Member',
extends: BaseTable,
- components: { TableLayout, Pagination,OperaMemberDetailWindow, OperaMemberWindow },
+ components: { TableLayout, Pagination, OperaMemberDetailWindow, OperaMemberWindow },
data () {
return {
// 鎼滅储
@@ -134,6 +134,17 @@
this.search()
},
methods: {
+ reset () {
+ this.searchForm = {
+ type: 0,
+ startTime: '',
+ endTime: '',
+ telephone: '',
+ name: '',
+ status: ''
+ }
+ this.search()
+ },
openDetail (row) {
this.$refs.OperaMemberDetailWindow.open('鐢ㄦ埛璇︽儏', row.id)
},
diff --git a/admin/src/views/business/orders.vue b/admin/src/views/business/orders.vue
index d984741..037ccd1 100644
--- a/admin/src/views/business/orders.vue
+++ b/admin/src/views/business/orders.vue
@@ -3,13 +3,13 @@
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="璁㈠崟鍙�" prop="releaseMemberId">
- <el-input v-model="searchForm.code" style="width: 120px" placeholder="璇疯緭鍏ヨ鍗曞彿" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.code" style="width: 120px" clearable placeholder="璇疯緭鍏ヨ鍗曞彿" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鎺ュ崟鏂�" prop="acceptName">
- <el-input v-model="searchForm.acceptName" style="width: 120px" placeholder="璇疯緭鍏ユ帴鍗曟柟" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.acceptName" style="width: 120px" clearable placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鍙戝崟鏂�" prop="releaseName">
- <el-input v-model="searchForm.releaseName" style="width: 120px" placeholder="璇疯緭鍏ュ彂鍗曟柟" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.releaseName" style="width: 120px" clearable placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="璁㈠崟绫诲瀷" prop="type">
<el-select v-model="searchForm.type" style="width: 120px" @keypress.enter.native="search" clearable placeholder="璁㈠崟绫诲瀷">
@@ -19,7 +19,7 @@
</el-select>
</el-form-item>
<el-form-item label="璁㈠崟鐘舵��" prop="status">
- <el-select v-model="searchForm.status" style="width: 120px" @keypress.enter.native="search" clearable placeholder="鐘舵��">
+ <el-select v-model="searchForm.status" style="width: 100px" @keypress.enter.native="search" clearable placeholder="鐘舵��">
<el-option label="寰呮敮浠�" :value="0"></el-option>
<el-option label="寰呮帴鍗�" :value="1"></el-option>
<el-option label="宸叉帴鍗�" :value="2"></el-option>
@@ -179,6 +179,22 @@
})
this.search()
},
+ reset () {
+ this.searchForm = {
+ acceptName: null,
+ releaseName: null,
+ type: null,
+ createTimeEnd: null,
+ createTimeStart: null,
+ acceptTimeStart: null,
+ acceptTimeEnd: null,
+ doneTimeStart: null,
+ doneTimeEnd: null,
+ status: null,
+ code: null
+ }
+ this.search()
+ },
methods: {
openDetail (row) {
this.$refs.OperaOrderDetailWindow.open('璁㈠崟璇︽儏', row )
@@ -198,7 +214,7 @@
.finally(() => {
this.dealing = false
})
- })
+ })
}
}
}
diff --git a/server/admin/src/main/java/com/doumee/api/business/OrdersController.java b/server/admin/src/main/java/com/doumee/api/business/OrdersController.java
index def6ed5..739bd96 100644
--- a/server/admin/src/main/java/com/doumee/api/business/OrdersController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/OrdersController.java
@@ -101,5 +101,4 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
-
}
diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index c2f5827..8467933 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -7,7 +7,7 @@
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
redis:
- # database: 0
+ # database: 0
host: 127.0.0.1
port: 6379
password:
@@ -47,7 +47,6 @@
required: true
debug_model: true
-
# Swagger閰嶇疆
swagger:
host:
@@ -59,8 +58,6 @@
enable-encrypt: true
# 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
redirect-uri: /
-
-
des_pwd: 123456SDFKDJF
knife4j:
enable: true
@@ -68,10 +65,8 @@
enable: true
username: admin
password: 111111
-
qiwei:
serviceurl: https://qyapi.weixin.qq.com
-
aes:
encrypt:
open: true # 鏄惁寮�鍚姞瀵� true or false
@@ -79,7 +74,6 @@
publicKey: mN4Yn8Or8r7SH1w3 # AES瀵嗛挜
privateKey: # RSA绉侀挜
time: 600000
-
########################寰俊鏀粯鐩稿叧閰嶇疆########################
wx:
pay:
@@ -91,15 +85,14 @@
mchKey: W97N53Q71326D6JZ2E9HY5M4VT4BAC8S
notifyUrl: http://xiaopiqiu2.natapp1.cc/web/wxPayNotify
refundNotifyUrl: http://xiaopiqiu2.natapp1.cc/web/wxRefundNotify
-# notifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxPayNotify
-# refundNotifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxRefundNotify
+ #notifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxPayNotify
+ #refundNotifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxRefundNotify
#keyPath: /usr/local/aliConfig/bike/apiclient_cert.p12
#privateCertPath: /usr/local/aliConfig/bike/apiclient_cert.pem
#privateKeyPath: /usr/local/aliConfig/bike/apiclient_key.pem
keyPath: d://apiclient_cert.p12
privateCertPath: d://apiclient_cert.pem
privateKeyPath: d://apiclient_key.pem
-
#鍟嗘埛淇℃伅
wechatSerialNumer: 3C9A32FB6CD453FAAAF97F9737ECAEA9D6625727
@@ -110,7 +103,6 @@
wechatNotifyUrl: http://xiaopiqiu2.natapp1.cc/web/wechat/transferNotify #鍟嗘埛杞处鍥炶皟鍦板潃
#wechatApiV3Key: V4PRKUBTK2BKNKJAD9NSI9YFG2Q0EOT1 #鍟嗘埛APIV3Key
-
#鏈嶅姟鍟�-------------end---
existsSub: 1
appSecret: 1ceb7c9dff3c4330d653adc3ca55ea24
@@ -120,9 +112,8 @@
subMchId: 1661772003
subMchKey: EVM8E15TKXE0OEMJFC0V6UFVIOZ5CSQS
#瀛愬晢鎴�------------end----
- # mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
+ #mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
typeId: gybike
-
upload:
type: ftp
diff --git a/small-program/App.vue b/small-program/App.vue
index 9bfe61a..01f3c1e 100644
--- a/small-program/App.vue
+++ b/small-program/App.vue
@@ -4,7 +4,8 @@
computed: {
...mapState(['userInfo','openid'])
},
- onLaunch: function() {
+ onLaunch: function() {
+ console.log(ua)
var that = this;
if (!this.openid || this.openid =='') {
uni.login({
--
Gitblit v1.9.3