root
/
school_uni
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

master
tianyi 4 weeks ago
parent
facbe14447
commit
0e0beaeab4
2 changed files with 81 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 144
      components/tab-bar/delivery.vue
  2. 2
      components/tab-bar/tab-bar.vue

144
components/tab-bar/delivery.vue
View File

@ -211,78 +211,85 @@
style="transform: scale(0.7);text-align: right;" /> style="transform: scale(0.7);text-align: right;" />
</view> </view>
</view> </view>
<view style="height: 50rpx;line-height: 50rpx;font-weight: 700;display: flex;"> <scroll-view scroll-y="true" style="max-height: 660rpx;">
外卖规则 <view style="height: 50rpx;line-height: 50rpx;font-weight: 700;display: flex;">
<view @tap="allCheck('waimai')" v-if="zhipaiCheck" style="color: #1E90FF;flex:1;text-align: right;padding-right: 20rpx;"> 外卖规则
全选 <view @tap="allCheck('waimai')" v-if="zhipaiCheck" style="color: #1E90FF;flex:1;text-align: right;padding-right: 20rpx;">
全选
</view>
</view> </view>
</view> <view class="guize1" v-for="(item, index) in waimaRuleList" :key="index"
<view class="guize1" v-for="(item, index) in waimaRuleList" :key="index" style="flex-direction: column; padding-bottom: 20rpx; border-bottom: 1px solid #ddd;position: relative;">
style="flex-direction: column; padding-bottom: 20rpx; border-bottom: 1px solid #ddd;position: relative;">
<view v-if="!zhipaiCheck" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;background: rgba(255, 255, 255, 0.5);"></view>
<view v-if="!zhipaiCheck" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;background: rgba(255, 255, 255, 0.5);"></view> <view style="display: flex; width: 100%;" @tap="checkVoucher(index,'waimai')">
<view style="display: flex; width: 100%;" @tap="checkVoucher(index,'waimai')"> <view class="guize1-qusong">
<view class="guize1-qusong"> <view class="qusong1">
<view class="qusong1"> 取
取 </view>
</view> <view class="qusong2">
<view class="qusong2"> {{item.getAreaName}}
{{item.getAreaName}} </view>
</view> </view>
</view> <view class="guize1-qusong">
<view class="guize1-qusong"> <view class="qusong1">
<view class="qusong1"> 送
送 </view>
<view class="qusong2" style="background: rgba(209, 206, 255, 1);">
{{item.putAreaName}}
</view>
</view> </view>
<view class="qusong2" style="background: rgba(209, 206, 255, 1);"> <view class="radio-check" v-if="item.isChecked">
{{item.putAreaName}} <uni-icons type="checkmarkempty" size="12"></uni-icons>
</view> </view>
<view class="radio-no-check" v-else></view>
<!-- <uni-icons type="closeempty" size="20" @click="selectRule(item)" color="#ff0000"
style="margin-left:5px;"></uni-icons> -->
</view> </view>
<view class="radio-check" v-if="item.isChecked">
<uni-icons type="checkmarkempty" size="12"></uni-icons>
</view>
<view class="radio-no-check" v-else></view>
<!-- <uni-icons type="closeempty" size="20" @click="selectRule(item)" color="#ff0000"
style="margin-left:5px;"></uni-icons> -->
</view> </view>
</view> <view style="height: 50rpx;line-height: 50rpx;font-weight: 700;display: flex;">
<view style="height: 50rpx;line-height: 50rpx;font-weight: 700;display: flex;"> 跑腿规则
跑腿规则 <view @tap="allCheck('paotui')" v-if="zhipaiCheck" style="color: #1E90FF;flex:1;text-align: right;padding-right: 20rpx;">
<view @tap="allCheck('paotui')" v-if="zhipaiCheck" style="color: #1E90FF;flex:1;text-align: right;padding-right: 20rpx;"> 全选
全选 </view>
</view> </view>
</view> <view class="guize1" v-for="(item, index) in paotuiRuleList" :key="index"
<view class="guize1" v-for="(item, index) in paotuiRuleList" :key="index" style="flex-direction: column; padding-bottom: 20rpx; border-bottom: 1px solid #ddd;position: relative;">
style="flex-direction: column; padding-bottom: 20rpx; border-bottom: 1px solid #ddd;position: relative;">
<view v-if="!zhipaiCheck" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;background: rgba(255, 255, 255, 0.5);"></view>
<view v-if="!zhipaiCheck" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;background: rgba(255, 255, 255, 0.5);"></view> <view style="display: flex; width: 100%;" @tap="checkVoucher(index,'paotui')">
<view style="display: flex; width: 100%;" @tap="checkVoucher(index,'paotui')"> <view class="guize1-qusong">
<view class="guize1-qusong"> <view class="qusong1">
<view class="qusong1"> 取
取 </view>
</view> <view class="qusong2">
<view class="qusong2"> {{item.getAreaName}}
{{item.getAreaName}} </view>
</view> </view>
</view> <view class="guize1-qusong">
<view class="guize1-qusong"> <view class="qusong1">
<view class="qusong1"> 送
送 </view>
<view class="qusong2" style="background: rgba(209, 206, 255, 1);">
{{item.putAreaName}}
</view>
</view> </view>
<view class="qusong2" style="background: rgba(209, 206, 255, 1);"> <view class="radio-check" v-if="item.isChecked">
{{item.putAreaName}} <uni-icons type="checkmarkempty" size="12"></uni-icons>
</view> </view>
<view class="radio-no-check" v-else></view>
<!-- <uni-icons type="closeempty" size="20" @click="selectRule(item)" color="#ff0000"
style="margin-left:5px;"></uni-icons> -->
</view> </view>
<view class="radio-check" v-if="item.isChecked">
<uni-icons type="checkmarkempty" size="12"></uni-icons>
</view>
<view class="radio-no-check" v-else></view>
<!-- <uni-icons type="closeempty" size="20" @click="selectRule(item)" color="#ff0000"
style="margin-left:5px;"></uni-icons> -->
</view> </view>
</view> </scroll-view>
<view class="btn" @tap="selectRule"> <view style="display: flex;position: absolute;bottom: 0;width: 93%;">
确认修改 <view class="btn" @tap="selectRule">
确认规则
</view>
<view class="btn" @tap="buchong">
补充规则
</view>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
@ -509,6 +516,13 @@
this.productData = item.goodsList; this.productData = item.goodsList;
this.$refs.productPopup.open() this.$refs.productPopup.open()
}, },
buchong(){
this.$refs.carPopup.close()
uni.navigateTo({
url:'/package1/myCenter/partTimeJobRegister'
})
},
selectRule(item) { selectRule(item) {
//TODO 这里应该改成 复选，选中的遍历再放进来 //TODO 这里应该改成 复选，选中的遍历再放进来
// let rule = { // let rule = {
@ -907,11 +921,12 @@
.guize-list { .guize-list {
width: 600rpx; width: 600rpx;
padding: 20rpx; padding: 20rpx 20rpx 0;
overflow: scroll;
background: #fff; background: #fff;
border-radius: 20rpx; border-radius: 20rpx;
max-height: 1000rpx; max-height: 1000rpx;
min-height: 640rpx;
position: relative;
} }
.zhipai-box { .zhipai-box {
@ -995,7 +1010,8 @@
border-radius: 100rpx; border-radius: 100rpx;
line-height: 100rpx; line-height: 100rpx;
text-align: center; text-align: center;
margin: 40rpx auto; margin: 20rpx 20rpx;
flex: 1;
} }
.code-box{ .code-box{
display: inline-block; display: inline-block;

2
components/tab-bar/tab-bar.vue
View File

@ -197,7 +197,7 @@
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
margin: 0 auto; margin: 0 auto;
display: flex; display: flex;
z-index: 999; z-index: 9;
border-top: 1px solid #eee; border-top: 1px solid #eee;
border-top-left-radius: 60rpx; border-top-left-radius: 60rpx;
border-top-right-radius: 60rpx; border-top-right-radius: 60rpx;

Write Preview
Loading…
Cancel
Save