mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui调整

Browse Source
This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-03-23 13:47:13 +08:00
parent 7fc82a6295
commit 29b4b93c41
7 changed files with 263 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/popups/index.vue
View File

@ -57,10 +57,10 @@
type: Boolean,
default: false
},
title: {
type: String,
default: '请输入支付密码'
}
title: {
type: String,
default: '请输入支付密码'
}
},
data() {
return {
@ -92,8 +92,9 @@
} else if (item == 'del') {
if (this.value == "0.")
this.value = this.value.substring(0, 0);
else
else {
this.value = this.value.substring(0, this.value.length - 1);
}
} else if (item == 0) {
if (this.isPay) {
this.value = this.value + item;
@ -132,9 +133,8 @@
},
// 开启
handleOpen() {
this.value = '';
console.log('123:' + this.value);
handleOpen(type) {
if (!type) this.value = "";
this.$refs.popup.open();
},

166
pages/helpPeople/formTable.vue
View File

@ -9,7 +9,8 @@
户主姓名
</view>
<view class="value">
<u--input v-model="formData.name" color='#7A7A7A' border="none"></u--input>
<u--input placeholder="请输入户主姓名" v-model="formData.name" color='#7A7A7A'
border="none"></u--input>
</view>
</view>
<view class="item">
@ -17,7 +18,8 @@
联系方式
</view>
<view class="value">
<u--input v-model="formData.contact" color='#7A7A7A' border="none"></u--input>
<u--input placeholder="请输入联系方式" v-model="formData.contact" color='#7A7A7A'
border="none"></u--input>
</view>
</view>
<view class="item">
@ -25,7 +27,8 @@
家庭人数
</view>
<view class="value">
<u--input v-model="formData.family_count" color='#7A7A7A' border="none"></u--input>
<u--input placeholder="请输入家庭人数" v-model="formData.family_count" color='#7A7A7A'
border="none"></u--input>
</view>
</view>
<view class="item">
@ -33,14 +36,15 @@
家庭地址
</view>
<view class="value" style="width: 400rpx;">
<u--input v-model="formData.address" color='#7A7A7A' border="none"></u--input>
<u--input placeholder="请输入家庭地址" v-model="formData.address" color='#7A7A7A'
border="none"></u--input>
</view>
</view>
</view>
</view>
<view class="tit">
<view class="">
<view class="help_people">
助民惠农
</view>
<view class="">
@ -52,8 +56,8 @@
<view class="">
<view class="card">
<view class="card-tit">
<view class="" style="font-size: 32rpx;color: #7A7A7A;display: flex;align-items: center;">
<view class="" :style="{color:SaveList[0]?'#FF5E0C':'' }">
<view class="" style="font-size: 32rpx;color: #20A162;display: flex;align-items: center;">
<view class="" :style="{color:SaveList[0]?'#20A162':'' }">
房子出租需求
</view>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/52556202401271437309444.png"
@ -61,12 +65,11 @@
@click='showFn(0)' />
</view>
<view class="" style="display: flex;align-items: center;color: #7A7A7A;" @click='open(0)'>
展开
<text :style="{color:SaveList[0]?'#20A162':'' }">{{SaveList[0]?'已完成':'展开'}}</text>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png"
width="24rpx" height="24rpx" class='icon'
:style=" {transform:isOpen[0]? 'rotate(180deg)' :'rotate(0)'} " />
</view>
</view>
</view>
<!-- :style="{height:isOpen[0]?'0':getFormHeight('#formheight')+'px',padding: isOpen[0]?'0':'20rpx' } " -->
@ -74,13 +77,13 @@
style="height: 0;padding: 0;">
<view id="formheight1">
<view class="form-tit">
<view class="" :style="{color:SaveList[0]?'#FF5E0C':'' }">
<view class="" :style="{color:SaveList[0]?'#20A162':'' }">
房子出租需求
</view>
<view class="submit" v-if='!SaveList[0]' @click="sava(0,'house_rent_info')">
保存
</view>
<view class="edit-btn" v-if='SaveList[0]' @click="edit(0)">
<view class="edit-btn edit-btn" v-if='SaveList[0]' @click="edit(0)">
编辑
</view>
</view>
@ -131,19 +134,16 @@
</view>
</view>
</view>
</view>
</view>
</view>
<!-- content -->
<!-- content -->
<view class="">
<view class="card">
<view class="card-tit">
<view class="" style="font-size: 32rpx;color: #7A7A7A;display: flex;align-items: center;">
<view class="" :style="{color:SaveList[1]?'#FF5E0C':'' }">
<view class="" :style="{color:SaveList[1]?'#20A162':'' }">
空闲土地出租需求
</view>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/52556202401271437309444.png"
@ -151,7 +151,7 @@
@click='showFn(1)' />
</view>
<view class="" style="display: flex;align-items: center;color: #7A7A7A;" @click='open(1)'>
展开
<text :style="{color:SaveList[1]?'#20A162':'' }">{{SaveList[1]?'已完成':'展开'}}</text>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png"
width="24rpx" height="24rpx" class='icon'
:style=" {transform:isOpen[1]? 'rotate(180deg)' :'rotate(0)'} " />
@ -170,7 +170,7 @@
<view class="submit" v-if='!SaveList[1]' @click="sava(1,'land_rent_info')">
保存
</view>
<view class="submit" v-if='SaveList[1]' @click="edit(1)">
<view class="submit edit-btn" v-if='SaveList[1]' @click="edit(1)">
编辑
</view>
</view>
@ -248,9 +248,7 @@
</view>
</view>
</view>
</view>
</view>
</view>
<!-- content -->
@ -258,7 +256,7 @@
<view class="card">
<view class="card-tit">
<view class="" style="font-size: 32rpx;color: #7A7A7A;display: flex;align-items: center;">
<view class="" :style="{color:SaveList[2]?'#FF5E0C':'' }">
<view class="" :style="{color:SaveList[2]?'#20A162':'' }">
农副产品出售需求
</view>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/52556202401271437309444.png"
@ -266,12 +264,11 @@
@click='showFn(2)' />
</view>
<view class="" style="display: flex;align-items: center;color: #7A7A7A;" @click='open(2)'>
展开
<text :style="{color:SaveList[2]?'#20A162':'' }">{{SaveList[2]?'已完成':'展开'}}</text>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png"
width="24rpx" height="24rpx" class='icon'
:style=" {transform:isOpen[2]? 'rotate(180deg)' :'rotate(0)'} " />
</view>
</view>
</view>
@ -285,7 +282,7 @@
<view class="submit" v-if='!SaveList[2]' @click="sava(2,'product_info')">
保存
</view>
<view class="submit" v-if='SaveList[2]' @click="edit(2)">
<view class="submit edit-btn" v-if='SaveList[2]' @click="edit(2)">
编辑
</view>
</view>
@ -435,9 +432,7 @@
</view>
</view>
</view>
</view>
</view>
</view>
<!-- content -->
@ -446,7 +441,7 @@
<view class="card">
<view class="card-tit">
<view class="" style="font-size: 32rpx;color: #7A7A7A;display: flex;align-items: center;">
<view class="" :style="{color:SaveList[3]?'#FF5E0C':'' }">
<view class="" :style="{color:SaveList[3]?'#20A162':'' }">
空闲资产出租/出售需求
</view>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/52556202401271437309444.png"
@ -454,12 +449,11 @@
@click='showFn(3)' />
</view>
<view class="" style="display: flex;align-items: center;color: #7A7A7A;" @click='open(3)'>
展开
<text :style="{color:SaveList[3]?'#20A162':'' }">{{SaveList[3]?'已完成':'展开'}}</text>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png"
width="24rpx" height="24rpx" class='icon'
:style=" {transform:isOpen[3]? 'rotate(180deg)' :'rotate(0)'} " />
</view>
</view>
</view>
@ -473,7 +467,7 @@
<view class="submit" v-if='!SaveList[3]' @click="sava(3,'idle_asset_rent_info')">
保存
</view>
<view class="submit" v-if='SaveList[3]' @click="edit(3)">
<view class="submit edit-btn" v-if='SaveList[3]' @click="edit(3)">
编辑
</view>
</view>
@ -524,10 +518,7 @@
</view>
</view>
</view>
</view>
</view>
</view>
<!-- content -->
@ -536,7 +527,7 @@
<view class="card">
<view class="card-tit">
<view class="" style="font-size: 32rpx;color: #7A7A7A;display: flex;align-items: center;">
<view class="" :style="{color:SaveList[4]?'#FF5E0C':'' }">
<view class="" :style="{color:SaveList[4]?'#20A162':'' }">
房屋装饰建设
</view>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/52556202401271437309444.png"
@ -544,7 +535,7 @@
@click='showFn(4)' />
</view>
<view class="" style="display: flex;align-items: center;color: #7A7A7A;" @click='open(4)'>
展开
<text :style="{color:SaveList[4]?'#20A162':'' }">{{SaveList[4]?'已完成':'展开'}}</text>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png"
width="24rpx" height="24rpx" class='icon'
:style=" {transform:isOpen[4]? 'rotate(180deg)' :'rotate(0)'} " />
@ -563,7 +554,7 @@
<view class="submit" v-if='!SaveList[4]' @click="sava(4,'house_decoration_construction')">
保存
</view>
<view class="submit" v-if='SaveList[4]' @click="edit(4)">
<view class="submit edit-btn" v-if='SaveList[4]' @click="edit(4)">
编辑
</view>
</view>
@ -623,14 +614,12 @@
</view>
</view>
</view>
</view>
</view>
</view>
<!-- content -->
<view class="login-btn" @click="submit"
:style="{background:saveNum<2 ? '#F5F5F5':'',color:saveNum<2 ? '#ADADAD':'' }">
<view class="login-btn" @click="submit" :class="{'login-btn-no':saveNum < 2 ?true:false}">
确认提交
</view>
@ -650,7 +639,6 @@
</view>
</view>
</u-overlay>
</view>
</template>
@ -890,7 +878,7 @@
</script>
<style lang="scss" scoped>
.box {
background: linear-gradient(to bottom, #FFF4DB, #FFEAC3);
background: #F5F5F5;
min-height: 100vh;
font-size: 28rpx;
padding-bottom: 5vh;
@ -899,16 +887,15 @@
.bg {
width: 750rpx;
height: 660rpx;
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/44f25202401271436185198.png');
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/c7e26202402261051094476.webp');
background-size: 100% 100%;
position: relative;
}
.user-info {
width: 750rpx;
width: 686rpx;
margin: 0 auto;
height: 550rpx;
// height: 550rpx;
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/549b3202401271438211224.png');
background-size: 100% 100%;
position: absolute;
@ -916,29 +903,34 @@
left: 50%;
transform: translateX(-50%);
box-sizing: border-box;
padding: 70rpx;
padding: 36rpx 40rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
box-shadow: 0rpx 3rpx 12rpx 1rpx #D6D6D6;
background: #FFFFFF;
box-shadow: 0rpx 3rpx 12rpx 1rpx #D6D6D6;
border-radius: 40rpx 40rpx 40rpx 40rpx;
}
.item {
display: flex;
align-items: center;
padding-bottom: 30rpx;
border-bottom: 1px solid #FFF2D9;
padding-top: 10rpx;
// background-color: red;
margin-bottom: 10rpx;
margin-bottom: 56rpx;
&:nth-last-child(1) {
margin-bottom: 0;
}
.lable {
font-size: 28rpx;
color: #2E2E2E;
font-weight: 700;
width: 112rpx;
font-weight: 600;
font-size: 26rpx;
color: #262626;
text-align: center;
white-space: nowrap;
}
.value {
@ -951,10 +943,11 @@
.tit {
display: flex;
width: 638rpx;
margin: 230rpx auto 30rpx;
margin: 180rpx auto 30rpx;
justify-content: space-between;
font-size: 28rpx;
color: #2E2E2E;
font-weight: 600;
}
.card {
@ -996,23 +989,17 @@
color: white;
}
// right: 0;
}
}
.card-content {
background-color: #FFE7B9;
border-radius: 20rpx;
padding: 20rpx;
overflow: hidden;
transition: 300ms;
width: 690rpx;
margin: 30rpx auto;
background: #DFF6E0;
.form {
background-color: #fff;
@ -1023,7 +1010,7 @@
.form-tit {
font-size: 32rpx;
color: #FF5E0C;
color: #20A162;
display: flex;
align-items: center;
display: flex;
@ -1032,33 +1019,31 @@
.submit {
width: 162rpx;
height: 58rpx;
background: #FD7F4A;
border-radius: 48rpx 48rpx 48rpx 48rpx;
line-height: 58rpx;
border-radius: 48rpx;
opacity: 1;
color: white;
text-align: center;
line-height: 58rpx;
background: linear-gradient(158deg, #20A162 0%, #41B745 100%);
box-shadow: 0rpx 1rpx 2rpx 1rpx #127A19, inset 0rpx 3rpx 4rpx 1rpx #7CDF80;
}
.edit-btn {
width: 162rpx;
width: 132rpx;
height: 58rpx;
// background: #FD7F4A;
color: #FD7F4A !important;
border: 1px solid #FD7F4A;
border-radius: 48rpx 48rpx 48rpx 48rpx;
opacity: 1;
color: white;
line-height: 58rpx;
border-radius: 48rpx;
color: #20A162 !important;
text-align: center;
line-height: 50rpx;
box-shadow: 0rpx 1rpx 2rpx 1rpx #2B8131;
border: 1rpx solid #20A162;
background: transparent;
}
.submit:active {
background-color: grey;
}
}
}
.icon {
@ -1074,10 +1059,9 @@
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/56970202401271438059755.png');
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/025fc202402261139275710.webp');
background-size: 100% 100%;
.toast-tit {
text-align: center;
font-size: 32rpx;
@ -1092,7 +1076,6 @@
font-size: 28rpx;
color: #7A7A7A;
line-height: 42rpx;
}
.off {
@ -1105,18 +1088,23 @@
.login-btn {
width: 690rpx;
height: 88rpx;
background: #FF8056;
border-radius: 44rpx 44rpx 44rpx 44rpx;
opacity: 1;
text-align: center;
line-height: 88rpx;
background: linear-gradient(323deg, #52C973 0%, #20A162 100%);
border-radius: 44rpx;
color: #FFFFFF;
font-weight: 600;
font-size: 30rpx;
color: white;
margin: 50rpx auto;
text-align: center;
margin: 0 auto;
}
.login-btn-no {
background: transparent;
color: #ADADAD;
}
.login-btn:active {
background-color: grey;
opacity: .9;
}
.bg_back {

168
pages/helpPeople/formTable_green.vue → pages/helpPeople/formTable1.vue
View File

@ -9,8 +9,7 @@
户主姓名
</view>
<view class="value">
<u--input placeholder="请输入户主姓名" v-model="formData.name" color='#7A7A7A'
border="none"></u--input>
<u--input v-model="formData.name" color='#7A7A7A' border="none"></u--input>
</view>
</view>
<view class="item">
@ -18,8 +17,7 @@
联系方式
</view>
<view class="value">
<u--input placeholder="请输入联系方式" v-model="formData.contact" color='#7A7A7A'
border="none"></u--input>
<u--input v-model="formData.contact" color='#7A7A7A' border="none"></u--input>
</view>
</view>
<view class="item">
@ -27,8 +25,7 @@
家庭人数
</view>
<view class="value">
<u--input placeholder="请输入家庭人数" v-model="formData.family_count" color='#7A7A7A'
border="none"></u--input>
<u--input v-model="formData.family_count" color='#7A7A7A' border="none"></u--input>
</view>
</view>
<view class="item">
@ -36,15 +33,14 @@
家庭地址
</view>
<view class="value" style="width: 400rpx;">
<u--input placeholder="请输入家庭地址" v-model="formData.address" color='#7A7A7A'
border="none"></u--input>
<u--input v-model="formData.address" color='#7A7A7A' border="none"></u--input>
</view>
</view>
</view>
</view>
<view class="tit">
<view class="help_people">
<view class="">
助民惠农
</view>
<view class="">
@ -56,8 +52,8 @@
<view class="">
<view class="card">
<view class="card-tit">
<view class="" style="font-size: 32rpx;color: #20A162;display: flex;align-items: center;">
<view class="" :style="{color:SaveList[0]?'#20A162':'' }">
<view class="" style="font-size: 32rpx;color: #7A7A7A;display: flex;align-items: center;">
<view class="" :style="{color:SaveList[0]?'#FF5E0C':'' }">
房子出租需求
</view>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/52556202401271437309444.png"
@ -65,11 +61,12 @@
@click='showFn(0)' />
</view>
<view class="" style="display: flex;align-items: center;color: #7A7A7A;" @click='open(0)'>
<text :style="{color:SaveList[0]?'#20A162':'' }">{{SaveList[0]?'已完成':'展开'}}</text>
展开
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png"
width="24rpx" height="24rpx" class='icon'
:style=" {transform:isOpen[0]? 'rotate(180deg)' :'rotate(0)'} " />
</view>
</view>
</view>
<!-- :style="{height:isOpen[0]?'0':getFormHeight('#formheight')+'px',padding: isOpen[0]?'0':'20rpx' } " -->
@ -77,13 +74,13 @@
style="height: 0;padding: 0;">
<view id="formheight1">
<view class="form-tit">
<view class="" :style="{color:SaveList[0]?'#20A162':'' }">
<view class="" :style="{color:SaveList[0]?'#FF5E0C':'' }">
房子出租需求
</view>
<view class="submit" v-if='!SaveList[0]' @click="sava(0,'house_rent_info')">
保存
</view>
<view class="edit-btn edit-btn" v-if='SaveList[0]' @click="edit(0)">
<view class="edit-btn" v-if='SaveList[0]' @click="edit(0)">
编辑
</view>
</view>
@ -134,16 +131,19 @@
</view>
</view>
</view>
</view>
</view>
</view>
<!-- content -->
<view class="">
<view class="card">
<view class="card-tit">
<view class="" style="font-size: 32rpx;color: #7A7A7A;display: flex;align-items: center;">
<view class="" :style="{color:SaveList[1]?'#20A162':'' }">
<view class="" :style="{color:SaveList[1]?'#FF5E0C':'' }">
空闲土地出租需求
</view>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/52556202401271437309444.png"
@ -151,7 +151,7 @@
@click='showFn(1)' />
</view>
<view class="" style="display: flex;align-items: center;color: #7A7A7A;" @click='open(1)'>
<text :style="{color:SaveList[1]?'#20A162':'' }">{{SaveList[1]?'已完成':'展开'}}</text>
展开
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png"
width="24rpx" height="24rpx" class='icon'
:style=" {transform:isOpen[1]? 'rotate(180deg)' :'rotate(0)'} " />
@ -170,7 +170,7 @@
<view class="submit" v-if='!SaveList[1]' @click="sava(1,'land_rent_info')">
保存
</view>
<view class="submit edit-btn" v-if='SaveList[1]' @click="edit(1)">
<view class="submit" v-if='SaveList[1]' @click="edit(1)">
编辑
</view>
</view>
@ -248,7 +248,9 @@
</view>
</view>
</view>
</view>
</view>
</view>
<!-- content -->
@ -256,7 +258,7 @@
<view class="card">
<view class="card-tit">
<view class="" style="font-size: 32rpx;color: #7A7A7A;display: flex;align-items: center;">
<view class="" :style="{color:SaveList[2]?'#20A162':'' }">
<view class="" :style="{color:SaveList[2]?'#FF5E0C':'' }">
农副产品出售需求
</view>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/52556202401271437309444.png"
@ -264,11 +266,12 @@
@click='showFn(2)' />
</view>
<view class="" style="display: flex;align-items: center;color: #7A7A7A;" @click='open(2)'>
<text :style="{color:SaveList[2]?'#20A162':'' }">{{SaveList[2]?'已完成':'展开'}}</text>
展开
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png"
width="24rpx" height="24rpx" class='icon'
:style=" {transform:isOpen[2]? 'rotate(180deg)' :'rotate(0)'} " />
</view>
</view>
</view>
@ -282,7 +285,7 @@
<view class="submit" v-if='!SaveList[2]' @click="sava(2,'product_info')">
保存
</view>
<view class="submit edit-btn" v-if='SaveList[2]' @click="edit(2)">
<view class="submit" v-if='SaveList[2]' @click="edit(2)">
编辑
</view>
</view>
@ -432,7 +435,9 @@
</view>
</view>
</view>
</view>
</view>
</view>
<!-- content -->
@ -441,7 +446,7 @@
<view class="card">
<view class="card-tit">
<view class="" style="font-size: 32rpx;color: #7A7A7A;display: flex;align-items: center;">
<view class="" :style="{color:SaveList[3]?'#20A162':'' }">
<view class="" :style="{color:SaveList[3]?'#FF5E0C':'' }">
空闲资产出租/出售需求
</view>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/52556202401271437309444.png"
@ -449,11 +454,12 @@
@click='showFn(3)' />
</view>
<view class="" style="display: flex;align-items: center;color: #7A7A7A;" @click='open(3)'>
<text :style="{color:SaveList[3]?'#20A162':'' }">{{SaveList[3]?'已完成':'展开'}}</text>
展开
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png"
width="24rpx" height="24rpx" class='icon'
:style=" {transform:isOpen[3]? 'rotate(180deg)' :'rotate(0)'} " />
</view>
</view>
</view>
@ -467,7 +473,7 @@
<view class="submit" v-if='!SaveList[3]' @click="sava(3,'idle_asset_rent_info')">
保存
</view>
<view class="submit edit-btn" v-if='SaveList[3]' @click="edit(3)">
<view class="submit" v-if='SaveList[3]' @click="edit(3)">
编辑
</view>
</view>
@ -518,7 +524,10 @@
</view>
</view>
</view>
</view>
</view>
</view>
<!-- content -->
@ -527,7 +536,7 @@
<view class="card">
<view class="card-tit">
<view class="" style="font-size: 32rpx;color: #7A7A7A;display: flex;align-items: center;">
<view class="" :style="{color:SaveList[4]?'#20A162':'' }">
<view class="" :style="{color:SaveList[4]?'#FF5E0C':'' }">
房屋装饰建设
</view>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/52556202401271437309444.png"
@ -535,7 +544,7 @@
@click='showFn(4)' />
</view>
<view class="" style="display: flex;align-items: center;color: #7A7A7A;" @click='open(4)'>
<text :style="{color:SaveList[4]?'#20A162':'' }">{{SaveList[4]?'已完成':'展开'}}</text>
展开
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png"
width="24rpx" height="24rpx" class='icon'
:style=" {transform:isOpen[4]? 'rotate(180deg)' :'rotate(0)'} " />
@ -554,7 +563,7 @@
<view class="submit" v-if='!SaveList[4]' @click="sava(4,'house_decoration_construction')">
保存
</view>
<view class="submit edit-btn" v-if='SaveList[4]' @click="edit(4)">
<view class="submit" v-if='SaveList[4]' @click="edit(4)">
编辑
</view>
</view>
@ -614,12 +623,14 @@
</view>
</view>
</view>
</view>
</view>
</view>
<!-- content -->
<view class="login-btn" @click="submit" :class="{'login-btn-no':saveNum < 2 ?true:false}">
<view class="login-btn" @click="submit"
:style="{background:saveNum<2 ? '#F5F5F5':'',color:saveNum<2 ? '#ADADAD':'' }">
确认提交
</view>
@ -639,6 +650,7 @@
</view>
</view>
</u-overlay>
</view>
</template>
@ -878,7 +890,7 @@
</script>
<style lang="scss" scoped>
.box {
background: #F5F5F5;
background: linear-gradient(to bottom, #FFF4DB, #FFEAC3);
min-height: 100vh;
font-size: 28rpx;
padding-bottom: 5vh;
@ -887,15 +899,16 @@
.bg {
width: 750rpx;
height: 660rpx;
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/c7e26202402261051094476.webp');
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/44f25202401271436185198.png');
background-size: 100% 100%;
position: relative;
}
.user-info {
width: 686rpx;
width: 750rpx;
margin: 0 auto;
// height: 550rpx;
height: 550rpx;
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/549b3202401271438211224.png');
background-size: 100% 100%;
position: absolute;
@ -903,34 +916,29 @@
left: 50%;
transform: translateX(-50%);
box-sizing: border-box;
padding: 36rpx 40rpx;
padding: 70rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
box-shadow: 0rpx 3rpx 12rpx 1rpx #D6D6D6;
background: #FFFFFF;
box-shadow: 0rpx 3rpx 12rpx 1rpx #D6D6D6;
border-radius: 40rpx 40rpx 40rpx 40rpx;
}
.item {
display: flex;
align-items: center;
margin-bottom: 56rpx;
padding-bottom: 30rpx;
border-bottom: 1px solid #FFF2D9;
padding-top: 10rpx;
// background-color: red;
margin-bottom: 10rpx;
&:nth-last-child(1) {
margin-bottom: 0;
}
.lable {
font-weight: 600;
font-size: 26rpx;
color: #262626;
font-size: 28rpx;
color: #2E2E2E;
font-weight: 700;
width: 112rpx;
text-align: center;
white-space: nowrap;
}
.value {
@ -943,11 +951,10 @@
.tit {
display: flex;
width: 638rpx;
margin: 180rpx auto 30rpx;
margin: 230rpx auto 30rpx;
justify-content: space-between;
font-size: 28rpx;
color: #2E2E2E;
font-weight: 600;
}
.card {
@ -989,17 +996,23 @@
color: white;
}
// right: 0;
}
}
.card-content {
background-color: #FFE7B9;
border-radius: 20rpx;
padding: 20rpx;
overflow: hidden;
transition: 300ms;
width: 690rpx;
margin: 30rpx auto;
background: #DFF6E0;
.form {
background-color: #fff;
@ -1010,7 +1023,7 @@
.form-tit {
font-size: 32rpx;
color: #20A162;
color: #FF5E0C;
display: flex;
align-items: center;
display: flex;
@ -1019,31 +1032,33 @@
.submit {
width: 162rpx;
height: 58rpx;
line-height: 58rpx;
border-radius: 48rpx;
background: #FD7F4A;
border-radius: 48rpx 48rpx 48rpx 48rpx;
opacity: 1;
color: white;
text-align: center;
background: linear-gradient(158deg, #20A162 0%, #41B745 100%);
box-shadow: 0rpx 1rpx 2rpx 1rpx #127A19, inset 0rpx 3rpx 4rpx 1rpx #7CDF80;
line-height: 58rpx;
}
.edit-btn {
width: 132rpx;
width: 162rpx;
height: 58rpx;
line-height: 58rpx;
border-radius: 48rpx;
color: #20A162 !important;
// background: #FD7F4A;
color: #FD7F4A !important;
border: 1px solid #FD7F4A;
border-radius: 48rpx 48rpx 48rpx 48rpx;
opacity: 1;
color: white;
text-align: center;
box-shadow: 0rpx 1rpx 2rpx 1rpx #2B8131;
border: 1rpx solid #20A162;
background: transparent;
line-height: 50rpx;
}
.submit:active {
background-color: grey;
}
}
}
.icon {
@ -1059,9 +1074,10 @@
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/025fc202402261139275710.webp');
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/56970202401271438059755.png');
background-size: 100% 100%;
.toast-tit {
text-align: center;
font-size: 32rpx;
@ -1076,6 +1092,7 @@
font-size: 28rpx;
color: #7A7A7A;
line-height: 42rpx;
}
.off {
@ -1088,23 +1105,18 @@
.login-btn {
width: 690rpx;
height: 88rpx;
line-height: 88rpx;
background: linear-gradient(323deg, #52C973 0%, #20A162 100%);
border-radius: 44rpx;
color: #FFFFFF;
font-weight: 600;
font-size: 30rpx;
background: #FF8056;
border-radius: 44rpx 44rpx 44rpx 44rpx;
opacity: 1;
text-align: center;
margin: 0 auto;
}
.login-btn-no {
background: transparent;
color: #ADADAD;
line-height: 88rpx;
font-size: 30rpx;
color: white;
margin: 50rpx auto;
}
.login-btn:active {
opacity: .9;
background-color: grey;
}
.bg_back {

37
pages/helpPeople/helpPeople.vue
View File

@ -3,16 +3,17 @@
<view class="box" style="position: relative;">
<image @click="back" class="bg_back"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/back.png"></image>
<view class="li" @click="navSw('/pages/index/index')">
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/edf53202401271436507555.png" width="690rpx"
height="200rpx" style="position: absolute;" />
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/3b48a202402260945419661.webp" width="690rpx"
height="200rpx" style="position: absolute;"></u--image>
<view class="btn">
我是居民用户
</view>
</view>
<view class="li" style="margin-top: 50rpx;" @click="navgo('/pages/helpPeople/formTable')">
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/8489c202401271437055619.png" width="690rpx"
height="200rpx" style="position: absolute;" />
<u-image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/48aed202402260946123969.webp" width="690rpx"
height="200rpx" style="position: absolute;"></u-image>
<view class="btn">
我是农民用户
</view>
@ -22,6 +23,11 @@
<script>
export default {
data() {
return {
current: 0
}
},
methods: {
back() {
uni.navigateBack();
@ -41,14 +47,20 @@
</script>
<style lang='scss' scoped>
.box {
width: 750rpx;
height: 1624rpx;
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/9c4b4202401271437449183.png');
background-size: 100% 100%;
padding-top: 500rpx;
page {
height: 100%;
overflow: hidden;
background-image: linear-gradient(180deg, #20A162 0%, #EFFAEF 39%, #EFFCEA 68%, #EFFFE5 100%);
}
.box {
width: 750rpx;
height: 100vh;
background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1333d202402261025145680.webp);
background-repeat: no-repeat;
background-size: 100% auto;
padding-top: 500rpx;
}
.li {
margin: 0rpx auto;
@ -64,14 +76,13 @@
height: 76rpx;
border-radius: 40rpx 40rpx 40rpx 40rpx;
opacity: 1;
border: 2rpx solid #FF5E0C;
border: 2rpx solid #20A162;
text-align: center;
line-height: 76rpx;
color: #FF5E0C;
color: #20A162;
font-size: 34rpx;
right: 50rpx;
bottom: 50rpx;
}
}

33
pages/helpPeople/helpPeople_green.vue → pages/helpPeople/helpPeople1.vue
View File

@ -3,17 +3,16 @@
<view class="box" style="position: relative;">
<image @click="back" class="bg_back"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/back.png"></image>
<view class="li" @click="navSw('/pages/index/index')">
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/3b48a202402260945419661.webp" width="690rpx"
height="200rpx" style="position: absolute;"></u--image>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/edf53202401271436507555.png" width="690rpx"
height="200rpx" style="position: absolute;" />
<view class="btn">
我是居民用户
</view>
</view>
<view class="li" style="margin-top: 50rpx;" @click="navgo('/pages/helpPeople/formTable')">
<u-image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/48aed202402260946123969.webp" width="690rpx"
height="200rpx" style="position: absolute;"></u-image>
<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/8489c202401271437055619.png" width="690rpx"
height="200rpx" style="position: absolute;" />
<view class="btn">
我是农民用户
</view>
@ -23,11 +22,6 @@
<script>
export default {
data() {
return {
current: 0
}
},
methods: {
back() {
uni.navigateBack();
@ -47,21 +41,15 @@
</script>
<style lang='scss' scoped>
page {
height: 100%;
overflow: hidden;
background-image: linear-gradient(180deg, #20A162 0%, #EFFAEF 39%, #EFFCEA 68%, #EFFFE5 100%);
}
.box {
width: 750rpx;
height: 100vh;
background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1333d202402261025145680.webp);
background-repeat: no-repeat;
background-size: 100% auto;
height: 1624rpx;
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/9c4b4202401271437449183.png');
background-size: 100% 100%;
padding-top: 500rpx;
}
.li {
margin: 0rpx auto;
width: 690rpx;
@ -76,13 +64,14 @@
height: 76rpx;
border-radius: 40rpx 40rpx 40rpx 40rpx;
opacity: 1;
border: 2rpx solid #20A162;
border: 2rpx solid #FF5E0C;
text-align: center;
line-height: 76rpx;
color: #20A162;
color: #FF5E0C;
font-size: 34rpx;
right: 50rpx;
bottom: 50rpx;
}
}

79
pages/payment/get_payment.vue
View File

@ -7,9 +7,9 @@
</u-navbar>
</view>
<!-- #endif -->
<!-- #ifdef H5 -->
<view style="height: 100rpx;"></view>
<!-- #endif -->
<!-- #ifdef H5 -->
<view style="height: 100rpx;"></view>
<!-- #endif -->
<view style="height: 50rpx;"></view>
<view class="wrap">
<view class="shop">
@ -50,7 +50,8 @@
</view>
<view class="v-btn-wrap" @click="cartForm.total_amount?submitOrder():null">
<view class="v-btn">{{Number(cartForm.total_amount||0).toFixed(2)}}元 确认支付</view>
<u-button class="v-btn" :loading="loading"
:text="Number(cartForm.total_amount||0).toFixed(2)+'元 确认支付'"></u-button>
</view>
<!-- 登陆 -->
@ -124,7 +125,8 @@
changeTxt: '展开',
isOpen: false,
keyBoardShow: false,
mer_name: ''
mer_name: '',
loading: false
}
},
@ -161,7 +163,7 @@
})
}
} else {
this.$refs.popups.handleOpen();
this.$refs.popups.handleOpen('money');
}
},
@ -207,6 +209,7 @@
title: "请输入付款金额！"
})
}
this.loading = true;
// 循环加入购物车
for (var i = 0; i < that.merchantInfo.length; i++) {
@ -232,25 +235,37 @@
if (that.checkForm.cart_id && that.checkForm.cart_id.length > 0) {
orderCheck(that.checkForm).then(res1 => {
that.loading = false;
uni.navigateTo({
url: "/pages/payment/settlement",
success: (res) => {
uni.setStorageSync('datas', {
res.eventChannel.emit('acceptDataFromOpenedPage', {
platformConsumption: res1.data.platformConsumption ||
[],
productData: that.merchantInfo,
checkForm: that.checkForm,
money: that.cartForm.total_amount,
merName: that.mer_name,
money: that.cartForm.total_amount,
key: res1.data.key
})
// uni.setStorageSync('datas', {
// platformConsumption: res1.data.platformConsumption ||
// [],
// productData: that.merchantInfo,
// checkForm: that.checkForm,
// merName: that.mer_name,
// money: that.cartForm.total_amount,
// key: res1.data.key
// })
},
fail(err) {
console.log(err)
}
})
}).catch(err => {
that.loading = false;
Toast(err.message || err)
});
}
@ -263,16 +278,19 @@
// 根据店铺获取商品
getProductInfoByMerid(merid, money) {
this.loading = true;
getProductInfo({
mer_id: that.mer_id,
money: that.cartForm.total_amount
}).then(res => {
this.loading = false;
if (!that.cartForm.total_amount) {
this.mer_name = res.data.merchant;
} else {
that.merchantInfo = res.data.list;
}
}).catch((err) => {
that.loading = false;
that.$util.Tips({
title: err.message || err.msg || err
}, () => {
@ -490,45 +508,24 @@
}
.v-btn-wrap {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 90rpx;
line-height: 90rpx;
background: #40AE36;
border-radius: 10rpx;
font-weight: 400;
font-size: 32rpx;
color: #FFFFFF;
text-align: center;
// position: fixed;
// z-index: 11;
// bottom: 0;
// left: 0;
// display: flex;
// justify-content: center;
// align-items: center;
// width: 100%;
// height: 240rpx;
// background-color: #FDD6A6;
/deep/.u-button {
background: transparent;
color: #fff;
height: 100%;
}
// .v-btn {
// width: 650rpx;
// height: 100rpx;
// line-height: 100rpx;
// background: #FF8056;
// box-shadow: 0rpx 3rpx 3rpx 1rpx rgba(255, 94, 12, 0.4);
// border-radius: 55rpx 55rpx 55rpx 55rpx;
// border: 1rpx solid #FF8056;
// font-weight: 600;
// font-size: 32rpx;
// color: #FFFFFF;
// text-align: center;
// &:active {
// opacity: .8;
// }
// }
/deep/.u-loading-icon__spinner {
color: #fff !important;
margin-right: 10rpx;
}
}
}
</style>

29
pages/payment/settlement.vue
View File

@ -307,19 +307,20 @@
// start_time: "2024-03-02 14:15:17",
// uid: 889
// }]
let that = this;
const eventChannel = this.getOpenerEventChannel();
eventChannel.on('acceptDataFromOpenedPage', function(data) {
that.productData = data.productData;
that.platformConsumption = data.platformConsumption || [];
let data = uni.getStorageSync("datas");
this.productData = data.productData;
this.platformConsumption = data.platformConsumption || [];
this.checkForm.cart_id = data.checkForm.cart_id;
this.payForm.cart_id = this.checkForm.cart_id;
this.payForm.money = data.money;
this.payForm.merName = data.merName;
this.payForm.key = data.key;
this.total_coupon = data.money;
this.checkForm.key = data.key;
that.checkForm.cart_id = data.checkForm.cart_id;
that.payForm.cart_id = that.checkForm.cart_id;
that.payForm.money = data.money;
that.payForm.merName = data.merName;
that.payForm.key = data.key;
that.total_coupon = data.money;
that.checkForm.key = data.key;
});
// #ifdef H5
this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
@ -585,8 +586,8 @@
if (!that.payType) return that.$util.Tips({
title: '请选择支付方式'
});
if (that.payType == 'balance' && +this.userInfo.now_money < +this.payForm.money) {
return that.$util.Tips({
title: '余额不足，请选择其他的支付方式！'