|
|
@@ -61,7 +61,7 @@
|
|
|
<view class="log " :class="{'select': log }">{{ log || '请选择物流方式' }}</view>
|
|
|
</picker>
|
|
|
</view>
|
|
|
- <view class="item" v-if="showArea">
|
|
|
+ <view class="item" v-if="jxdz_show">
|
|
|
<view class="item-tit">捐赠地址<text>*</text></view>
|
|
|
<picker @change="bindAreaChange" :range="areas" range-key="name">
|
|
|
<view class="log " :class="{'select': area }">{{ area || '请选择捐赠地址' }}</view>
|
|
|
@@ -89,7 +89,7 @@
|
|
|
<view class="choose-box">
|
|
|
<view class="choose-item" v-for="(item,index) in wzList" :key="index" @click="dianji(index)">
|
|
|
<picker @change="bindWzChange" :range="wzs" range-key="name">
|
|
|
- <view class="wz select" :class="{'action': item.project_donation_name }">{{ item.project_donation_name || '请选择物资分类' }}</view>
|
|
|
+ <view class="wz select clamp" :class="{'action': item.project_donation_name }">{{ item.project_donation_name || '请选择物资分类' }}</view>
|
|
|
</picker>
|
|
|
<input type="number" v-model="item.project_donation_num" placeholder="填写数量"/>
|
|
|
<!-- <view class="dele" v-if="index != 0">
|
|
|
@@ -174,19 +174,11 @@
|
|
|
|
|
|
<script>
|
|
|
import { upload } from '@/api/ask.js';
|
|
|
- import {
|
|
|
- saveUrl,
|
|
|
- interceptor
|
|
|
- } from '@/utils/loginUtils.js';
|
|
|
- import {
|
|
|
- mapState,
|
|
|
- mapMutations
|
|
|
- } from 'vuex';
|
|
|
import { getProjectInfo, createProject, getLogistics, getDonationInfo, createUser,getAllArea } from '../../api/money.js';
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
- project_area: 0,
|
|
|
+ project_area: 225,
|
|
|
areas: [{
|
|
|
id: 0,
|
|
|
name: '市本级'
|
|
|
@@ -233,7 +225,7 @@
|
|
|
true_wzList: [],//最终捐赠的物资列表
|
|
|
hadadd: [],//已添加分类
|
|
|
project_id: 0,//项目ID
|
|
|
- showArea: false,
|
|
|
+ jxdz_show: false,
|
|
|
}
|
|
|
},
|
|
|
filters:{
|
|
|
@@ -255,47 +247,17 @@
|
|
|
if(ops.id) {
|
|
|
this.project_id = ops.id*1
|
|
|
}
|
|
|
- if(ops.project_area) {
|
|
|
- this.project_area = ops.project_area
|
|
|
- }
|
|
|
if(ops.wzlist) {
|
|
|
this.wzs = JSON.parse(ops.wzlist)
|
|
|
-
|
|
|
+
|
|
|
}else {
|
|
|
- this.showArea = true
|
|
|
this.getDonationInfo()
|
|
|
this.getAllArea()
|
|
|
+ this.jxdz_show = true
|
|
|
}
|
|
|
|
|
|
this.getLogistics()
|
|
|
},
|
|
|
- onShow() {
|
|
|
- if (!this.hasLogin) {
|
|
|
- uni.showModal({
|
|
|
- title: '登录',
|
|
|
- content: '您未登录，是否马上登陆?',
|
|
|
- success: e => {
|
|
|
- if (e.confirm) {
|
|
|
- saveUrl()
|
|
|
- interceptor();
|
|
|
- }
|
|
|
- },
|
|
|
- fail: e => {
|
|
|
- console.log(e);
|
|
|
- uni.showModal({
|
|
|
- title: 'cuowu',
|
|
|
- content: JSON.stringify(e),
|
|
|
- })
|
|
|
- }
|
|
|
- });
|
|
|
- } else {
|
|
|
- // this.loadData();
|
|
|
- }
|
|
|
- },
|
|
|
- computed: {
|
|
|
- ...mapState('user', ['userInfo', 'baseURL', 'hasLogin']),
|
|
|
- ...mapState(['weichatObj']),
|
|
|
- },
|
|
|
mounted() {
|
|
|
// this.$set(this,'wzList',[this.wz1,this.wz2])
|
|
|
},
|
|
|
@@ -415,7 +377,7 @@
|
|
|
obj.$api.msg('请选择物流方式');
|
|
|
return;
|
|
|
}
|
|
|
- if( obj.showArea == true) {
|
|
|
+ if(obj.jxdz_show == true) {
|
|
|
if(obj.area == '') {
|
|
|
obj.$api.msg('请选择捐赠地址');
|
|
|
return;
|
|
|
@@ -721,16 +683,16 @@
|
|
|
margin-bottom: 15rpx;
|
|
|
position: relative;
|
|
|
.wz {
|
|
|
- padding: 0 15rpx;
|
|
|
padding-left: 58rpx;
|
|
|
width: 297rpx;
|
|
|
-
|
|
|
+ height: 66rpx;
|
|
|
background: #F3F3F3;
|
|
|
border-radius: 5rpx;
|
|
|
font-size: 28rpx;
|
|
|
font-family: PingFang SC;
|
|
|
font-weight: 500;
|
|
|
color: #222222;
|
|
|
+ line-height: 66rpx;
|
|
|
&::after {
|
|
|
content: '';
|
|
|
width: 0;
|
