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

更新

This commit is contained in:
weipengfei 2023-12-26 17:42:41 +08:00
parent ae098df597
commit a0f498b907
3 changed files with 74 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
pages/index/index.vue
View File

@ -261,38 +261,37 @@
<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:80rpx" @click="recuo"> <view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; 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>
<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view> <view style="margin-bottom: 20rpx;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view>
<view class="contenta"> <view class="contenta">
<jyf-parser :html="detail.mer_settlement_agree" ref="article" :tag-style="tagStyle"></jyf-parser> <jyf-parser :html="detail.mer_settlement_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
</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>
<view ></view>
</view> </view>
</view> </view>
<uni-popup ref="popup" type="bottom" @change="changePopup"> <uni-popup ref="popup" type="bottom" @change="changePopup">
<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">
@ -303,10 +302,11 @@
</view> </view>
</view> --> </view> -->
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle" style="display: flex;align-items: flex-start;">
<text class="item-name">公司名称:</text> <text class="item-name" style="flex-shrink: 0;">公司名称:</text>
<input type="text" placeholder="请输入公司名称" disabled v-model="merchantData.company_name" @input="validateBtn" <view style="font-size: 32rpx;flex: 1;">
placeholder-class='placeholder' /> {{merchantData.company_name}}
</view>
</view> </view>
</view> </view>
<view class="item"> <view class="item">
@ -615,6 +615,16 @@ import { Toast } from '../../libs/uniApi';
num: 10 num: 10
} }
}, },
watch: {
isFshow(n, o){
if(n) {
uni.hideTabBar();
}
else {
uni.showTabBar();
}
}
},
onPullDownRefresh() { onPullDownRefresh() {
this.getGoods(true).then(()=>{ this.getGoods(true).then(()=>{
@ -659,6 +669,7 @@ import { Toast } from '../../libs/uniApi';
}, },
//关闭弹窗 //关闭弹窗
close() { close() {
this.isFshow = false;
this.$refs.popup.close() this.$refs.popup.close()
this.num = 15 this.num = 15
}, },
@ -766,6 +777,7 @@ import { Toast } from '../../libs/uniApi';
intentionbus(that.merchantData).then(res => { intentionbus(that.merchantData).then(res => {
if (res.status == 200) { if (res.status == 200) {
this.isFshow = false;
this.$refs.popup.close() this.$refs.popup.close()
that.$util.Tips({ that.$util.Tips({
title: '提交成功' title: '提交成功'
@ -780,6 +792,7 @@ import { Toast } from '../../libs/uniApi';
}).catch(res => { }).catch(res => {
that.validate = true; that.validate = true;
this.num = 15 this.num = 15
this.isFshow = false;
this.$refs.popup.close() this.$refs.popup.close()
that.$util.Tips({ that.$util.Tips({
title: res title: res
@ -804,7 +817,6 @@ import { Toast } from '../../libs/uniApi';
//同意 //同意
agree() { agree() {
this.$refs.popup.open() this.$refs.popup.open()
this.isFshow = false
}, },
//拒绝 //拒绝
refuse() { refuse() {
@ -1333,8 +1345,6 @@ import { Toast } from '../../libs/uniApi';
.userpage { .userpage {
width: 100%; width: 100%;
background-color: #fff; background-color: #fff;
position: relative; position: relative;
} }
@ -1420,11 +1430,11 @@ import { Toast } from '../../libs/uniApi';
} }
.userpage-icon { .userpage-icon {
width: 60rpx; width: 90rpx;
height: 60rpx; height: 90rpx;
position: absolute; position: absolute;
top: 85rpx; top: 90rpx;
right: 60rpx; right: 30rpx;
image { image {
width: 100%; width: 100%;
@ -1434,11 +1444,12 @@ import { Toast } from '../../libs/uniApi';
.item-name { .item-name {
width: 190rpx; width: 190rpx;
font-size: 32rpx;
} }
.merchantsSettled { .merchantsSettled {
height: 100%; height: 100%;
padding-top: 100rpx; padding-top: 130rpx;
} }
@ -1510,13 +1521,13 @@ import { Toast } from '../../libs/uniApi';
.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;
@ -1581,7 +1592,7 @@ import { Toast } from '../../libs/uniApi';
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) {
@ -1633,7 +1644,7 @@ import { Toast } from '../../libs/uniApi';
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;
@ -1648,8 +1659,8 @@ import { Toast } from '../../libs/uniApi';
.settlementAgreement { .settlementAgreement {
width: 100%; width: 100vw;
height: 100%; height: 100vh;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
@ -1659,18 +1670,19 @@ import { Toast } from '../../libs/uniApi';
.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%);
overflow: hidden; overflow: hidden;
.content { .content {
height: 900rpx; height: 900rpx;
overflow-y: scroll; overflow-y: scroll;
@ -1709,7 +1721,7 @@ import { Toast } from '../../libs/uniApi';
line-height: 22px; line-height: 22px;
text-align: justify; text-align: justify;
text-justify: distribute-all-lines; text-justify: distribute-all-lines;
height: 68%; height: 76%;
overflow-y: scroll; overflow-y: scroll;
@ -1719,7 +1731,8 @@ import { Toast } from '../../libs/uniApi';
.setAgCountbtn { .setAgCountbtn {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
padding-bottom: 120rpx; padding-bottom: 30rpx;
position: relative;
.setAgCountbtna { .setAgCountbtna {
margin-top: 40rpx; margin-top: 40rpx;
@ -1769,6 +1782,23 @@ import { Toast } from '../../libs/uniApi';
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;
}
} }

11
pages/product/basicSet.vue
View File

@ -148,15 +148,15 @@
</view> </view>
<view class="item_cell flex_a_c"> <view class="item_cell flex_a_c">
<view class="sub_title flex_a_c">商户名称：</view> <view class="sub_title flex_a_c">商户名称：</view>
<input class="com_input" type="text" disabled v-model="mer_name"> <view class="com_input">{{mer_name}}</view>
</view> </view>
<view class="item_cell flex_a_c"> <view class="item_cell flex_a_c">
<view class="sub_title flex_a_c">商户分类：</view> <view class="sub_title flex_a_c">商户分类：</view>
<input class="com_input" type="text" disabled v-model="category_name"> <view class="com_input">{{category_name}}</view>
</view> </view>
<view class="item_cell flex_a_c"> <view class="item_cell flex_a_c">
<view class="sub_title flex_a_c">客服电话：</view> <view class="sub_title flex_a_c">客服电话：</view>
<input class="com_input" type="number" disabled v-model="servicePhone"> <view class="com_input">{{servicePhone}}</view>
</view> </view>
<!-- <view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" > <!-- <view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
@ -726,12 +726,17 @@
.sub_title { .sub_title {
font-size: 31.58rpx; font-size: 31.58rpx;
flex-shrink: 0;
} }
.item_cell { .item_cell {
padding: 31.58rpx 0; padding: 31.58rpx 0;
border-bottom: 1px solid #F7F7F7; border-bottom: 1px solid #F7F7F7;
.com_input{
flex: 1;
}
.ziti { .ziti {
margin-right: 21.05rpx; margin-right: 21.05rpx;
} }

BIN
static/images/close.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 24 KiB