diff --git a/app.json b/app.json index 295acc2..d99e9d4 100644 --- a/app.json +++ b/app.json @@ -21,7 +21,7 @@ "window": { "backgroundTextStyle": "light", "navigationStyle": "custom", - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#fff", "navigationBarTitleText": "农燊高科", "navigationBarTextStyle": "black" diff --git a/env/env.js b/env/env.js index d406330..45a8b43 100644 --- a/env/env.js +++ b/env/env.js @@ -1,14 +1,18 @@ module.exports = { DEV: { - URL_PREFIX: 'http://192.168.31.178/api', + // URL_PREFIX: 'http://192.168.31.178/api', + URL_PREFIX: 'https://dazu.nongshen.net/api', }, PRE: { - URL_PREFIX: 'http://192.168.31.178:8080/api', + // URL_PREFIX: 'http://192.168.31.178:8080/api', + URL_PREFIX: 'https://dazu.nongshen.net/api', }, PROD: { - URL_PREFIX: 'http://192.168.31.178:8080/api', + // URL_PREFIX: 'http://192.168.31.178:8080/api', + URL_PREFIX: 'https://dazu.nongshen.net/api', }, IMGURL: { - URL_PREFIX: 'http://192.168.31.178:8080', + // URL_PREFIX: 'http://192.168.31.178:8080', + URL_PREFIX: 'https://dazu.nongshen.net', } } \ No newline at end of file diff --git a/pages/apply/index.wxss b/pages/apply/index.wxss index f61fe60..23eb025 100644 --- a/pages/apply/index.wxss +++ b/pages/apply/index.wxss @@ -42,19 +42,19 @@ } .ICBC{ - background:url('http://192.168.31.196:81/bj/bg_ICBC.png') no-repeat center; + background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ICBC.png') no-repeat center; background-size: 100% 100%; } .ABC{ - background:url('http://192.168.31.196:81/bj/bg_ABC.png') no-repeat center; + background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ABC.png') no-repeat center; background-size: 100% 100%; } .CCB{ - background:url('http://192.168.31.196:81/bj/bg_CCB.png') no-repeat center; + background:url('https://dazu.nongshen.net/api/profile/wechat/bg_CCB.png') no-repeat center; background-size: 100% 100%; } .RCB{ - background:url('http://192.168.31.196:81/bj/bg_RCB.png') no-repeat center; + background:url('https://dazu.nongshen.net/api/profile/wechat/bg_RCB.png') no-repeat center; background-size: 100% 100%; } diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js index 2a24969..ce32952 100644 --- a/pages/apply/paymentTemplate/add/add.js +++ b/pages/apply/paymentTemplate/add/add.js @@ -113,6 +113,7 @@ Page({ */ onLoad(options) { var that = this; + console.log(options); if(options.id){ setTimeout(function(){ UTIL.httpRequest(API.URL_GET_APPROVALITEMS+options.id, {method:'GET'}, { diff --git a/pages/handle/liist.js b/pages/handle/liist.js index b4ab90d..4a92d05 100644 --- a/pages/handle/liist.js +++ b/pages/handle/liist.js @@ -199,6 +199,11 @@ Page({ delta: 1 }) }, + godetail:function(e){ + wx.navigateTo({ + url: '/pages/apply/paymentTemplate/add/add?id='+e.currentTarget.dataset.id, + }) + }, /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/handle/liist.wxml b/pages/handle/liist.wxml index 89d3478..7a81459 100644 --- a/pages/handle/liist.wxml +++ b/pages/handle/liist.wxml @@ -91,7 +91,7 @@ - + diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 7d79f60..54cc24c 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,16 +1,16 @@ - + - + {{userInfoObj.nickName}} - + {{userInfoObj.remark}} @@ -18,7 +18,7 @@ - + {{ region || "请选择" }} @@ -29,7 +29,7 @@ - + {{array[index]|| bookName}} diff --git a/pages/user/login/login.wxml b/pages/user/login/login.wxml index 8595723..0bd7c94 100644 --- a/pages/user/login/login.wxml +++ b/pages/user/login/login.wxml @@ -1,7 +1,7 @@ - + 农村事项审批与记账 报账简单,操作便捷