diff --git a/app.js b/app.js
index 4d26e1f..371edf6 100644
--- a/app.js
+++ b/app.js
@@ -1,14 +1,32 @@
import { checkUpgrade, getConfigByEnv } from "./utils/index"
+function share() {
+ wx.onAppRoute(function(res) {
+ const pages = getCurrentPages()
+ const view = pages[pages.length - 1];
+ if (view) {
+ wx.showShareMenu()
+ }
+ })
+}
+
// app.js
App({
onShow() {
checkUpgrade();
},
onLaunch() {
+ // wx.showShareMenu()
+ // share()
const { api } = getConfigByEnv();
this.globalData = { ...this.globalData, api, }
},
+ // onShareAppMessage:function(){
+ // wx.showShareMenu({
+ // withShareTicket:true,
+ // menu:['shareAppMessage','shareTimeline']
+ // })
+ // },
globalData: {
primaryColor: '#52c41a'
}
diff --git a/assets/images/baike.png b/assets/images/baike.png
index 62ac6d6..b82e5b6 100644
Binary files a/assets/images/baike.png and b/assets/images/baike.png differ
diff --git a/assets/images/finance.png b/assets/images/finance.png
index c6d5b0f..653aaa1 100644
Binary files a/assets/images/finance.png and b/assets/images/finance.png differ
diff --git a/assets/images/law.png b/assets/images/law.png
index 62ee7f9..ca9bed4 100644
Binary files a/assets/images/law.png and b/assets/images/law.png differ
diff --git a/components/aid/index.wxml b/components/aid/index.wxml
index 3d3bf5a..6b74870 100644
--- a/components/aid/index.wxml
+++ b/components/aid/index.wxml
@@ -17,9 +17,11 @@
{{ item.level }}
{{item.synopsis}}{{item.synopsis}} {{item.synopsis}}
-
-
- 在线咨询
+
+
+
+ 在线咨询
+
diff --git a/components/searchSelect/index.js b/components/searchSelect/index.js
index 0aed2d8..68ec3a5 100644
--- a/components/searchSelect/index.js
+++ b/components/searchSelect/index.js
@@ -1,4 +1,4 @@
-import { getParkList } from "../../service/park"
+import { getLoginParkList } from "../../service/park"
import { getParkSimpleMeterList } from "../../service/meter"
import { alertInfo } from "../../utils/index";
import request from "../../utils/request"
@@ -93,7 +93,7 @@ Component({
},
async onSearchPark() {
const { searchText = "" } = this.data;
- const { code, message, data: parks = [] } = await getParkList({keyword: searchText});
+ const { code, message, data: parks = [] } = await getLoginParkList({keyword: searchText});
if (code !== OK) {
alertInfo(message)
return
@@ -123,7 +123,7 @@ Component({
return
}
this.setData({
- columns: data?.map(item => item?.name),
+ columns: data?.map(item => item?.shortName),
list: data,
})
},
diff --git a/pages/handleLogin/index.wxml b/pages/handleLogin/index.wxml
index 01adc43..533f5d9 100644
--- a/pages/handleLogin/index.wxml
+++ b/pages/handleLogin/index.wxml
@@ -35,7 +35,7 @@
-
-
- 财税援助
-
+
法律援助
+
+
+ 财税援助
+
{{ item.tenement.shortName }}
{{ item.address }}
- {{ item.amount }}
+ {{ item.money }}
拉闸
diff --git a/utils/index.js b/utils/index.js
index 26de1e0..f023485 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -45,9 +45,9 @@ export function getConfigByEnv() {
switch (envVersion) {
// 开发版
case 'develop':
- api = "http://localhost:8000"
- // api = "https://zgd.hbhcbn.com/api3"
+ // api = "http://localhost:8000"
// api = "https://zgd.hbhcbn.com/api3"
+ api = "https://zgd.hbhcbn.com/api3"
// api = "https://zgd.hbhcbn.com/wxApi"
// api = "http://127.0.0.1:4523/m1/4143821-0-default"
break;
diff --git a/utils/request.js b/utils/request.js
index a6434d0..11b7f50 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -84,7 +84,7 @@ const parseResponse = function (response, url) {
}
const { statusCode } = response;
if (!statusCode) {
- alertError("服务异常")
+ alertError("服务错误")
return
}
console.log('url', url,'statusCode', statusCode, 'response.data', response?.data)