mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

This commit is contained in:
weipengfei 2023-12-27 15:39:36 +08:00
parent 9b6905e733
commit f5330fad92
5 changed files with 268 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/index/index.vue
View File

@ -261,7 +261,7 @@
<view class="settlementAgreement" v-if="isFshow"> <view class="settlementAgreement" v-if="isFshow">
<view class="setAgCount" style="width: 100%;height: 100%; padding-top: 160rpx;"> <view class="setAgCount" style="width: 100%;height: 100%; padding-top: 160rpx;">
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> --> <!-- <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> <image src="@/static/images/close.png" mode="aspectFit" style="width: 90rpx;height: 90rpx;"></image>
</view> </view>
<div class="title">{{detail.title}}</div> <div class="title">{{detail.title}}</div>

163
pages/moreProject/moreProject.vue
View File

@ -429,10 +429,10 @@
<emptyPage title="暂无信息"></emptyPage> <emptyPage title="暂无信息"></emptyPage>
</view> </view>
<view class="settlementAgreement" v-if="isFshow"> <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> --> <!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:60rpx" @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: 60rpx;height: 60rpx;"></image> <image src="@/static/images/close.png" mode="aspectFit" style="width: 90rpx;height: 90rpx;"></image>
</view> </view>
<div class="title">{{detail.title}}</div> <div class="title">{{detail.title}}</div>
<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view> <view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
@ -442,13 +442,14 @@
</view> </view>
<view class="setAgCountbtn"> <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-if="num>0">请仔细阅读协议{{num}}S</text>
<text v-else>同意</text> <text v-else>同意本协议</text>
</button> </button>
</view> </view>
@ -456,41 +457,52 @@
</view> </view>
<uni-popup ref="popup" type="bottom"> <uni-popup ref="popup" type="bottom">
<view class="userpage"> <view class="userpage">
<view class="userpage-icon" @click="close"> <view class="userpage-icon" @click="close">
<image src="@/static/images/close.png" mode=""></image> <image src="@/static/images/close.png" mode=""></image>
</view> </view>
<form report-submit='true' style="height: 100%;"> <form report-submit='true'>
<view class='merchantsSettled' :style="{'height':Fheight}"> <view class='merchantsSettled' style="height:100vh;">
<view class="title">填写信息</view> <view class="title">填写信息</view>
<view class='list'> <view class='list'>
<view class="item"> <!-- <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"> <view class="acea-row row-middle">
<text class="item-name">联系电话:</text> <text class="item-name">联系电话:</text>
<input type="text" placeholder="请输入手机号" v-model="merchantData.phone" @input="validateBtn" <input type="text" placeholder="请输入手机号" v-model="merchantData.phone" @input="validateBtn"
placeholder-class='placeholder' /> placeholder-class='placeholder' />
</view> </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>
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name">银行卡号:</text> <text class="item-name">对公账号:</text>
<input type="text" placeholder="请输入银行卡号" v-model="merchantData.bank_opening" @input="validateBtn" <input type="number" placeholder="请输入对公账号" v-model="merchantData.bank_code" @input="validateBtn"
placeholder-class='placeholder' /> placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view class="item"> <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"> <view class="acea-row row-middle">
<text class="item-name">身份证正面:</text> <text class="item-name">身份证正面:</text>
</view> </view>
@ -530,7 +542,7 @@
<image :src="merchantData.bank_back" mode="aspectFit"></image> <image :src="merchantData.bank_back" mode="aspectFit"></image>
</view> </view>
</view> </view>
</view> </view> -->
<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit"> <button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
@ -772,26 +784,32 @@ export default {
let that = this, let that = this,
value = that.merchantData; value = that.merchantData;
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({ if (!value.bank_username) return that.$util.Tips({
title: '请输入银行账户姓名' title: '请输入开户行名称'
}); });
if (!value.bank_opening) return that.$util.Tips({ if (!value.bank_opening) return that.$util.Tips({
title: '请输入银行卡号' title: '请输入开户行地址'
}); });
if (value.bank_front.length == 0) return that.$util.Tips({ // if (value.bank_front.length == 0) return that.$util.Tips({
title: '请上传一张或者多张图片' // title: '请上传一张或者多张图片'
}); // });
if (value.bank_back.length == 0) return that.$util.Tips({ // if (value.bank_back.length == 0) return that.$util.Tips({
title: '请上传一张或者多张图片' // title: '请上传一张或者多张图片'
}); // });
if (value.cardno_front.length == 0) return that.$util.Tips({ // if (value.cardno_front.length == 0) return that.$util.Tips({
title: '请上传一张或者多张图片' // title: '请上传一张或者多张图片'
}); // });
if (value.cardno_back.length == 0) return that.$util.Tips({ // if (value.cardno_back.length == 0) return that.$util.Tips({
title: '请上传一张或者多张图片' // title: '请上传一张或者多张图片'
}); // });
that.validate = true; that.validate = true;
return true; return true;
}, },
@ -917,7 +935,8 @@ export default {
let that = this; let that = this;
getUserInfo().then(res => { getUserInfo().then(res => {
this.userInfoData = res.data; 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({ merstreet({
street_code: res.data.mer_info.street_id street_code: res.data.mer_info.street_id
}).then((res) => { }).then((res) => {
@ -984,25 +1003,25 @@ export default {
} }
.userpage-icon { .userpage-icon {
width: 60rpx; width: 90rpx;
height: 60rpx; height: 90rpx;
position: absolute; position: absolute;
top: 65rpx; top: 90rpx;
right: 60rpx; right: 30rpx;
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
.item-name { .item-name {
width: 190rpx; width: 190rpx;
} }
.merchantsSettled { .merchantsSettled {
height: 100%; height: 100%;
padding-top: 80rpx; padding-top: 130rpx;
} }
.merchantsSettled .title { .merchantsSettled .title {
@ -1016,6 +1035,7 @@ export default {
background-color: #fff; background-color: #fff;
border-radius: 12px; border-radius: 12px;
margin: 0 15px; margin: 0 15px;
width: 694rpx;
position: absolute; position: absolute;
} }
@ -1059,7 +1079,7 @@ export default {
} }
.merchantsSettled .list .item { .merchantsSettled .list .item {
padding: 50rpx 0 20rpx; padding: 30rpx 0 10rpx;
position: relative; position: relative;
margin: 0 20px; margin: 0 20px;
@ -1072,13 +1092,13 @@ export default {
.item-title { .item-title {
color: #666666; color: #666666;
font-size: 28rpx; font-size: 32rpx;
display: block; display: block;
} }
.item-desc { .item-desc {
color: #b2b2b2; color: #B2B2B2;
font-size: 22rpx; font-size: 32rpx;
display: block; display: block;
margin-top: 9rpx; margin-top: 9rpx;
line-height: 36rpx; line-height: 36rpx;
@ -1143,7 +1163,7 @@ export default {
height: 130rpx; height: 130rpx;
margin: 24rpx 22rpx 0 0; margin: 24rpx 22rpx 0 0;
position: relative; position: relative;
font-size: 11px; font-size: 32rpx;
color: #bbb; color: #bbb;
&:nth-child(4n) { &:nth-child(4n) {
@ -1195,11 +1215,12 @@ export default {
border-radius: 25px; border-radius: 25px;
text-align: center; text-align: center;
line-height: 86rpx; line-height: 86rpx;
font-size: 15px; font-size: 32rpx;
color: #fff; color: #fff;
background: #e3e3e3; background: #E3E3E3;
margin-top: 25px; margin-top: 25px;
pointer-events: none; pointer-events: none;
margin-bottom: 100px;
} }
.merchantsSettled .submitBtn.on { .merchantsSettled .submitBtn.on {
@ -1208,24 +1229,24 @@ export default {
} }
.settlementAgreement { .settlementAgreement {
width: 100%; width: 100vw;
height: 100%; height: 100vh;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
background: rgba(0, 0, 0, 0.5); background: rgba(0, 0, 0, .5);
z-index: 10; z-index: 10;
} }
.settlementAgreement .setAgCount { .settlementAgreement .setAgCount {
background: #fff; background: #fff;
width: 656rpx; width: 694rpx;
// height: 458px; // height: 458px;
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
padding: 52rpx; padding: 28rpx;
-webkit-transform: translate(-50%, -50%); -webkit-transform: translate(-50%, -50%);
-moz-transform: translate(-50%, -50%); -moz-transform: translate(-50%, -50%);
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
@ -1267,7 +1288,7 @@ export default {
line-height: 22px; line-height: 22px;
text-align: justify; text-align: justify;
text-justify: distribute-all-lines; text-justify: distribute-all-lines;
height: 75%; height: 76%;
overflow-y: scroll; overflow-y: scroll;
} }
@ -1275,6 +1296,8 @@ export default {
.setAgCountbtn { .setAgCountbtn {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
padding-bottom: 30rpx;
position: relative;
.setAgCountbtna { .setAgCountbtna {
margin-top: 40rpx; margin-top: 40rpx;
@ -1284,11 +1307,12 @@ export default {
line-height: 74rpx; line-height: 74rpx;
border-radius: 46rpx 46rpx; border-radius: 46rpx 46rpx;
opacity: 1; opacity: 1;
border: 2rpx solid #b3b3b3; border: 2rpx solid #B3B3B3;
font-size: 25rpx; font-size: 25rpx;
font-family: PingFang SC-Medium, PingFang SC; font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #737373; color: #737373;
} }
.setAgCountbtnb { .setAgCountbtnb {
@ -1305,6 +1329,7 @@ export default {
font-family: PingFang SC-Medium, PingFang SC; font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #fff; color: #fff;
} }
.setAgCountbtnc { .setAgCountbtnc {
@ -1313,14 +1338,32 @@ export default {
height: 74rpx; height: 74rpx;
text-align: center; text-align: center;
line-height: 74rpx; line-height: 74rpx;
background: linear-gradient(270deg, #ff6d20 0%, #f84221 100%); background: linear-gradient(270deg, #FF6D20 0%, #F84221 100%);
border-radius: 46rpx 46rpx; border-radius: 46rpx 46rpx;
opacity: 1; opacity: 1;
font-size: 25rpx; font-size: 25rpx;
font-family: PingFang SC-Medium, PingFang SC; font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #fff; 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;
}
} }
.bg-img { .bg-img {

11
pages/product/basicSet.vue
View File

@ -201,6 +201,7 @@
<script> <script>
import { import {
navigateBack,
Toast Toast
} from '@/libs/uniApi.js' } from '@/libs/uniApi.js'
import { import {
@ -443,10 +444,12 @@
// uni.navigateTo({ // uni.navigateTo({
// url:'/pages/moreProject/moreProject' // url:'/pages/moreProject/moreProject'
// }) // })
uni.redirectTo({ // uni.redirectTo({
url: '/pages/moreProject/moreProject' // url: '/pages/moreProject/moreProject'
}) // })
uni.navigateBack({
delta:1
});
}, 1000) }, 1000)
}).catch(err => { }).catch(err => {
Toast(err) Toast(err)

2
pages/users/order_confirm/indexOther.vue
View File

@ -14,7 +14,7 @@
<text v-if='addressInfo.brigade'>{{typeof(addressInfo.brigade)=='string'?addressInfo.brigade:addressInfo.brigade.name }}{{addressInfo.detail}}</text> <text v-if='addressInfo.brigade'>{{typeof(addressInfo.brigade)=='string'?addressInfo.brigade:addressInfo.brigade.name }}{{addressInfo.detail}}</text>
</view> </view>
</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'> class='addressCon'>
<view class='setaddress'>设置收货地址</view> <view class='setaddress'>设置收货地址</view>
</navigator> </navigator>

9
pages/users/user_address/index.vue
View File

@ -111,6 +111,7 @@
pinkId: 0, //拼团id pinkId: 0, //拼团id
couponId: 0, //优惠券id couponId: 0, //优惠券id
address_id: 0, //地址id address_id: 0, //地址id
back: 0,
userAddress: { userAddress: {
is_default: false is_default: false
}, //地址详情 }, //地址详情
@ -145,6 +146,7 @@
this.cartId = options.cartId || ''; this.cartId = options.cartId || '';
this.pinkId = options.pinkId || 0; this.pinkId = options.pinkId || 0;
this.couponId = options.couponId || 0; this.couponId = options.couponId || 0;
this.back = +options.back || 0;
this.address_id = options.id || 0; this.address_id = options.id || 0;
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: options.id ? '修改地址' : '添加地址' title: options.id ? '修改地址' : '添加地址'
@ -381,8 +383,11 @@
that.cartId = ''; that.cartId = '';
that.pinkId = ''; that.pinkId = '';
that.couponId = ''; that.couponId = '';
uni.$emit('updataAddress') uni.$emit('updataAddress');
uni.navigateTo({ if(that.back>0) uni.navigateBack({
delta: that.back
});
else uni.navigateTo({
url: '/pages/users/order_confirm/index?cartId=' + cartId + url: '/pages/users/order_confirm/index?cartId=' + cartId +
'&addressId=' + (that.id ? that.id : res.data '&addressId=' + (that.id ? that.id : res.data
.address_id) + '&pinkId=' + pinkId + '&couponId=' + .address_id) + '&pinkId=' + pinkId + '&couponId=' +