Compare commits

..

2 Commits

Author SHA1 Message Date
chen 55d7438036 修改冲突 2022-08-10 18:16:06 +08:00
chen 2b43957779 调整顺序,删除字 2022-08-10 18:14:02 +08:00
3 changed files with 24 additions and 22 deletions

View File

@ -19,34 +19,37 @@
<view class="title">碳中和项目选择</view> <view class="title">碳中和项目选择</view>
<view class="info"> <view class="info">
<picker bindchange="casesChange" value="{{curCaseIndex}}" range-key="name" range="{{threeList}}"> <picker bindchange="casesChange" value="{{curCaseIndex}}" range-key="name" range="{{threeList}}">
<view class="picker">{{flag?threeList[curCaseIndex].name:"默认选项"}}</view> <!-- <view class="picker">{{flag?threeList[curCaseIndex].name:"默认选项"}}</view> -->
<view class="picker">{{threeList[curCaseIndex].name}}</view>
</picker> </picker>
</view> </view>
</view> </view>
</view> </view>
<!-- 项目选择 -->
<view class="address" wx:if="{{isXiangm}}">
<!-- <view class="title">森林经营项目</view> -->
<image style="width:38rpx;height:35rpx" src="/img/nav/case.png"></image>
<view class="title">碳中和项目类型选择</view>
<view class="info">
<picker bindchange="senChange" value="{{senIndex}}" range-key="name" range="{{senList}}">
<view class="picker">
{{flag?senList[senIndex].name:"默认选项"}}
</view>
</picker>
</view>
</view>
<!-- 地址选择 --> <!-- 地址选择 -->
<view class="address"> <view class="address">
<!-- <view class="title">地址选择</view> --> <!-- <view class="title">地址选择</view> -->
<image style="width:38rpx;height:35rpx" src="/img/nav/address.png"></image> <image style="width:38rpx;height:35rpx" src="/img/nav/address.png"></image>
<view class="title">碳中和项目地点选择</view> <view class="title">项目地点选择</view>
<view class="info"> <view class="info">
<picker bindchange="addrressChange" value="{{addressIndex}}" range-key="info" range="{{threeList[curCaseIndex].address}}"> <picker bindchange="addrressChange" value="{{addressIndex}}" range-key="info" range="{{threeList[curCaseIndex].address}}">
<view class="picker"> <view class="picker">
<!-- address --> <!-- address -->
{{flag?threeList[curCaseIndex].address[addressIndex].info:"默认选项"}} <!-- {{flag?threeList[curCaseIndex].address[addressIndex].info:"默认选项"}} -->
{{threeList[curCaseIndex].address[addressIndex].info}}
</view>
</picker>
</view>
</view>
<!-- 项目选择 -->
<view class="address" wx:if="{{isXiangm}}">
<!-- <view class="title">森林经营项目</view> -->
<image style="width:38rpx;height:35rpx" src="/img/nav/case.png"></image>
<view class="title">项目类型选择</view>
<view class="info">
<picker bindchange="senChange" value="{{senIndex}}" range-key="name" range="{{senList}}">
<view class="picker">
<!-- {{flag?senList[senIndex].name:"默认选项"}} -->
{{senList[senIndex].name}}
</view> </view>
</picker> </picker>
</view> </view>

View File

@ -31,17 +31,17 @@
"disablePlugins": [], "disablePlugins": [],
"outputPath": "" "outputPath": ""
}, },
"enableEngineNative": false, "useIsolateContext": false,
"useIsolateContext": true,
"userConfirmedBundleSwitch": true, "userConfirmedBundleSwitch": true,
"packNpmManually": false, "packNpmManually": false,
"packNpmRelationList": [], "packNpmRelationList": [],
"minifyWXSS": true, "minifyWXSS": true,
"showES6CompileOption": false,
"useStaticServer": true,
"disableUseStrict": false, "disableUseStrict": false,
"minifyWXML": true,
"showES6CompileOption": false,
"useCompilerPlugins": false, "useCompilerPlugins": false,
"minifyWXML": true "ignoreUploadUnusedFiles": true,
"useStaticServer": true
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.19.2", "libVersion": "2.19.2",

View File

@ -38,6 +38,5 @@
] ]
} }
}, },
"projectname": "%E7%A2%B3%E4%B8%AD%E5%92%8C3",
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html" "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
} }