Compare commits

..

No commits in common. "5792a433b1349269fe0a501c9d360d6ba80b58c1" and "308655bed591fbf1f91bb6c35022e771822e8f38" have entirely different histories.

2 changed files with 5 additions and 13 deletions

View File

@ -2,7 +2,7 @@ var host = "https://carbonneutral.bjfs.org.cn";//线上
// var host = "https://carbon.my-footprint.cn";//线上域名2
// var host = "https://tanzhonghe-admin.com";//本地
// var host = "https://carbon.scdxtc.cn";//大向天诚服务器
var config = {
host: host,

View File

@ -60,11 +60,11 @@ Page({
casesChange(event) {
if(this.data.threeList[event.detail.value].type=='forest_management'){
this.setData({
isXiangm:true,
isXiangm:true
})
} else {
this.setData({
isXiangm:false,
isXiangm:false
})
}
this.setData({
@ -79,11 +79,6 @@ Page({
carbon_neutralization: 0,
carbon_efficiency: "0.00",
})
if(this.data.senList[event.detail.value].name=='补植补造'){
this.setData({
newDo_type:'afforestation',
})
}
if (event.detail.value == 1) {
this.setData({
newDo_type: this.data.senList[this.data.senIndex].type,
@ -91,7 +86,7 @@ Page({
})
} else {
this.setData({
newDo_type: this.data.senList[this.data.curCaseIndex].type,
newDo_type: this.data.threeList[this.data.curCaseIndex].type,
cases_position_id:this.data.threeList[this.data.curCaseIndex].address[0].id
})
}
@ -172,7 +167,6 @@ Page({
})
},
setMoney: function(e) {
console.log('e',e);
//数量= 排放量 / 植物的碳汇量基数
// ,价格 = 每棵树价格 * 数量
var that = this
@ -284,8 +278,7 @@ Page({
that.setData({
threeList: threeList,
newDo_type: threeList[that.data.curCaseIndex].type,
cases_position_id: threeList[that.data.curCaseIndex].address[that.data.addressIndex].id,
newDo_type:that.data.senList[0].type,
cases_position_id: threeList[that.data.curCaseIndex].address[that.data.addressIndex].id
//TODO 这里赋值应该用数组
// curThreeCode: [JSON.parse(res.data.data).trees[0].coding],
// carbon:JSON.parse(res.data.data).trees[0].carbon_base,
@ -336,7 +329,6 @@ Page({
var that = this
var tree_items = []
var management_items = []
console.log(this.data.newDo_type);
if (this.data.newDo_type == 'afforestation') {
for (var p in this.data.priceList) {
tree_items.push({