|
|
@ -72,7 +72,7 @@ |
|
|
<scroll-view @scrolltolower="onReachPage" scroll-y style="width:100%;height: 620px;overflow: scroll;"> |
|
|
<scroll-view @scrolltolower="onReachPage" scroll-y style="width:100%;height: 620px;overflow: scroll;"> |
|
|
<view class="box1" v-for="(item,index) in pageData" :key="index"> |
|
|
<view class="box1" v-for="(item,index) in pageData" :key="index"> |
|
|
<view class="maotou" v-if="item.deliveryType == 1"> |
|
|
<view class="maotou" v-if="item.deliveryType == 1"> |
|
|
<text>{{item.numberCode.length>14 ?'多订单':item.numberCode}}</text> |
|
|
<text>{{item.numberCode.length>14 ?'多订单':item.numberCode | delPlus}}</text> |
|
|
</view> |
|
|
</view> |
|
|
<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;display: flex;"> |
|
|
<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;display: flex;"> |
|
|
<view v-if="item.deliveryType == 1" |
|
|
<view v-if="item.deliveryType == 1" |
|
|
@ -225,7 +225,7 @@ |
|
|
style="transform: scale(0.7);text-align: right;" /> |
|
|
style="transform: scale(0.7);text-align: right;" /> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
<scroll-view scroll-y="true" style="min-height: 500rpx;"> |
|
|
<scroll-view scroll-y="true" style="height: 660rpx;overflow-y: scroll;"> |
|
|
<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('waimai')" v-if="zhipaiCheck" |
|
|
<view @tap="allCheck('waimai')" v-if="zhipaiCheck" |
|
|
@ -302,14 +302,17 @@ |
|
|
style="margin-left:5px;"></uni-icons> --> |
|
|
style="margin-left:5px;"></uni-icons> --> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
|
|
|
<view style="width: 100%;height: 140rpx;line-height: 140rpx;text-align: center;"> |
|
|
|
|
|
没有更多了 |
|
|
|
|
|
</view> |
|
|
</scroll-view> |
|
|
</scroll-view> |
|
|
<view style="display: flex;position: absolute;bottom: 0;width: 93%;"> |
|
|
<view style="display: flex;position: absolute;bottom: 0;width: 93%;"> |
|
|
<view class="btn" @tap="selectRule"> |
|
|
|
|
|
确认规则 |
|
|
|
|
|
</view> |
|
|
|
|
|
<view class="btn" @tap="buchong"> |
|
|
<view class="btn" @tap="buchong"> |
|
|
补充规则 |
|
|
补充规则 |
|
|
</view> |
|
|
</view> |
|
|
|
|
|
<view class="btn" @tap="selectRule"> |
|
|
|
|
|
确认规则 |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</uni-popup> |
|
|
</uni-popup> |
|
|
@ -445,6 +448,12 @@ |
|
|
// 2. 删除所有大括号 { } 和双引号 " |
|
|
// 2. 删除所有大括号 { } 和双引号 " |
|
|
const result = str.replace(/[{}"]/g, ''); |
|
|
const result = str.replace(/[{}"]/g, ''); |
|
|
return result; |
|
|
return result; |
|
|
|
|
|
}, |
|
|
|
|
|
delPlus(data){ |
|
|
|
|
|
if (data.endsWith("+")) { |
|
|
|
|
|
data = data.slice(0, -1); // 删除最后一个字符 |
|
|
|
|
|
} |
|
|
|
|
|
return data; |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
methods: { |
|
|
methods: { |
|
|
@ -990,8 +999,7 @@ |
|
|
padding: 20rpx 20rpx 0; |
|
|
padding: 20rpx 20rpx 0; |
|
|
background: #fff; |
|
|
background: #fff; |
|
|
border-radius: 20rpx; |
|
|
border-radius: 20rpx; |
|
|
max-height: 1000rpx; |
|
|
height: 1000rpx; |
|
|
min-height: 640rpx; |
|
|
|
|
|
position: relative; |
|
|
position: relative; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|