This commit is contained in:
parent
9b6905e733
commit
f5330fad92
|
|
@ -261,7 +261,7 @@
|
|||
<view class="settlementAgreement" v-if="isFshow">
|
||||
<view class="setAgCount" style="width: 100%;height: 100%; padding-top: 160rpx;">
|
||||
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
|
||||
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:90rpx" @click="recuo">
|
||||
<view class="" style="width: 90rpx;height: 90rpx; position: absolute;right: 10rpx; top:90rpx" @click="recuo">
|
||||
<image src="@/static/images/close.png" mode="aspectFit" style="width: 90rpx;height: 90rpx;"></image>
|
||||
</view>
|
||||
<div class="title">{{detail.title}}</div>
|
||||
|
|
|
|||
|
|
@ -429,10 +429,10 @@
|
|||
<emptyPage title="暂无信息"></emptyPage>
|
||||
</view>
|
||||
<view class="settlementAgreement" v-if="isFshow">
|
||||
<view class="setAgCount" style="width: 100%;height: 100% ;padding-top:120rpx ;">
|
||||
<view class="setAgCount" style="width: 100%;height: 100% ;padding-top:160rpx ;">
|
||||
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
|
||||
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:60rpx" @click="recuo">
|
||||
<image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image>
|
||||
<view class="" style="width: 90rpx;height: 90rpx; position: absolute;right: 10rpx; top: 90rpx" @click="recuo">
|
||||
<image src="@/static/images/close.png" mode="aspectFit" style="width: 90rpx;height: 90rpx;"></image>
|
||||
</view>
|
||||
<div class="title">{{detail.title}}</div>
|
||||
<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
|
||||
|
|
@ -442,13 +442,14 @@
|
|||
|
||||
</view>
|
||||
<view class="setAgCountbtn">
|
||||
<button class="setAgCountbtna" @click="refuse">
|
||||
<view class="border"></view>
|
||||
<!-- <button class="setAgCountbtna" @click="refuse">
|
||||
拒绝
|
||||
</button>
|
||||
</button> -->
|
||||
|
||||
<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
|
||||
<button class="btn" :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
|
||||
<text v-if="num>0">请仔细阅读协议{{num}}S</text>
|
||||
<text v-else>同意</text>
|
||||
<text v-else>同意本协议</text>
|
||||
|
||||
</button>
|
||||
</view>
|
||||
|
|
@ -456,46 +457,57 @@
|
|||
</view>
|
||||
|
||||
<uni-popup ref="popup" type="bottom">
|
||||
|
||||
<view class="userpage">
|
||||
<view class="userpage-icon" @click="close">
|
||||
<image src="@/static/images/close.png" mode=""></image>
|
||||
</view>
|
||||
|
||||
<form report-submit='true' style="height: 100%;">
|
||||
<view class='merchantsSettled' :style="{'height':Fheight}">
|
||||
|
||||
<form report-submit='true'>
|
||||
<view class='merchantsSettled' style="height:100vh;">
|
||||
<view class="title">填写信息</view>
|
||||
<view class='list'>
|
||||
<view class="item">
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">开户银行名称:</text>
|
||||
<input type="text" maxlength="30" placeholder="请输入开户银行名称" v-model="merchantData.bank_username"
|
||||
@input="validateBtn" placeholder-class='placeholder' />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="item">
|
||||
<!-- <view class="item">
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">联系电话:</text>
|
||||
<input type="text" placeholder="请输入手机号" v-model="merchantData.phone" @input="validateBtn"
|
||||
placeholder-class='placeholder' />
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="item">
|
||||
<view class="acea-row row-middle" style="display: flex;align-items: flex-start;">
|
||||
<text class="item-name" style="flex-shrink: 0;">公司名称:</text>
|
||||
<view style="font-size: 32rpx;flex: 1;">
|
||||
{{merchantData.company_name}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="item">
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">银行卡号:</text>
|
||||
<input type="text" placeholder="请输入银行卡号" v-model="merchantData.bank_opening" @input="validateBtn"
|
||||
<text class="item-name">对公账号:</text>
|
||||
<input type="number" placeholder="请输入对公账号" v-model="merchantData.bank_code" @input="validateBtn"
|
||||
placeholder-class='placeholder' />
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">开户行名称:</text>
|
||||
<input type="text" maxlength="30" placeholder="请输入开户行名称" v-model="merchantData.bank_username"
|
||||
@input="validateBtn" placeholder-class='placeholder' />
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">开户行地址:</text>
|
||||
<input type="text" placeholder="请输入开户行地址" v-model="merchantData.bank_opening" @input="validateBtn"
|
||||
placeholder-class='placeholder' />
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="item">
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">身份证正面:</text>
|
||||
</view>
|
||||
<view class="item-card">
|
||||
|
||||
|
||||
<view class="item-carda" @click='uploadpic({type:1})' v-if='merchantData.cardno_front.length==0'>
|
||||
<image src="@/static/images/SFZZ.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
|
|
@ -509,7 +521,7 @@
|
|||
<image :src="merchantData.cardno_back" mode="aspectFit"></image>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="acea-row row-middle">
|
||||
|
|
@ -525,14 +537,14 @@
|
|||
<view class="item-cardb" @click='uploadpic({type:4})' v-if='merchantData.bank_back.length==0'>
|
||||
<image src="@/static/images/YHKF.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="item-cardb" @click='DelPic({type:4})' v-else>
|
||||
<image :src="merchantData.bank_back" mode="aspectFit"></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
</view> -->
|
||||
|
||||
|
||||
<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
|
||||
提交申请
|
||||
</button>
|
||||
|
|
@ -768,33 +780,39 @@ export default {
|
|||
}
|
||||
},
|
||||
|
||||
validateForm: function () {
|
||||
let that = this,
|
||||
value = that.merchantData;
|
||||
validateForm: function() {
|
||||
let that = this,
|
||||
value = that.merchantData;
|
||||
|
||||
if (!value.bank_username) return that.$util.Tips({
|
||||
title: '请输入银行账户姓名'
|
||||
});
|
||||
if (!value.bank_opening) return that.$util.Tips({
|
||||
title: '请输入银行卡号'
|
||||
});
|
||||
if (!value.company_name) return that.$util.Tips({
|
||||
title: '请输入公司名称'
|
||||
});
|
||||
if (!value.bank_code) return that.$util.Tips({
|
||||
title: '请输入对公账号'
|
||||
});
|
||||
if (!value.bank_username) return that.$util.Tips({
|
||||
title: '请输入开户行名称'
|
||||
});
|
||||
if (!value.bank_opening) return that.$util.Tips({
|
||||
title: '请输入开户行地址'
|
||||
});
|
||||
|
||||
if (value.bank_front.length == 0) return that.$util.Tips({
|
||||
title: '请上传一张或者多张图片'
|
||||
});
|
||||
// if (value.bank_front.length == 0) return that.$util.Tips({
|
||||
// title: '请上传一张或者多张图片'
|
||||
// });
|
||||
|
||||
if (value.bank_back.length == 0) return that.$util.Tips({
|
||||
title: '请上传一张或者多张图片'
|
||||
});
|
||||
if (value.cardno_front.length == 0) return that.$util.Tips({
|
||||
title: '请上传一张或者多张图片'
|
||||
});
|
||||
if (value.cardno_back.length == 0) return that.$util.Tips({
|
||||
title: '请上传一张或者多张图片'
|
||||
});
|
||||
that.validate = true;
|
||||
return true;
|
||||
},
|
||||
// if (value.bank_back.length == 0) return that.$util.Tips({
|
||||
// title: '请上传一张或者多张图片'
|
||||
// });
|
||||
// if (value.cardno_front.length == 0) return that.$util.Tips({
|
||||
// title: '请上传一张或者多张图片'
|
||||
// });
|
||||
// if (value.cardno_back.length == 0) return that.$util.Tips({
|
||||
// title: '请上传一张或者多张图片'
|
||||
// });
|
||||
that.validate = true;
|
||||
return true;
|
||||
},
|
||||
/**
|
||||
* 上传文件
|
||||
*
|
||||
|
|
@ -917,7 +935,8 @@ export default {
|
|||
let that = this;
|
||||
getUserInfo().then(res => {
|
||||
this.userInfoData = res.data;
|
||||
this.merchantData.phone = res.data.phone
|
||||
this.merchantData.phone = res.data.phone;
|
||||
this.merchantData.company_name = res.data.mer_info.company_name;
|
||||
merstreet({
|
||||
street_code: res.data.mer_info.street_id
|
||||
}).then((res) => {
|
||||
|
|
@ -984,40 +1003,41 @@ export default {
|
|||
}
|
||||
|
||||
.userpage-icon {
|
||||
width: 60rpx;
|
||||
height: 60rpx;
|
||||
position: absolute;
|
||||
top: 65rpx;
|
||||
right: 60rpx;
|
||||
width: 90rpx;
|
||||
height: 90rpx;
|
||||
position: absolute;
|
||||
top: 90rpx;
|
||||
right: 30rpx;
|
||||
|
||||
image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.item-name {
|
||||
width: 190rpx;
|
||||
}
|
||||
|
||||
.merchantsSettled {
|
||||
height: 100%;
|
||||
padding-top: 80rpx;
|
||||
}
|
||||
height: 100%;
|
||||
padding-top: 130rpx;
|
||||
|
||||
.merchantsSettled .title {
|
||||
font-size: 35rpx;
|
||||
font-family: Microsoft YaHei;
|
||||
font-weight: 400;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.merchantsSettled .list {
|
||||
background-color: #fff;
|
||||
border-radius: 12px;
|
||||
margin: 0 15px;
|
||||
position: absolute;
|
||||
}
|
||||
.merchantsSettled .title {
|
||||
font-size: 35rpx;
|
||||
font-family: Microsoft YaHei;
|
||||
font-weight: 400;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.merchantsSettled .list {
|
||||
background-color: #fff;
|
||||
border-radius: 12px;
|
||||
margin: 0 15px;
|
||||
width: 694rpx;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
.application-record {
|
||||
position: absolute;
|
||||
|
|
@ -1058,33 +1078,33 @@ export default {
|
|||
}
|
||||
}
|
||||
|
||||
.merchantsSettled .list .item {
|
||||
padding: 50rpx 0 20rpx;
|
||||
.merchantsSettled .list .item {
|
||||
padding: 30rpx 0 10rpx;
|
||||
|
||||
position: relative;
|
||||
margin: 0 20px;
|
||||
position: relative;
|
||||
margin: 0 20px;
|
||||
|
||||
&.no-border {
|
||||
border-bottom: none;
|
||||
padding-left: 0;
|
||||
padding-right: 0;
|
||||
&.no-border {
|
||||
border-bottom: none;
|
||||
padding-left: 0;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
.item-title {
|
||||
color: #666666;
|
||||
font-size: 32rpx;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.item-desc {
|
||||
color: #B2B2B2;
|
||||
font-size: 32rpx;
|
||||
display: block;
|
||||
margin-top: 9rpx;
|
||||
line-height: 36rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.item-title {
|
||||
color: #666666;
|
||||
font-size: 28rpx;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.item-desc {
|
||||
color: #b2b2b2;
|
||||
font-size: 22rpx;
|
||||
display: block;
|
||||
margin-top: 9rpx;
|
||||
line-height: 36rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.acea-row,
|
||||
.upload {
|
||||
display: -webkit-box;
|
||||
|
|
@ -1139,93 +1159,94 @@ export default {
|
|||
}
|
||||
|
||||
.merchantsSettled .list .item .pictrue {
|
||||
width: 130rpx;
|
||||
height: 130rpx;
|
||||
margin: 24rpx 22rpx 0 0;
|
||||
position: relative;
|
||||
font-size: 11px;
|
||||
color: #bbb;
|
||||
width: 130rpx;
|
||||
height: 130rpx;
|
||||
margin: 24rpx 22rpx 0 0;
|
||||
position: relative;
|
||||
font-size: 32rpx;
|
||||
color: #bbb;
|
||||
|
||||
&:nth-child(4n) {
|
||||
margin-right: 0;
|
||||
}
|
||||
&:nth-child(4n) {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
&:nth-last-child(1) {
|
||||
border: 0.5px solid #ddd;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
&:nth-last-child(1) {
|
||||
border: 0.5px solid #ddd;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
uni-image,
|
||||
image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
border-radius: 1px;
|
||||
|
||||
img {
|
||||
-webkit-touch-callout: none;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
opacity: 0;
|
||||
uni-image,
|
||||
image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
border-radius: 1px;
|
||||
|
||||
img {
|
||||
-webkit-touch-callout: none;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
opacity: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.icon-guanbi1 {
|
||||
font-size: 33rpx;
|
||||
position: absolute;
|
||||
top: -10px;
|
||||
right: -10px;
|
||||
}
|
||||
}
|
||||
|
||||
.icon-guanbi1 {
|
||||
font-size: 33rpx;
|
||||
position: absolute;
|
||||
top: -10px;
|
||||
right: -10px;
|
||||
}
|
||||
}
|
||||
|
||||
.uni-list-cell-db {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.merchantsSettled .submitBtn {
|
||||
width: 588rpx;
|
||||
margin: 0 auto;
|
||||
height: 86rpx;
|
||||
width: 588rpx;
|
||||
margin: 0 auto;
|
||||
height: 86rpx;
|
||||
|
||||
border-radius: 25px;
|
||||
text-align: center;
|
||||
line-height: 86rpx;
|
||||
font-size: 15px;
|
||||
color: #fff;
|
||||
background: #e3e3e3;
|
||||
margin-top: 25px;
|
||||
pointer-events: none;
|
||||
}
|
||||
border-radius: 25px;
|
||||
text-align: center;
|
||||
line-height: 86rpx;
|
||||
font-size: 32rpx;
|
||||
color: #fff;
|
||||
background: #E3E3E3;
|
||||
margin-top: 25px;
|
||||
pointer-events: none;
|
||||
margin-bottom: 100px;
|
||||
}
|
||||
|
||||
.merchantsSettled .submitBtn.on {
|
||||
background: red;
|
||||
pointer-events: all;
|
||||
}
|
||||
.merchantsSettled .submitBtn.on {
|
||||
background: red;
|
||||
pointer-events: all;
|
||||
}
|
||||
|
||||
.settlementAgreement {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
background: rgba(0, 0, 0, .5);
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
.settlementAgreement .setAgCount {
|
||||
background: #fff;
|
||||
width: 656rpx;
|
||||
width: 694rpx;
|
||||
// height: 458px;
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
|
||||
padding: 52rpx;
|
||||
|
||||
padding: 28rpx;
|
||||
-webkit-transform: translate(-50%, -50%);
|
||||
-moz-transform: translate(-50%, -50%);
|
||||
transform: translate(-50%, -50%);
|
||||
|
|
@ -1267,62 +1288,84 @@ export default {
|
|||
line-height: 22px;
|
||||
text-align: justify;
|
||||
text-justify: distribute-all-lines;
|
||||
height: 75%;
|
||||
height: 76%;
|
||||
|
||||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
.setAgCountbtn {
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
padding-bottom: 30rpx;
|
||||
position: relative;
|
||||
|
||||
.setAgCountbtna {
|
||||
margin-top: 40rpx;
|
||||
width: 200rpx;
|
||||
height: 74rpx;
|
||||
text-align: center;
|
||||
line-height: 74rpx;
|
||||
border-radius: 46rpx 46rpx;
|
||||
opacity: 1;
|
||||
border: 2rpx solid #b3b3b3;
|
||||
font-size: 25rpx;
|
||||
font-family: PingFang SC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #737373;
|
||||
.setAgCountbtna {
|
||||
margin-top: 40rpx;
|
||||
width: 200rpx;
|
||||
height: 74rpx;
|
||||
text-align: center;
|
||||
line-height: 74rpx;
|
||||
border-radius: 46rpx 46rpx;
|
||||
opacity: 1;
|
||||
border: 2rpx solid #B3B3B3;
|
||||
font-size: 25rpx;
|
||||
font-family: PingFang SC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #737373;
|
||||
|
||||
}
|
||||
|
||||
.setAgCountbtnb {
|
||||
margin-top: 40rpx;
|
||||
padding-left: 20rpx;
|
||||
padding-right: 20rpx;
|
||||
|
||||
text-align: center;
|
||||
line-height: 74rpx;
|
||||
background: #cecece;
|
||||
border-radius: 46rpx 46rpx;
|
||||
opacity: 1;
|
||||
font-size: 25rpx;
|
||||
font-family: PingFang SC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #fff;
|
||||
|
||||
}
|
||||
|
||||
.setAgCountbtnc {
|
||||
margin-top: 40rpx;
|
||||
width: 200rpx;
|
||||
height: 74rpx;
|
||||
text-align: center;
|
||||
line-height: 74rpx;
|
||||
background: linear-gradient(270deg, #FF6D20 0%, #F84221 100%);
|
||||
border-radius: 46rpx 46rpx;
|
||||
opacity: 1;
|
||||
font-size: 25rpx;
|
||||
font-family: PingFang SC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #fff;
|
||||
|
||||
}
|
||||
|
||||
.border{
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: -28rpx;
|
||||
width: 100vw;
|
||||
height: 100%;
|
||||
border-radius: 40rpx 40rpx 0 0;
|
||||
box-shadow: 0px -5px 5px -2px rgba(0, 0, 0, 0.2); /* 在上边框添加阴影 */
|
||||
}
|
||||
|
||||
.btn{
|
||||
width: 694rpx;
|
||||
font-weight: bold;
|
||||
font-size: 34rpx;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.setAgCountbtnb {
|
||||
margin-top: 40rpx;
|
||||
padding-left: 20rpx;
|
||||
padding-right: 20rpx;
|
||||
|
||||
text-align: center;
|
||||
line-height: 74rpx;
|
||||
background: #cecece;
|
||||
border-radius: 46rpx 46rpx;
|
||||
opacity: 1;
|
||||
font-size: 25rpx;
|
||||
font-family: PingFang SC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.setAgCountbtnc {
|
||||
margin-top: 40rpx;
|
||||
width: 200rpx;
|
||||
height: 74rpx;
|
||||
text-align: center;
|
||||
line-height: 74rpx;
|
||||
background: linear-gradient(270deg, #ff6d20 0%, #f84221 100%);
|
||||
border-radius: 46rpx 46rpx;
|
||||
opacity: 1;
|
||||
font-size: 25rpx;
|
||||
font-family: PingFang SC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
.bg-img {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
|
|
|
|||
|
|
@ -201,6 +201,7 @@
|
|||
<script>
|
||||
import {
|
||||
|
||||
navigateBack,
|
||||
Toast
|
||||
} from '@/libs/uniApi.js'
|
||||
import {
|
||||
|
|
@ -443,10 +444,12 @@
|
|||
// uni.navigateTo({
|
||||
// url:'/pages/moreProject/moreProject'
|
||||
// })
|
||||
uni.redirectTo({
|
||||
url: '/pages/moreProject/moreProject'
|
||||
})
|
||||
|
||||
// uni.redirectTo({
|
||||
// url: '/pages/moreProject/moreProject'
|
||||
// })
|
||||
uni.navigateBack({
|
||||
delta:1
|
||||
});
|
||||
}, 1000)
|
||||
}).catch(err => {
|
||||
Toast(err)
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<text v-if='addressInfo.brigade'>{{typeof(addressInfo.brigade)=='string'?addressInfo.brigade:addressInfo.brigade.name }}{{addressInfo.detail}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<navigator v-else :url="'/pages/users/user_address/index?cartId='+cartId" hover-class="none"
|
||||
<navigator v-else :url="`/pages/users/user_address/index?cartId=${cartId}&back=1`" hover-class="none"
|
||||
class='addressCon'>
|
||||
<view class='setaddress'>设置收货地址</view>
|
||||
</navigator>
|
||||
|
|
|
|||
|
|
@ -111,6 +111,7 @@
|
|||
pinkId: 0, //拼团id
|
||||
couponId: 0, //优惠券id
|
||||
address_id: 0, //地址id
|
||||
back: 0,
|
||||
userAddress: {
|
||||
is_default: false
|
||||
}, //地址详情
|
||||
|
|
@ -145,6 +146,7 @@
|
|||
this.cartId = options.cartId || '';
|
||||
this.pinkId = options.pinkId || 0;
|
||||
this.couponId = options.couponId || 0;
|
||||
this.back = +options.back || 0;
|
||||
this.address_id = options.id || 0;
|
||||
uni.setNavigationBarTitle({
|
||||
title: options.id ? '修改地址' : '添加地址'
|
||||
|
|
@ -381,8 +383,11 @@
|
|||
that.cartId = '';
|
||||
that.pinkId = '';
|
||||
that.couponId = '';
|
||||
uni.$emit('updataAddress')
|
||||
uni.navigateTo({
|
||||
uni.$emit('updataAddress');
|
||||
if(that.back>0) uni.navigateBack({
|
||||
delta: that.back
|
||||
});
|
||||
else uni.navigateTo({
|
||||
url: '/pages/users/order_confirm/index?cartId=' + cartId +
|
||||
'&addressId=' + (that.id ? that.id : res.data
|
||||
.address_id) + '&pinkId=' + pinkId + '&couponId=' +
|
||||
|
|
|
|||
Loading…
Reference in New Issue