diff --git a/apis/index.js b/apis/index.js
index e7f07d3..31d09ea 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -10,7 +10,7 @@ import router from '../router'
// 基础配置
const config = {
apiUrl : 'https://api.gongli.vip/api/', // 正式环境
- // apiUrl: 'http://api.gl.shangkelian.cn/api/', // 测试
+ apiUrl: 'http://api.gl.shangkelian.cn/api/', // 测试
timeout: 60000
}
diff --git a/apis/interfaces/pay.js b/apis/interfaces/pay.js
index e6716a9..888a86e 100644
--- a/apis/interfaces/pay.js
+++ b/apis/interfaces/pay.js
@@ -55,7 +55,28 @@ const collagePAY = (orderNo,password) => {
})
}
+// 河马支付
+const hmPay = (orderID) => {
+ return request({
+ url : 'user/transaction/recharge/payment/hema',
+ data : {
+ order_id: orderID
+ },
+ method : 'POST'
+ })
+}
+// 河马付支付结果查询
+const hmState = (type, id) => {
+ return request({
+ url : 'hema/affirm',
+ method : 'POST',
+ data : {
+ type,
+ id
+ }
+ })
+}
export {
wxPAY,
@@ -63,4 +84,6 @@ export {
dtPAY,
payIndex,
collagePAY,
+ hmPay,
+ hmState
}
diff --git a/apis/interfaces/vip.js b/apis/interfaces/vip.js
index e360612..85b191a 100644
--- a/apis/interfaces/vip.js
+++ b/apis/interfaces/vip.js
@@ -59,6 +59,12 @@ const shopVipWeChat = (id) => {
})
}
+// 河马付
+const vipHmPay = (orderId) => {
+ return request({
+ url: 'user/identities/pay/' + orderId + '/hema'
+ })
+}
export {
vip,
@@ -67,5 +73,6 @@ export {
agreement,
shopVipInfo,
shopVipCreate,
- shopVipWeChat
+ shopVipWeChat,
+ vipHmPay
}
diff --git a/manifest.json b/manifest.json
index 7006ac6..c84d892 100644
--- a/manifest.json
+++ b/manifest.json
@@ -89,7 +89,7 @@
"payment" : {
"weixin" : {
"__platform__" : [ "android" ],
- "appid" : "wx466a4663da346e09",
+ "appid" : "wx10517aabd260b79e",
"UniversalLinks" : ""
},
"alipay" : {
@@ -98,7 +98,7 @@
},
"share" : {
"weixin" : {
- "appid" : "wx466a4663da346e09",
+ "appid" : "wx10517aabd260b79e",
"UniversalLinks" : ""
}
},
@@ -152,7 +152,22 @@
"androidStyle" : "common"
}
},
- "nativePlugins" : {},
+ "nativePlugins" : {
+ "TestModule" : {
+ "__plugin_info__" : {
+ "name" : "河马支付",
+ "description" : "河马支付",
+ "platforms" : "Android",
+ "url" : "",
+ "android_package_name" : "",
+ "ios_bundle_id" : "",
+ "isCloud" : false,
+ "bought" : -1,
+ "pid" : "",
+ "parameters" : {}
+ }
+ }
+ },
"uniStatistics" : {
"enable" : true
}
diff --git a/nativeplugins/TestModule/android/uniplugin_module-release.aar b/nativeplugins/TestModule/android/uniplugin_module-release.aar
new file mode 100644
index 0000000..4ec6ba5
Binary files /dev/null and b/nativeplugins/TestModule/android/uniplugin_module-release.aar differ
diff --git a/nativeplugins/TestModule/package.json b/nativeplugins/TestModule/package.json
new file mode 100644
index 0000000..fed23de
--- /dev/null
+++ b/nativeplugins/TestModule/package.json
@@ -0,0 +1,20 @@
+{
+ "name": "河马支付",
+ "id": "TestModule",
+ "version": "1.0.0",
+ "description": "河马支付",
+ "_dp_type":"nativeplugin",
+ "_dp_nativeplugin":{
+ "android": {
+ "plugins": [
+ {
+ "type": "module",
+ "name": "TestModule",
+ "class": "io.dcloud.uniplugin.AppModule"
+ }
+ ],
+ "integrateType": "aar"
+ }
+ }
+}
+
diff --git a/pages.json b/pages.json
index 1f41e9d..9b7e7bb 100644
--- a/pages.json
+++ b/pages.json
@@ -628,7 +628,15 @@
"enablePullDownRefresh": false
}
- }
+ },{
+ "path": "pages/account/hmState",
+ "name": "hmState",
+ "style": {
+ "navigationBarTitleText": "支付结果",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }
],
"tabBar": {
"borderStyle": "white",
diff --git a/pages/account/dt.vue b/pages/account/dt.vue
index f7bccdb..1eca88a 100644
--- a/pages/account/dt.vue
+++ b/pages/account/dt.vue
@@ -15,7 +15,7 @@
{{frozenScore || '0.0000'}}
-
+
@@ -85,6 +85,9 @@
},
methods: {
dtSelect(type){
+ this.onTransfer('AccountRecharge');
+ return
+ // 充值选项
switch(type){
case 'wchat':
this.onTransfer('AccountRecharge');
diff --git a/pages/account/hmState.vue b/pages/account/hmState.vue
new file mode 100644
index 0000000..c5bd30b
--- /dev/null
+++ b/pages/account/hmState.vue
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+ 已等待{{time}}秒
+ 查询支付结果中,请耐心等待...
+
+
+
+
+
+ 支付成功
+ {{remove}}
+
+
+
+
+ {{code === 0 ? '查询失败' : '订单不存在'}}
+ {{code === 0 ? '暂未查询到您的支付信息,如支付成功未到账请联系管理员': '暂未查询到您的订单信息'}}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/account/recharge.vue b/pages/account/recharge.vue
index 881d54d..7c91ba0 100644
--- a/pages/account/recharge.vue
+++ b/pages/account/recharge.vue
@@ -24,20 +24,36 @@
- 提示:暂时仅支持使用微信支付充值
+ 提示:暂时仅支持使用支付宝支付充值