tianyi 3 weeks ago
parent
commit
4930a633cd
  1. 62
      package1/address/addressList.vue
  2. 4
      package1/buyFood/buyFood.vue
  3. 58
      package1/goods/goodsDetail.vue
  4. 36
      package1/group/groupBuyDetail.vue
  5. 22
      package1/group/groupBuyList.vue
  6. 228
      package1/group/groupBuySingle.vue
  7. 16
      package1/group/searchGroup.vue
  8. 92
      package1/group/shopEvaluate.vue
  9. 4
      package1/index/deliveryPersonList.vue
  10. 88
      package1/myCenter/addGoods.vue
  11. 24
      package1/myCenter/addType.vue
  12. 2
      package1/myCenter/couponList.vue
  13. 6
      package1/myCenter/dataStatistics.vue
  14. 38
      package1/myCenter/goodsList.vue
  15. 60
      package1/myCenter/merchantCenter.vue
  16. 4
      package1/myCenter/myMerchant.vue
  17. 156
      package1/myCenter/partTimeJobRegister.vue
  18. 42
      package1/order/orderConfirm.vue
  19. 154
      package1/order/orderDetail.vue
  20. 86
      package1/order/orderEvaluate.vue
  21. 12
      package1/order/orderList.vue
  22. 84
      package1/order/pendGroup.vue

62
package1/address/addressList.vue

@ -1,34 +1,34 @@
<template> <template>
<view class="address-popup-box"> <view class="address-popup-box">
<view style="height: 60px;line-height: 60px;font-size: 18px;font-weight: 700;text-align: center;position:relative;"> <view style="height: 120rpx;line-height: 120rpx;font-size: 36rpx;font-weight: 700;text-align: center;position:relative;">
收货地址 收货地址
<uni-icons type="closeempty" size="24" @tap="$emit('close')" style="position:absolute;right:15px;top:18px;"></uni-icons> <uni-icons type="closeempty" size="24" @tap="$emit('close')" style="position:absolute;right:30rpx;top:36rpx;"></uni-icons>
</view> </view>
<view style="padding-bottom: 70px;"> <view style="padding-bottom: 140rpx;">
<view v-for="(item, index) in addressList" :key="index" @tap="selectAddress(item)" <view v-for="(item, index) in addressList" :key="index" @tap="selectAddress(item)"
style="margin-bottom: 10px;display: flex;padding: 10px 20px 20px;background: #eee;border-radius: 10px;"> style="margin-bottom: 20rpx;display: flex;padding: 20rpx 40rpx 40rpx;background: #eee;border-radius: 20rpx;">
<view style="flex: 1;"> <view style="flex: 1;">
<view style="height: 35px;line-height: 35px;display: flex;align-items: center;"> <view style="height: 70rpx;line-height: 70rpx;display: flex;align-items: center;">
<text v-if="item.isDefault == 1" style="font-size: 10px;color: white;background: red;padding: 2px 6px;border-radius: 4px;margin-right: 5px;line-height:1;">默认</text> <text v-if="item.isDefault == 1" style="font-size: 20rpx;color: white;background: red;padding: 4rpx 12rpx;border-radius: 8rpx;margin-right: 10rpx;line-height:1;">默认</text>
<text style="font-size: 15px;font-weight: 700;">{{item.areaName || ''}}{{item.floor ? item.floor + '层' : ''}}{{item.roomNum || ''}}</text> <text style="font-size: 30rpx;font-weight: 700;">{{item.areaName || ''}}{{item.floor ? item.floor + '层' : ''}}{{item.roomNum || ''}}</text>
</view> </view>
<view style="color: #777;"> <view style="color: #777;">
{{item.receiverName}} {{item.receiverPhone}} {{item.receiverName}} {{item.receiverPhone}}
</view> </view>
</view> </view>
<view style="display: flex; align-items: center; gap: 10px;"> <view style="display: flex; align-items: center; gap: 20rpx;">
<view @tap.stop="openEdit(item)" <view @tap.stop="openEdit(item)"
style="width: 44px;height: 25px;line-height: 25px;text-align: center;border: 1px solid #777;border-radius: 25px;color: #777;"> style="width: 88rpx;height: 50rpx;line-height: 50rpx;text-align: center;border: 1px solid #777;border-radius: 50rpx;color: #777;">
编辑 编辑
</view> </view>
<view @tap.stop="deleteAddress(item.id)" <view @tap.stop="deleteAddress(item.id)"
style="width: 44px;height: 25px;line-height: 25px;text-align: center;border: 1px solid #e43d33;border-radius: 25px;color: #e43d33;"> style="width: 88rpx;height: 50rpx;line-height: 50rpx;text-align: center;border: 1px solid #e43d33;border-radius: 50rpx;color: #e43d33;">
删除 删除
</view> </view>
</view> </view>
</view> </view>
<view v-if="addressList.length === 0" style="text-align: center;color: #999;margin-top: 50px;"> <view v-if="addressList.length === 0" style="text-align: center;color: #999;margin-top: 100rpx;">
暂无收货地址 暂无收货地址
</view> </view>
</view> </view>
@ -37,46 +37,46 @@
</view> </view>
<!-- 新增地址弹出层 --> <!-- 新增地址弹出层 -->
<uni-popup ref="addBookPopup" background-color="#fff"> <uni-popup ref="addBookPopup" background-color="#fff">
<view class="book-popup-content" style="height: 400px;padding-top:20px;"> <view class="book-popup-content" style="height: 800rpx;padding-top:40rpx;">
<view style="height: 40px;line-height: 40px;font-size: 18px;font-weight: 700;text-align: center;"> <view style="height: 80rpx;line-height: 80rpx;font-size: 36rpx;font-weight: 700;text-align: center;">
{{addressForm.id ? '编辑地址' : '填写地址'}} {{addressForm.id ? '编辑地址' : '填写地址'}}
</view> </view>
<view style="margin-bottom: 10px;background: #fff;border-radius: 10px;"> <view style="margin-bottom: 20rpx;background: #fff;border-radius: 20rpx;">
<uni-combox :candidates="areaTitleList" placeholder="请搜索选择楼座区域" v-model="areaTitleInput" emptyTips="未找到匹配的楼座" @focus="isComboxFocused = true" @blur="isComboxFocused = false"></uni-combox> <uni-combox :candidates="areaTitleList" placeholder="请搜索选择楼座区域" v-model="areaTitleInput" emptyTips="未找到匹配的楼座" @focus="isComboxFocused = true" @blur="isComboxFocused = false"></uni-combox>
</view> </view>
<view style="margin-bottom: 10px;display: flex;padding: 10px;background: #eee;border-radius: 10px;"> <view style="margin-bottom: 20rpx;display: flex;padding: 20rpx;background: #eee;border-radius: 20rpx;">
<input v-show="!isComboxFocused" type="number" v-model="addressForm.floor" placeholder="请填写所在楼层(仅限整数)" style="width: 100%;" /> <input v-show="!isComboxFocused" type="number" v-model="addressForm.floor" placeholder="请填写所在楼层(仅限整数)" style="width: 100%;" />
<view v-show="isComboxFocused" style="width: 100%; height: 21px; line-height: 21px;"> <view v-show="isComboxFocused" style="width: 100%; height: 42rpx; line-height: 42rpx;">
<text v-if="addressForm.floor">{{addressForm.floor}}</text> <text v-if="addressForm.floor">{{addressForm.floor}}</text>
<text v-else style="color: grey;">请填写所在楼层(仅限整数)</text> <text v-else style="color: grey;">请填写所在楼层(仅限整数)</text>
</view> </view>
</view> </view>
<view style="margin-bottom: 10px;display: flex;padding: 10px;background: #eee;border-radius: 10px;"> <view style="margin-bottom: 20rpx;display: flex;padding: 20rpx;background: #eee;border-radius: 20rpx;">
<input v-show="!isComboxFocused" type="text" v-model="addressForm.roomNum" placeholder="请填写门牌号或所在机构科室" style="width: 100%;" /> <input v-show="!isComboxFocused" type="text" v-model="addressForm.roomNum" placeholder="请填写门牌号或所在机构科室" style="width: 100%;" />
<view v-show="isComboxFocused" style="width: 100%; height: 21px; line-height: 21px;"> <view v-show="isComboxFocused" style="width: 100%; height: 42rpx; line-height: 42rpx;">
<text v-if="addressForm.roomNum">{{addressForm.roomNum}}</text> <text v-if="addressForm.roomNum">{{addressForm.roomNum}}</text>
<text v-else style="color: grey;">请填写门牌号或所在机构科室</text> <text v-else style="color: grey;">请填写门牌号或所在机构科室</text>
</view> </view>
</view> </view>
<view style="margin-bottom: 10px;display: flex;padding: 10px;background: #eee;border-radius: 10px;"> <view style="margin-bottom: 20rpx;display: flex;padding: 20rpx;background: #eee;border-radius: 20rpx;">
<input v-show="!isComboxFocused" type="text" v-model="addressForm.receiverName" placeholder="收货人名字" style="width: 100%;" /> <input v-show="!isComboxFocused" type="text" v-model="addressForm.receiverName" placeholder="收货人名字" style="width: 100%;" />
<view v-show="isComboxFocused" style="width: 100%; height: 21px; line-height: 21px;"> <view v-show="isComboxFocused" style="width: 100%; height: 42rpx; line-height: 42rpx;">
<text v-if="addressForm.receiverName">{{addressForm.receiverName}}</text> <text v-if="addressForm.receiverName">{{addressForm.receiverName}}</text>
<text v-else style="color: grey;">收货人名字</text> <text v-else style="color: grey;">收货人名字</text>
</view> </view>
</view> </view>
<view style="margin-bottom: 10px;display: flex;padding: 10px;background: #eee;border-radius: 10px;"> <view style="margin-bottom: 20rpx;display: flex;padding: 20rpx;background: #eee;border-radius: 20rpx;">
<input v-show="!isComboxFocused" type="number" maxlength="11" v-model="addressForm.receiverPhone" placeholder="联系电话" style="width: 100%;" /> <input v-show="!isComboxFocused" type="number" maxlength="11" v-model="addressForm.receiverPhone" placeholder="联系电话" style="width: 100%;" />
<view v-show="isComboxFocused" style="width: 100%; height: 21px; line-height: 21px;"> <view v-show="isComboxFocused" style="width: 100%; height: 42rpx; line-height: 42rpx;">
<text v-if="addressForm.receiverPhone">{{addressForm.receiverPhone}}</text> <text v-if="addressForm.receiverPhone">{{addressForm.receiverPhone}}</text>
<text v-else style="color: grey;">联系电话</text> <text v-else style="color: grey;">联系电话</text>
</view> </view>
</view> </view>
<view style="margin-bottom: 10px;display: flex;padding: 10px;justify-content: space-between;align-items: center;"> <view style="margin-bottom: 20rpx;display: flex;padding: 20rpx;justify-content: space-between;align-items: center;">
<text>设为默认地址</text> <text>设为默认地址</text>
<switch :checked="addressForm.isDefault === 1" @change="e => addressForm.isDefault = e.detail.value ? 1 : 0" color="#a6ffea" /> <switch :checked="addressForm.isDefault === 1" @change="e => addressForm.isDefault = e.detail.value ? 1 : 0" color="#a6ffea" />
</view> </view>
<view class="bottom-btn" @tap="submitAddress" style="position: relative; margin-top: 20px;"> <view class="bottom-btn" @tap="submitAddress" style="position: relative; margin-top: 40rpx;">
确认 确认
</view> </view>
</view> </view>
@ -237,20 +237,20 @@
<style lang="scss"> <style lang="scss">
.address-popup-box { .address-popup-box {
height: 600px; height: 1200rpx;
} }
.bottom-btn { .bottom-btn {
width: 90%; width: 90%;
height: 50px; height: 100rpx;
background: linear-gradient(90deg, #e3ff96, #a6ffea); background: linear-gradient(90deg, #e3ff96, #a6ffea);
font-size: 13px; font-size: 26rpx;
font-weight: 700; font-weight: 700;
line-height: 50px; line-height: 100rpx;
text-align: center; text-align: center;
border-radius: 50px; border-radius: 100rpx;
margin: 10px auto; margin: 20rpx auto;
position: fixed; position: fixed;
bottom: 10px; bottom: 20rpx;
} }
</style> </style>

4
package1/buyFood/buyFood.vue

@ -1036,7 +1036,7 @@
width: 100%; width: 100%;
background-size: 100%; background-size: 100%;
height: 100%; height: 100%;
border-radius: 10px; border-radius: 20rpx;
} }
} }
@ -1077,7 +1077,7 @@
font-size: 32rpx; font-size: 32rpx;
font-weight: 700; font-weight: 700;
padding: 0 40rpx; padding: 0 40rpx;
margin-top: 10px; margin-top: 20rpx;
} }
.time-box { .time-box {

58
package1/goods/goodsDetail.vue

@ -67,11 +67,11 @@
<view class="bottom-price">18.00</view> <view class="bottom-price">18.00</view>
</view> </view>
<view class="bottom-right"> <view class="bottom-right">
<view class="bottom-btn" style="border-bottom-left-radius: 50px;border-top-left-radius: 50px;"> <view class="bottom-btn" style="border-bottom-left-radius: 100rpx;border-top-left-radius: 100rpx;">
直接购买 直接购买
</view> </view>
<view class="bottom-btn" <view class="bottom-btn"
style="border-bottom-right-radius: 50px;border-top-right-radius: 50px;background: rgba(0, 35, 28, 1);color: rgba(166, 255, 234, 1);"> style="border-bottom-right-radius: 100rpx;border-top-right-radius: 100rpx;background: rgba(0, 35, 28, 1);color: rgba(166, 255, 234, 1);">
拼团买15.00 拼团买15.00
</view> </view>
</view> </view>
@ -190,57 +190,57 @@
text-align: center; text-align: center;
font-size: 28rpx; font-size: 28rpx;
font-weight: 600; font-weight: 600;
border-radius: 30px; border-radius: 60rpx;
height: 30px; height: 60rpx;
line-height: 30px; line-height: 60rpx;
margin: 20px; margin: 40rpx;
} }
.pintuan-right { .pintuan-right {
display: flex; display: flex;
width: 30%; width: 30%;
padding: 15px; padding: 30rpx;
flex: 1; flex: 1;
} }
.pintuan-right-img { .pintuan-right-img {
height: 40px; height: 80rpx;
display: flex; display: flex;
img { img {
width: 40px; width: 80rpx;
height: 40px; height: 80rpx;
z-index: 98; z-index: 98;
background-size: 100%; background-size: 100%;
} }
} }
.weipincheng { .weipincheng {
width: 40px; width: 80rpx;
height: 40px; height: 80rpx;
background: #a6ffea; background: #a6ffea;
border-radius: 40px; border-radius: 80rpx;
text-align: center; text-align: center;
font-size: 28rpx; font-size: 28rpx;
font-weight: 700; font-weight: 700;
margin-left: -6rpx; margin-left: -6rpx;
z-index: 97; z-index: 97;
line-height: 40px; line-height: 80rpx;
} }
.goods-center { .goods-center {
width: 95%; width: 95%;
margin: 0 auto 10px; margin: 0 auto 20rpx;
background: #f5f8f5; background: #f5f8f5;
height: 70px; height: 140rpx;
border-radius: 10px; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
} }
.pintuan-right-cha { .pintuan-right-cha {
line-height: 40px; line-height: 80rpx;
margin-left: 10px; margin-left: 20rpx;
} }
.goods-bottom { .goods-bottom {
@ -249,15 +249,15 @@
} }
.detail1 { .detail1 {
height: 24px; height: 48rpx;
font-size: 15px; font-size: 30rpx;
font-weight: 700; font-weight: 700;
} }
.detail2 { .detail2 {
line-height: 26px; line-height: 52rpx;
font-size: 14px; font-size: 28rpx;
padding-bottom: 40px; padding-bottom: 80rpx;
} }
.bottom { .bottom {
@ -269,7 +269,7 @@
display: flex; display: flex;
background: #fff; background: #fff;
z-index: 99; z-index: 99;
box-shadow: 0 -10px 15px rgba(0, 0, 0, 0.3); box-shadow: 0 -20rpx 30rpx rgba(0, 0, 0, 0.3);
} }
.bottom-left { .bottom-left {
@ -318,12 +318,12 @@
} }
.bottom-btn { .bottom-btn {
width: 120px; width: 240rpx;
height: 50px; height: 100rpx;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
font-size: 13px; font-size: 26rpx;
font-weight: 700; font-weight: 700;
line-height: 50px; line-height: 100rpx;
text-align: center; text-align: center;
} }
</style> </style>

36
package1/group/groupBuyDetail.vue

@ -15,37 +15,37 @@
<view class="box1" style="display: flex;"> <view class="box1" style="display: flex;">
<view class="left"> <view class="left">
<view style="display: flex;"> <view style="display: flex;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/3721d2aa18ac4700aa7ac4dfeb272b09.png" alt="" style="width: 24px;height: 24px;"/> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/3721d2aa18ac4700aa7ac4dfeb272b09.png" alt="" style="width: 48rpx;height: 48rpx;"/>
<text style="height: 24px;line-height: 24px;font-size: 14px;font-weight: 700;margin-left: 5px;">{{shopItem.shopName}}</text> <text style="height: 48rpx;line-height: 48rpx;font-size: 28rpx;font-weight: 700;margin-left: 10rpx;">{{shopItem.shopName}}</text>
</view> </view>
<view style="line-height: 30px;height: 30px;color: #777;"> <view style="line-height: 60rpx;height: 60rpx;color: #777;">
<uni-icons type="location" size="13"></uni-icons> <uni-icons type="location" size="13"></uni-icons>
<text>{{shopItem.shopAddress}}</text> <text>{{shopItem.shopAddress}}</text>
</view> </view>
<view style="line-height: 30px;height: 30px;color: #777;"> <view style="line-height: 60rpx;height: 60rpx;color: #777;">
<uni-icons type="loop" size="13"></uni-icons> <uni-icons type="loop" size="13"></uni-icons>
<text>周一到周日 {{shopItem.shopTakeaway.businessHourBegin}}-{{shopItem.shopTakeaway.businessHourEnd}}</text> <text>周一到周日 {{shopItem.shopTakeaway.businessHourBegin}}-{{shopItem.shopTakeaway.businessHourEnd}}</text>
</view> </view>
</view> </view>
<view class="right"> <view class="right">
<img @tap="makeCall(shopItem.contactPhone)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 40px;height: 40px;position: absolute;top: 32px;right: 30px;"/> <img @tap="makeCall(shopItem.contactPhone)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 80rpx;height: 80rpx;position: absolute;top: 64rpx;right: 60rpx;"/>
</view> </view>
</view> </view>
<view class="box1"> <view class="box1">
<view style="display: flex;"> <view style="display: flex;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/86004fa6b60e477ea1622fc0bf4c99de.png" alt="" style="width: 24px;height: 24px;" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/86004fa6b60e477ea1622fc0bf4c99de.png" alt="" style="width: 48rpx;height: 48rpx;" />
<text style="height: 24px;line-height: 24px;font-size: 14px;font-weight: 700;margin-left: 5px;">商家资质</text> <text style="height: 48rpx;line-height: 48rpx;font-size: 28rpx;font-weight: 700;margin-left: 10rpx;">商家资质</text>
</view> </view>
<view style="display: flex;margin-top: 10px;"> <view style="display: flex;margin-top: 20rpx;">
<img @tap="largeImg" :src="item" v-for="(item,index) in shopImages" :key="index" alt="" style="width: 78px;height: 24px;margin-right: 20px;" /> <img @tap="largeImg" :src="item" v-for="(item,index) in shopImages" :key="index" alt="" style="width: 156rpx;height: 48rpx;margin-right: 40rpx;" />
</view> </view>
</view> </view>
<view class="box1"> <view class="box1">
<view style="display: flex;"> <view style="display: flex;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/00b1f011787c4549bbea650d95a4eb39.png" alt="" style="width: 24px;height: 24px;" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/00b1f011787c4549bbea650d95a4eb39.png" alt="" style="width: 48rpx;height: 48rpx;" />
<text style="height: 24px;line-height: 24px;font-size: 14px;font-weight: 700;margin-left: 5px;">商家公告</text> <text style="height: 48rpx;line-height: 48rpx;font-size: 28rpx;font-weight: 700;margin-left: 10rpx;">商家公告</text>
</view> </view>
<view style="color: #777;line-height: 24px;margin-top: 10px;"> <view style="color: #777;line-height: 48rpx;margin-top: 20rpx;">
公告{{shopItem.remark}} 公告{{shopItem.remark}}
</view> </view>
</view> </view>
@ -124,7 +124,7 @@
.content{ .content{
position: absolute; position: absolute;
top: 100px; top: 200rpx;
width: 95%; width: 95%;
margin-left: 2.5%; margin-left: 2.5%;
} }
@ -142,7 +142,7 @@
left: 0; left: 0;
} }
.title-name{ .title-name{
padding-top: 55px; padding-top: 110rpx;
font-size: 36rpx; font-size: 36rpx;
font-weight: 700; font-weight: 700;
flex: 1; flex: 1;
@ -150,17 +150,17 @@
} }
.box1{ .box1{
width: 95%; width: 95%;
margin: 0 auto 10px; margin: 0 auto 20rpx;
background: #fff; background: #fff;
border-radius: 10px; border-radius: 20rpx;
padding: 10px; padding: 20rpx;
} }
.left{ .left{
width: 60%; width: 60%;
} }
.right{ .right{
width: 40%; width: 40%;
height: 80px; height: 160rpx;
} }
.img-popup-content { .img-popup-content {
width: 500rpx; width: 500rpx;

22
package1/group/groupBuyList.vue

@ -74,7 +74,7 @@
<view class="shop-content-center"> <view class="shop-content-center">
<view class="shop-rate"> <view class="shop-rate">
<view class="shop-rate-num">{{item.shopScore}}</view> <view class="shop-rate-num">{{item.shopScore}}</view>
<view style="padding-top: 2px;"> <view style="padding-top: 4rpx;">
<uni-rate :disabled="true" size="16" disabledColor="rgba(255, 184, 84, 1)" :value="item.shopScore" /> <uni-rate :disabled="true" size="16" disabledColor="rgba(255, 184, 84, 1)" :value="item.shopScore" />
</view> </view>
</view> </view>
@ -109,7 +109,7 @@
¥{{item1.attributeListPrice | sliceMsg}} ¥{{item1.attributeListPrice | sliceMsg}}
</view> </view>
<view class="shop-menu-purchase"> <view class="shop-menu-purchase">
拼团 <text style="color: red;font-size: 12px;padding-left: 5px;">¥{{item1.productGroupBuyPrices | slicePrice}}</text> 拼团 <text style="color: red;font-size: 24rpx;padding-left: 10rpx;">¥{{item1.productGroupBuyPrices | slicePrice}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -495,15 +495,15 @@
height: 200rpx; height: 200rpx;
} }
.back-btn{ .back-btn{
padding-top: 55px; padding-top: 110rpx;
} }
.title-name{ .title-name{
padding-top: 55px; padding-top: 110rpx;
font-size: 36rpx; font-size: 36rpx;
font-weight: 700; font-weight: 700;
} }
.title-search{ .title-search{
margin-top: 55px; margin-top: 110rpx;
display: flex; display: flex;
background: #fff; background: #fff;
height: 54rpx; height: 54rpx;
@ -564,7 +564,7 @@
width: 100%; width: 100%;
background-size: 100%; background-size: 100%;
height: 100%; height: 100%;
border-radius: 10px; border-radius: 20rpx;
} }
} }
.shop-top{ .shop-top{
@ -588,7 +588,7 @@
height: 40rpx; height: 40rpx;
display: flex; display: flex;
border-radius: 20rpx; border-radius: 20rpx;
padding: 0 5px 0 0; padding: 0 10rpx 0 0;
} }
.shop-rate-num{ .shop-rate-num{
width: 50rpx; width: 50rpx;
@ -622,7 +622,7 @@
display: flex; display: flex;
height: auto; height: auto;
overflow-y: hidden; overflow-y: hidden;
padding: 5px 0 10px; padding: 10rpx 0 20rpx;
} }
.menu-member{ .menu-member{
width: 140rpx; width: 140rpx;
@ -637,7 +637,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
background-size: 100%; background-size: 100%;
border-radius: 10px; border-radius: 20rpx;
} }
} }
.menu-content{ .menu-content{
@ -647,7 +647,7 @@
margin-top: 10rpx; margin-top: 10rpx;
font-weight: 700; font-weight: 700;
overflow: hidden; overflow: hidden;
height: 15px; height: 30rpx;
} }
.shop-menu-price{ .shop-menu-price{
margin-top: 6rpx; margin-top: 6rpx;
@ -663,7 +663,7 @@
font-weight: 700; font-weight: 700;
margin-top: 10rpx; margin-top: 10rpx;
color: #777; color: #777;
font-size: 10px; font-size: 20rpx;
} }
.zaixian{ .zaixian{
position: fixed; position: fixed;

228
package1/group/groupBuySingle.vue

@ -94,7 +94,7 @@
:style="{'top': navBarHeight + 'px','background':lastScrollTop>200?'#fff':''}"> :style="{'top': navBarHeight + 'px','background':lastScrollTop>200?'#fff':''}">
<view class="menu1" @tap="checkTab(index)" v-for="(item,index) in menuList" :key="index" <view class="menu1" @tap="checkTab(index)" v-for="(item,index) in menuList" :key="index"
:style="{'font-size':item.checked?'40rpx':'30rpx','color':item.checked?'rgba(0, 35, 28, 1)':'#777'}"> :style="{'font-size':item.checked?'40rpx':'30rpx','color':item.checked?'rgba(0, 35, 28, 1)':'#777'}">
<view style="width: 90px;">{{item.categoryName}}</view> <view style="width: 180rpx;">{{item.categoryName}}</view>
<img v-if="item.checked" class="checked-img" <img v-if="item.checked" class="checked-img"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png"
alt="" /> alt="" />
@ -105,7 +105,7 @@
@tap="goDetail('product',item)"> @tap="goDetail('product',item)">
<view class="goods-top"> <view class="goods-top">
<view class="goods-img"> <view class="goods-img">
<img :src="item.productPicture" alt="" style="border-radius: 10px;"> <img :src="item.productPicture" alt="" style="border-radius: 20rpx;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/6c4ab92a43c842d8bb22035bce1f65cc.png" <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/6c4ab92a43c842d8bb22035bce1f65cc.png"
alt="" alt=""
style="width:30rpx;height:30rpx;position: absolute;top: 0;left: 0;background-size: 100%;" /> style="width:30rpx;height:30rpx;position: absolute;top: 0;left: 0;background-size: 100%;" />
@ -178,11 +178,11 @@
</view> </view>
<scroll-view scroll-y style="max-height: 400rpx;"> <scroll-view scroll-y style="max-height: 400rpx;">
<view class="goods-top" style="padding: 10px 0;" v-for="(cartItem, index) in cartItems" <view class="goods-top" style="padding: 20rpx 0;" v-for="(cartItem, index) in cartItems"
:key="index"> :key="index">
<view class="goods-img" style="width: 120rpx;height: 120rpx;"> <view class="goods-img" style="width: 120rpx;height: 120rpx;">
<img :src="cartItem.item.productPicture" alt="" <img :src="cartItem.item.productPicture" alt=""
style="border-radius: 10px;width:100%;height:100%;"> style="border-radius: 20rpx;width:100%;height:100%;">
</view> </view>
<view class="goods-content" style="padding-left: 20rpx;"> <view class="goods-content" style="padding-left: 20rpx;">
<view class="goods-name"> <view class="goods-name">
@ -217,13 +217,13 @@
</scroll-view> </scroll-view>
<view style="width: 100%;height: 160rpx;"></view> <view style="width: 100%;height: 160rpx;"></view>
<view class="bottom" style="padding-bottom: 10px;"> <view class="bottom" style="padding-bottom: 20rpx;">
<view class="bottom-left"> <view class="bottom-left">
<view style="width: 60rpx;height: 80rpx;margin-top: 10rpx;" @tap="$refs.carPopup.close()"> <view style="width: 60rpx;height: 80rpx;margin-top: 10rpx;" @tap="$refs.carPopup.close()">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/60db52398a65459e9541881c926986a4.png" <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/60db52398a65459e9541881c926986a4.png"
alt="" /> alt="" />
</view> </view>
<view class="bottom-price" style="line-height: 24px;"> <view class="bottom-price" style="line-height: 48rpx;">
<view>{{cartTotalPrice}}</view> <view>{{cartTotalPrice}}</view>
</view> </view>
</view> </view>
@ -240,7 +240,7 @@
<view class="warnImg"> <view class="warnImg">
<img @tap="$refs.warnPopup.close()" <img @tap="$refs.warnPopup.close()"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4996043b3987401794b974d359429b8e.png" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4996043b3987401794b974d359429b8e.png"
alt="购物车是空的" style="width:300px;height:370px;" /> alt="购物车是空的" style="width:600rpx;height:740rpx;" />
</view> </view>
</uni-popup> </uni-popup>
<!-- 拼团和选规格弹窗 --> <!-- 拼团和选规格弹窗 -->
@ -251,7 +251,7 @@
</view> </view>
<view class="goods-top"> <view class="goods-top">
<view class="goods-img"> <view class="goods-img">
<img :src="currentItem.productPicture" alt="" style="border-radius: 10px;"> <img :src="currentItem.productPicture" alt="" style="border-radius: 20rpx;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/6c4ab92a43c842d8bb22035bce1f65cc.png" <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/6c4ab92a43c842d8bb22035bce1f65cc.png"
alt="" alt=""
style="width:30rpx;height:30rpx;position: absolute;top: 0;left: 0;background-size: 100%;" /> style="width:30rpx;height:30rpx;position: absolute;top: 0;left: 0;background-size: 100%;" />
@ -311,7 +311,7 @@
<template <template
v-if="groupId == '' && isPintuan && currentItem.productGroupBuyPrices && currentItem.productGroupBuyPrices.length > 0"> v-if="groupId == '' && isPintuan && currentItem.productGroupBuyPrices && currentItem.productGroupBuyPrices.length > 0">
<view class="spec11" style="margin-top: -15px;"> <view class="spec11" style="margin-top: -30rpx;">
成团选择 成团选择
</view> </view>
<view class="goods-team"> <view class="goods-team">
@ -330,22 +330,22 @@
</template> </template>
<view style="width: 100%;height: 160rpx;"></view> <view style="width: 100%;height: 160rpx;"></view>
</scroll-view> </scroll-view>
<view class="bottom" style="padding-bottom: 20px;height: 80px;z-index: 10;"> <view class="bottom" style="padding-bottom: 40rpx;height: 160rpx;z-index: 10;">
<view v-if="isPintuan" class="pintuan1"> <view v-if="isPintuan" class="pintuan1">
<template v-if="!groupId"> <template v-if="!groupId">
<view class="pintuan2" style="border-bottom-left-radius: 50px;border-top-left-radius: 50px;" <view class="pintuan2" style="border-bottom-left-radius: 100rpx;border-top-left-radius: 100rpx;"
@tap.stop="submitPintuan(true)"> @tap.stop="submitPintuan(true)">
面对面团 面对面团
</view> </view>
<view class="pintuan2" <view class="pintuan2"
style="background: rgba(0, 35, 28, 1);border-bottom-right-radius: 50px;border-top-right-radius: 50px;color: rgba(166, 255, 234, 1);" style="background: rgba(0, 35, 28, 1);border-bottom-right-radius: 100rpx;border-top-right-radius: 100rpx;color: rgba(166, 255, 234, 1);"
@tap.stop="submitPintuan(false)"> @tap.stop="submitPintuan(false)">
发起拼团{{selectedGroupRule && selectedGroupRule.groupPrice ? parseFloat(selectedGroupRule.groupPriceAndMore).toFixed(2) : '0.00'}} 发起拼团{{selectedGroupRule && selectedGroupRule.groupPrice ? parseFloat(selectedGroupRule.groupPriceAndMore).toFixed(2) : '0.00'}}
</view> </view>
</template> </template>
<template v-else> <template v-else>
<view class="pintuan2" <view class="pintuan2"
style="width: 100%; border-radius: 50px; " style="width: 100%; border-radius: 100rpx;"
@tap.stop="submitPintuan(false)"> @tap.stop="submitPintuan(false)">
参与拼团{{selectedGroupRule && selectedGroupRule.groupPriceAndMore ? parseFloat(selectedGroupRule.groupPriceAndMore).toFixed(2) : '0.00'}} 参与拼团{{selectedGroupRule && selectedGroupRule.groupPriceAndMore ? parseFloat(selectedGroupRule.groupPriceAndMore).toFixed(2) : '0.00'}}
</view> </view>
@ -384,7 +384,7 @@
<view class="cha11"> <view class="cha11">
{{item.targetMembers}}人拼 {{item.targetMembers}}人拼
</view> </view>
<view style="line-height: 20px;padding-left: 5px;"> <view style="line-height: 40rpx;padding-left: 10rpx;">
<text style="color: red;">{{item.targetMembers - item.currentMembers}}</text>拼成 <text style="color: red;">{{item.targetMembers - item.currentMembers}}</text>拼成
</view> </view>
</view> </view>
@ -402,7 +402,7 @@
<!-- 支付弹出层 --> <!-- 支付弹出层 -->
<uni-popup ref="payPopup" background-color="#fff"> <uni-popup ref="payPopup" background-color="#fff">
<view class="pay-popup" style="height: 480px;background: #fff;border-radius: 20px 20px 0 0;padding-top: 20px;"> <view class="pay-popup" style="height: 960px;background: #fff;border-radius: 40rpx 40rpx 0 0;padding-top: 40rpx;">
<view class="content"> <view class="content">
<view class="box1"> <view class="box1">
<view style="height: 70rpx;line-height: 70rpx;text-align: center;"> <view style="height: 70rpx;line-height: 70rpx;text-align: center;">
@ -439,7 +439,7 @@
alt="" style="width: 36rpx;height: 36rpx;" /> alt="" style="width: 36rpx;height: 36rpx;" />
</view> </view>
</view> </view>
<view class="btn" style="background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));width: 90%;height: 50px;border-radius: 50px;text-align: center;font-size: 14px;font-weight: 700;line-height: 50px;margin: 20px auto;" @tap="wxPayment"> <view class="btn" style="background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));width: 90%;height: 100rpx;border-radius: 100rpx;text-align: center;font-size: 28rpx;font-weight: 700;line-height: 100rpx;margin: 40rpx auto;" @tap="wxPayment">
确认付款 确认付款
</view> </view>
</view> </view>
@ -448,7 +448,7 @@
<!-- 参团成功提示弹出层 --> <!-- 参团成功提示弹出层 -->
<uni-popup ref="joinSuccessPopup" background-color="#fff" @change="onJoinSuccessPopupChange"> <uni-popup ref="joinSuccessPopup" background-color="#fff" @change="onJoinSuccessPopupChange">
<view class="pintuan-popup" style="position: relative;height: 600px;width: 100%;border-top-left-radius: 10px;border-top-right-radius: 10px;padding: 10px;"> <view class="pintuan-popup" style="position: relative;height: 1200rpx;width: 100%;border-top-left-radius: 20rpx;border-top-right-radius: 20rpx;padding: 20rpx;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/ecd00dab1c9c44198d765bc08bc1bd71.png" alt="" <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/ecd00dab1c9c44198d765bc08bc1bd71.png" alt=""
style="position: absolute;top: 0;right: 0;width: 240rpx;height: 180rpx;" @tap="$refs.joinSuccessPopup.close()"> style="position: absolute;top: 0;right: 0;width: 240rpx;height: 180rpx;" @tap="$refs.joinSuccessPopup.close()">
<view style="position: absolute;bottom: 0;width: 100%;height: 760rpx;"> <view style="position: absolute;bottom: 0;width: 100%;height: 760rpx;">
@ -1303,7 +1303,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
z-index: 100; z-index: 100;
padding: 8px 12px; padding: 16rpx 24rpx;
box-sizing: border-box; box-sizing: border-box;
} }
@ -1346,7 +1346,7 @@
width: 100%; width: 100%;
background-size: 100%; background-size: 100%;
height: 100%; height: 100%;
border-radius: 10px; border-radius: 20rpx;
} }
} }
@ -1375,7 +1375,7 @@
height: 40rpx; height: 40rpx;
display: flex; display: flex;
border-radius: 20rpx; border-radius: 20rpx;
padding: 0 5px 0 0; padding: 0 10rpx 0 0;
} }
.shop-rate-num { .shop-rate-num {
@ -1441,7 +1441,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
background-size: 100%; background-size: 100%;
border-radius: 10px; border-radius: 20rpx;
} }
} }
@ -1493,14 +1493,14 @@
} }
.pintuan-right-cha { .pintuan-right-cha {
line-height: 20px; line-height: 40rpx;
padding-left: 5px; padding-left: 10rpx;
} }
.goods-member { .goods-member {
padding: 10px 0; padding: 20rpx 0;
margin-bottom: 10px; margin-bottom: 20rpx;
border-radius: 10px; border-radius: 20rpx;
background: #fff; background: #fff;
} }
@ -1607,7 +1607,7 @@
display: flex; display: flex;
background: #fff; background: #fff;
z-index: 98; z-index: 98;
box-shadow: 0 -5px 5px rgba(0, 0, 0, 0.3); box-shadow: 0 -10rpx 10rpx rgba(0, 0, 0, 0.3);
} }
.bottom-left { .bottom-left {
@ -1656,38 +1656,38 @@
.car-content { .car-content {
position: relative; position: relative;
height: 600px; height: 1200rpx;
width: 100%; width: 100%;
border-top-left-radius: 10px; border-top-left-radius: 20rpx;
border-top-right-radius: 10px; border-top-right-radius: 20rpx;
padding: 10px; padding: 20rpx;
overflow: scroll; overflow: scroll;
} }
.car-close { .car-close {
width: 30px; width: 60rpx;
height: 30px; height: 60rpx;
position: absolute; position: absolute;
top: -40px; top: -80rpx;
right: 10px; right: 20rpx;
} }
.car-title { .car-title {
height: 48px; height: 96rpx;
line-height: 30px; line-height: 60rpx;
margin: 0 auto; margin: 0 auto;
font-size: 14px; font-size: 28rpx;
font-weight: 700; font-weight: 700;
} }
.num-plus { .num-plus {
width: 28px; width: 56rpx;
height: 28px; height: 56rpx;
font-size: 18px; font-size: 36rpx;
text-align: center; text-align: center;
font-weight: 700; font-weight: 700;
line-height: 24px; line-height: 48rpx;
border-radius: 5px; border-radius: 10rpx;
background: rgba(0, 35, 28, 1); background: rgba(0, 35, 28, 1);
color: rgba(166, 255, 234, 1); color: rgba(166, 255, 234, 1);
@ -1695,40 +1695,40 @@
} }
.num { .num {
width: 40px; width: 80rpx;
height: 28px; height: 56rpx;
text-align: center; text-align: center;
line-height: 28px; line-height: 56rpx;
font-size: 14px; font-size: 28rpx;
} }
.goods-num { .goods-num {
display: flex; display: flex;
height: 28px; height: 56rpx;
flex: 1; flex: 1;
margin-left: 20px; margin-left: 40rpx;
} }
.pintuan0 { .pintuan0 {
width: 90%; width: 90%;
height: 50px; height: 100rpx;
border-radius: 50px; border-radius: 100rpx;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
text-align: center; text-align: center;
font-size: 13px; font-size: 26rpx;
font-weight: 700; font-weight: 700;
line-height: 50px; line-height: 100rpx;
margin: auto; margin: auto;
} }
.pintuan1 { .pintuan1 {
width: 90%; width: 90%;
height: 50px; height: 100rpx;
line-height: 50px; line-height: 100rpx;
display: flex; display: flex;
text-align: center; text-align: center;
margin: auto; margin: auto;
font-size: 13px; font-size: 26rpx;
font-weight: 700; font-weight: 700;
} }
@ -1738,57 +1738,57 @@
} }
.spec11 { .spec11 {
height: 48px; height: 96rpx;
line-height: 48px; line-height: 96rpx;
font-size: 14px; font-size: 28rpx;
font-weight: 700; font-weight: 700;
} }
.spec222 { .spec222 {
display: inline-block; display: inline-block;
padding: 0 10px; padding: 0 20rpx;
background: #eee; background: #eee;
color: #777; color: #777;
height: 36px; height: 72rpx;
line-height: 36px; line-height: 72rpx;
text-align: center; text-align: center;
border-radius: 10px; border-radius: 20rpx;
margin-right: 10px; margin-right: 20rpx;
} }
.spec-check { .spec-check {
display: inline-block; display: inline-block;
padding: 0 10px; padding: 0 20rpx;
background: rgba(166, 255, 234, 1); background: rgba(166, 255, 234, 1);
height: 36px; height: 72rpx;
line-height: 36px; line-height: 72rpx;
text-align: center; text-align: center;
border-radius: 10px; border-radius: 20rpx;
margin-right: 10px; margin-right: 20rpx;
} }
.team1 { .team1 {
width: 77px; width: 154rpx;
height: 63px; height: 126rpx;
background: #eee; background: #eee;
border-radius: 10px; border-radius: 20rpx;
font-size: 13px; font-size: 26rpx;
text-align: center; text-align: center;
line-height: 30px; line-height: 60rpx;
float: left; float: left;
margin-right: 20px; margin-right: 40rpx;
} }
.team-check { .team-check {
width: 77px; width: 154rpx;
height: 63px; height: 126rpx;
background: rgba(166, 255, 234, 1); background: rgba(166, 255, 234, 1);
border-radius: 10px; border-radius: 20rpx;
font-size: 13px; font-size: 26rpx;
text-align: center; text-align: center;
line-height: 30px; line-height: 60rpx;
float: left; float: left;
margin-right: 20px; margin-right: 40rpx;
} }
.zaixian-swiper{ .zaixian-swiper{
flex: 1; flex: 1;
@ -1804,67 +1804,67 @@
} }
.team11 { .team11 {
height: 13px; height: 26rpx;
margin-top: 10px; margin-top: 20rpx;
} }
.goods-team { .goods-team {
width: 100%; width: 100%;
min-height: 90px; min-height: 180rpx;
} }
.list-right { .list-right {
display: flex; display: flex;
width: 100%; width: 100%;
padding: 15px 0 15px 15px; padding: 30rpx 0 30rpx 30rpx;
flex: 1; flex: 1;
} }
.list-right-img { .list-right-img {
height: 40px; height: 80rpx;
display: flex; display: flex;
img { img {
width: 40px; width: 80rpx;
height: 40px; height: 80rpx;
z-index: 98; z-index: 98;
background-size: 100%; background-size: 100%;
} }
} }
.list-weipincheng { .list-weipincheng {
width: 40px; width: 80rpx;
height: 40px; height: 80rpx;
background: #a6ffea; background: #a6ffea;
border-radius: 40px; border-radius: 80rpx;
text-align: center; text-align: center;
font-size: 28rpx; font-size: 28rpx;
font-weight: 700; font-weight: 700;
margin-left: -6rpx; margin-left: -6rpx;
z-index: 97; z-index: 97;
line-height: 40px; line-height: 80rpx;
} }
.goods-center { .goods-center {
width: 100%; width: 100%;
margin: 0 auto 10px; margin: 0 auto 20rpx;
background: #f5f8f5; background: #f5f8f5;
height: 70px; height: 140rpx;
border-radius: 10px; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
} }
.list-right-cha { .list-right-cha {
margin-left: 10px; margin-left: 20rpx;
} }
.list-right-price { .list-right-price {
flex: 1; flex: 1;
text-align: right; text-align: right;
line-height: 40px; line-height: 80rpx;
color: red; color: red;
font-size: 14px; font-size: 28rpx;
font-weight: 700; font-weight: 700;
} }
@ -1874,24 +1874,24 @@
text-align: center; text-align: center;
font-size: 28rpx; font-size: 28rpx;
font-weight: 600; font-weight: 600;
border-radius: 30px; border-radius: 60rpx;
height: 30px; height: 60rpx;
line-height: 30px; line-height: 60rpx;
margin: 20px; margin: 40rpx;
} }
.cha11 { .cha11 {
font-size: 11px; font-size: 22rpx;
background: rgba(255, 57, 57, 0.2); background: rgba(255, 57, 57, 0.2);
color: red; color: red;
display: inline-block; display: inline-block;
padding: 3px; padding: 6rpx;
border-radius: 5px; border-radius: 10rpx;
margin-bottom: 5px; margin-bottom: 10rpx;
} }
.menu-list { .menu-list {
height: 45px; height: 90rpx;
width: 100%; width: 100%;
overflow-x: scroll; overflow-x: scroll;
display: flex; display: flex;
@ -1901,22 +1901,22 @@
z-index: 90; z-index: 90;
background: #F5F8F5; background: #F5F8F5;
align-items: center; align-items: center;
padding-bottom: 4px; padding-bottom: 8rpx;
} }
.checked-img { .checked-img {
width: 90px; width: 180rpx;
height: 10px; height: 20rpx;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
} }
.menu1 { .menu1 {
width: 90px; width: 180rpx;
height: 35px; height: 70rpx;
position: relative; position: relative;
margin-left: 15px; margin-left: 30rpx;
line-height: 35px; line-height: 70rpx;
} }
</style> </style>

16
package1/group/searchGroup.vue

@ -14,13 +14,13 @@
<input type="text" placeholder="搜索" v-model="searchForm.keyWord" @confirm="goSearch" confirm-type="search" /> <input type="text" placeholder="搜索" v-model="searchForm.keyWord" @confirm="goSearch" confirm-type="search" />
</view> </view>
</view> </view>
<view style="width: 95%;background: #fff;margin: 0 auto;border-radius: 10px;padding: 10px;min-height: 80px;" v-if="historyList.length > 0 && !searchForm.shopName"> <view style="width: 95%;background: #fff;margin: 0 auto;border-radius: 20rpx;padding: 20rpx;min-height: 160rpx;" v-if="historyList.length > 0 && !searchForm.shopName">
<view style="height: 30px;color: #777;display: flex;justify-content: space-between;align-items: center;"> <view style="height: 60rpx;color: #777;display: flex;justify-content: space-between;align-items: center;">
<text>历史搜索</text> <text>历史搜索</text>
<uni-icons type="trash" size="18" color="#999" @tap="clearHistory"></uni-icons> <uni-icons type="trash" size="18" color="#999" @tap="clearHistory"></uni-icons>
</view> </view>
<view style="overflow: hidden;"> <view style="overflow: hidden;">
<view v-for="(item, index) in historyList" :key="index" @tap="clickHistory(item)" style="margin-right:10px;margin-bottom:10px;background: #eee;display: inline-block;padding: 5px 10px;border-radius: 5px;float: left;"> <view v-for="(item, index) in historyList" :key="index" @tap="clickHistory(item)" style="margin-right:20rpx;margin-bottom:20rpx;background: #eee;display: inline-block;padding: 10rpx 20rpx;border-radius: 10rpx;float: left;">
{{item}} {{item}}
</view> </view>
</view> </view>
@ -65,7 +65,7 @@
<view class="shop-content-center"> <view class="shop-content-center">
<view class="shop-rate"> <view class="shop-rate">
<view class="shop-rate-num">{{item.shopScore}}</view> <view class="shop-rate-num">{{item.shopScore}}</view>
<view style="padding-top: 2px;"> <view style="padding-top: 4rpx;">
<uni-rate :disabled="true" size="16" disabledColor="rgba(255, 184, 84, 1)" :value="item.shopScore" /> <uni-rate :disabled="true" size="16" disabledColor="rgba(255, 184, 84, 1)" :value="item.shopScore" />
</view> </view>
<uni-rate :disabled="true" size="16" disabledColor="rgba(255, 184, 84, 1)" :value="item.shopScore" /> <uni-rate :disabled="true" size="16" disabledColor="rgba(255, 184, 84, 1)" :value="item.shopScore" />
@ -354,15 +354,15 @@
height: 200rpx; height: 200rpx;
} }
.back-btn{ .back-btn{
padding-top: 55px; padding-top: 110rpx;
} }
.title-name{ .title-name{
padding-top: 55px; padding-top: 110rpx;
font-size: 36rpx; font-size: 36rpx;
font-weight: 700; font-weight: 700;
} }
.title-search{ .title-search{
margin-top: 55px; margin-top: 110rpx;
display: flex; display: flex;
background: #fff; background: #fff;
height: 54rpx; height: 54rpx;
@ -446,7 +446,7 @@
height: 40rpx; height: 40rpx;
display: flex; display: flex;
border-radius: 20rpx; border-radius: 20rpx;
padding: 0 5px 0 0; padding: 0 10rpx 0 0;
} }
.shop-rate-num{ .shop-rate-num{
width: 50rpx; width: 50rpx;

92
package1/group/shopEvaluate.vue

@ -24,8 +24,8 @@
<view class=""> <view class="">
<view class="menu-list"> <view class="menu-list">
<view class="menu1" @tap="checkTab(index)" v-for="(item,index) in menuList" :key="index" <view class="menu1" @tap="checkTab(index)" v-for="(item,index) in menuList" :key="index"
:style="{'font-size':item.checked?'40rpx':'30rpx','color':item.checked?'rgba(0, 35, 28, 1)':'#777','width':index == 0?'80px':'90px'}"> :style="{'font-size':item.checked?'40rpx':'30rpx','color':item.checked?'rgba(0, 35, 28, 1)':'#777','width':index == 0?'160rpx':'180rpx'}">
<view :style="{'width':index == 0?'80px':'90px'}" style="text-align: left;"> <view :style="{'width':index == 0?'160rpx':'180rpx'}" style="text-align: left;">
{{item.name}}({{item.num}}) {{item.name}}({{item.num}})
</view> </view>
<img v-if="item.checked" class="checked-img" <img v-if="item.checked" class="checked-img"
@ -50,9 +50,9 @@
</view> </view>
</view> </view>
<view class="eval-content"> <view class="eval-content">
<view style="display: flex;height: 25px;line-height: 25px;font-size: 12px;"> <view style="display: flex;height: 50rpx;line-height: 50rpx;font-size: 24rpx;">
商品 商品
<view style="padding: 6px 0 0 5px;"> <view style="padding: 12rpx 0 0 10rpx;">
<uni-rate v-model="item.score" size="12" /> <uni-rate v-model="item.score" size="12" />
</view> </view>
</view> </view>
@ -229,7 +229,7 @@
} }
.title-name { .title-name {
padding-top: 55px; padding-top: 110rpx;
font-size: 36rpx; font-size: 36rpx;
font-weight: 700; font-weight: 700;
flex: 1; flex: 1;
@ -238,14 +238,14 @@
.content { .content {
position: absolute; position: absolute;
top: 100px; top: 200rpx;
width: 95%; width: 95%;
margin-left: 2.5%; margin-left: 2.5%;
} }
.shop-rate { .shop-rate {
display: flex; display: flex;
padding-bottom: 15px; padding-bottom: 30rpx;
} }
.rate-left { .rate-left {
@ -254,7 +254,7 @@
} }
.rate-num { .rate-num {
font-size: 43px; font-size: 86rpx;
font-weight: 700; font-weight: 700;
background: linear-gradient(90deg, rgba(255, 77, 0, 1), rgba(255, 184, 84, 1)); background: linear-gradient(90deg, rgba(255, 77, 0, 1), rgba(255, 184, 84, 1));
background-clip: text; background-clip: text;
@ -263,64 +263,64 @@
.rate-right { .rate-right {
display: flex; display: flex;
width: 80px; width: 160rpx;
height: 50px; height: 100rpx;
line-height: 20px; line-height: 40rpx;
font-size: 18px; font-size: 36rpx;
text-align: center; text-align: center;
font-weight: 700; font-weight: 700;
border-left: 1px solid #eee; border-left: 1px solid #eee;
} }
.rate-star { .rate-star {
height: 50px; height: 100rpx;
padding: 16px 10px; padding: 32rpx 20rpx;
} }
.right1 { .right1 {
margin: 10px 0 0 5%; margin: 20rpx 0 0 5%;
width: 45%; width: 45%;
} }
.menu-list { .menu-list {
height: 50px; height: 100rpx;
width: 100%; width: 100%;
display: flex; display: flex;
overflow-y: hidden; overflow-y: hidden;
padding-top: 15px; padding-top: 30rpx;
border-top: 1px solid #eee; border-top: 1px solid #eee;
} }
.checked-img { .checked-img {
width: 100%; width: 100%;
height: 10px; height: 20rpx;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
} }
.menu1 { .menu1 {
width: 90px; width: 180rpx;
height: 35px; height: 70rpx;
position: relative; position: relative;
margin-right: 10px; margin-right: 20rpx;
line-height: 35px; line-height: 70rpx;
flex: 1; flex: 1;
} }
.evaluate-list { .evaluate-list {
margin-top: 20px; margin-top: 40rpx;
} }
.eval-title { .eval-title {
width: 100%; width: 100%;
height: 40px; height: 80rpx;
display: flex; display: flex;
} }
.eval-icon { .eval-icon {
height: 40px; height: 80rpx;
width: 40px; width: 80rpx;
img { img {
width: 100%; width: 100%;
@ -330,40 +330,40 @@
} }
.eval-name { .eval-name {
margin-left: 10px; margin-left: 20rpx;
} }
.name1 { .name1 {
font-size: 14px; font-size: 28rpx;
line-height: 25px; line-height: 50rpx;
font-weight: 700; font-weight: 700;
} }
.eval-rate { .eval-rate {
display: flex; display: flex;
margin: 10px 0 0 50px; margin: 20rpx 0 0 100rpx;
height: 24px; height: 48rpx;
line-height: 20px; line-height: 40rpx;
} }
.eval-content { .eval-content {
margin-left: 50px; margin-left: 100rpx;
font-size: 14px; font-size: 28rpx;
color: #777; color: #777;
line-height: 24px; line-height: 48rpx;
} }
.eval-img { .eval-img {
display: flex; display: flex;
width: 100%; width: 100%;
overflow-x: scroll; overflow-x: scroll;
margin-top: 10px; margin-top: 20rpx;
img { img {
width: 50px; width: 100rpx;
height: 50px; height: 100rpx;
background-size: 100%; background-size: 100%;
margin-right: 10px; margin-right: 20rpx;
} }
} }
@ -373,7 +373,7 @@
background-color: #eee; background-color: #eee;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
margin-top:10px; margin-top:20rpx;
} }
/* 标题行:左标签 + 右按钮 */ /* 标题行:左标签 + 右按钮 */
@ -391,17 +391,17 @@
} }
.reply-expand-btn { .reply-expand-btn {
font-size: 12px; font-size: 24rpx;
padding: 4rpx 12rpx; padding: 4rpx 12rpx;
} }
/* 回复内容基础样式 */ /* 回复内容基础样式 */
.reply-content { .reply-content {
font-size: 13px; font-size: 26rpx;
color: #555; color: #555;
padding: 12rpx; padding: 12rpx;
transition: all 0.2s; transition: all 0.2s;
height: 35px; height: 70rpx;
flex: 1; flex: 1;
} }
@ -417,7 +417,7 @@
/* 展开状态:固定高度100px,可滚动 */ /* 展开状态:固定高度100px,可滚动 */
.reply-content.expanded { .reply-content.expanded {
display: block; display: block;
height: 100px; height: 200rpx;
/* 固定高度100px */ /* 固定高度100px */
overflow-y: auto; overflow-y: auto;
/* 内容超长时滚动 */ /* 内容超长时滚动 */
@ -429,11 +429,11 @@
/* 滚动条美化(可选) */ /* 滚动条美化(可选) */
.reply-content.expanded::-webkit-scrollbar { .reply-content.expanded::-webkit-scrollbar {
width: 6px; width: 12rpx;
} }
.reply-content.expanded::-webkit-scrollbar-thumb { .reply-content.expanded::-webkit-scrollbar-thumb {
background-color: #ccc; background-color: #ccc;
border-radius: 10px; border-radius: 20rpx;
} }
</style> </style>

4
package1/index/deliveryPersonList.vue

@ -54,7 +54,7 @@
<view class="man-rate"> <view class="man-rate">
<view class="shop-rate"> <view class="shop-rate">
<view class="shop-rate-num">{{worker.score || 5}}</view> <view class="shop-rate-num">{{worker.score || 5}}</view>
<view style="padding-top: 2px;"> <view style="padding-top: 4rpx;">
<uni-rate :disabled="true" size="16" disabledColor="rgba(255, 184, 84, 1)" :value="worker.score || 5" /> <uni-rate :disabled="true" size="16" disabledColor="rgba(255, 184, 84, 1)" :value="worker.score || 5" />
</view> </view>
</view> </view>
@ -242,7 +242,7 @@
display: flex; display: flex;
border-radius: 20rpx; border-radius: 20rpx;
margin: 0 20rpx; margin: 0 20rpx;
padding: 0 5px 0 0; padding: 0 10rpx 0 0;
} }
.shop-rate-num { .shop-rate-num {

88
package1/myCenter/addGoods.vue

@ -31,7 +31,7 @@
<input type="digit" class="content-input" v-model="formData.orderFiled" placeholder="请输入排名"> <input type="digit" class="content-input" v-model="formData.orderFiled" placeholder="请输入排名">
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="商品分类" name="editTitle"> <uni-forms-item label="商品分类" name="editTitle">
<view style="border: 2px solid #eee;display: flex;flex: 1;border-radius: 5px;"> <view style="border: 4rpx solid #eee;display: flex;flex: 1;border-radius: 10rpx;">
<input type="text" placeholder="请选择商品分类" disabled v-model="typeItem.categoryName" <input type="text" placeholder="请选择商品分类" disabled v-model="typeItem.categoryName"
class="content-input" @tap="goGategoryLow" style="border: 0;"> class="content-input" @tap="goGategoryLow" style="border: 0;">
<uni-icons type="right" size="16" <uni-icons type="right" size="16"
@ -40,11 +40,11 @@
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="商品规格" name="attributeListPrice"> <uni-forms-item label="商品规格" name="attributeListPrice">
<view> <view>
<view v-for="(item,index) in formData.attributeListPrice" :key="index" style="display: flex;margin-top:5px;"> <view v-for="(item,index) in formData.attributeListPrice" :key="index" style="display: flex;margin-top:10rpx;">
<input class="content-input" v-model="item.specName" v-if="item.specName != ''&& formData.attributeListPrice.length != 1" style="padding-right: 10px;" disabled /> <input class="content-input" v-model="item.specName" v-if="item.specName != ''&& formData.attributeListPrice.length != 1" style="padding-right: 20rpx;" disabled />
<input class="content-input" v-model="item.specPrice" style="padding-right: 10px;margin-right: 10px;" @click="changePrice(index)" placeholder="商品价格" /> <input class="content-input" v-model="item.specPrice" style="padding-right: 20rpx;margin-right: 20rpx;" @click="changePrice(index)" placeholder="商品价格" />
<input class="content-input" v-model="item.specNum" style="padding-right: 10px;" @click="changecount(index)" placeholder="商品库存"/> <input class="content-input" v-model="item.specNum" style="padding-right: 20rpx;" @click="changecount(index)" placeholder="商品库存"/>
<button @click="deldantiaoguige(index)" v-if="formData.attributeListPrice.length>1" style="width: 120px;height: 30px;line-height: 30px;color: red;border:none;background: #fff;">删除</button> <button @click="deldantiaoguige(index)" v-if="formData.attributeListPrice.length>1" style="width: 240rpx;height: 60rpx;line-height: 60rpx;color: red;border:none;background: #fff;">删除</button>
</view> </view>
<!-- <view @click="checkSpec('guige')" style="margin-top: 5px;width: 80px;height: 30px;text-align: center;line-height: 30px;background: rgba(0, 35, 28, 1);border-radius: 30px;color: rgba(166, 255, 234, 1);"> <!-- <view @click="checkSpec('guige')" style="margin-top: 5px;width: 80px;height: 30px;text-align: center;line-height: 30px;background: rgba(0, 35, 28, 1);border-radius: 30px;color: rgba(166, 255, 234, 1);">
选择规格 选择规格
@ -53,12 +53,12 @@
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="拼团信息" name="productGroupBuyPrices"> <uni-forms-item label="拼团信息" name="productGroupBuyPrices">
<view> <view>
<view v-for="(item,index) in formData.productGroupBuyPrices" :key="index" style="display: flex;margin-top:5px;"> <view v-for="(item,index) in formData.productGroupBuyPrices" :key="index" style="display: flex;margin-top:10rpx;">
<input class="content-input" v-model="item.groupCount" style="padding-right: 10px;margin-right: 10px;" placeholder="成团人数" /> <input class="content-input" v-model="item.groupCount" style="padding-right: 20rpx;margin-right: 20rpx;" placeholder="成团人数" />
<input class="content-input" v-model="item.groupPrice" style="padding-right: 10px;" placeholder="成团价格"/> <input class="content-input" v-model="item.groupPrice" style="padding-right: 20rpx;" placeholder="成团价格"/>
<button @click="delGroup(index)" v-if="formData.productGroupBuyPrices.length>1" style="width: 120px;height: 30px;line-height: 30px;color: red;border:none;background: #fff;">删除</button> <button @click="delGroup(index)" v-if="formData.productGroupBuyPrices.length>1" style="width: 240rpx;height: 60rpx;line-height: 60rpx;color: red;border:none;background: #fff;">删除</button>
</view> </view>
<view @click="addGroup()" style="margin-top: 5px;width: 80px;height: 30px;text-align: center;line-height: 30px;background: rgba(0, 35, 28, 1);border-radius: 30px;color: rgba(166, 255, 234, 1);"> <view @click="addGroup()" style="margin-top: 10rpx;width: 160rpx;height: 60rpx;text-align: center;line-height: 60rpx;background: rgba(0, 35, 28, 1);border-radius: 60rpx;color: rgba(166, 255, 234, 1);">
新增拼团 新增拼团
</view> </view>
</view> </view>
@ -71,14 +71,14 @@
{{item}} {{item}}
</view> </view>
</view> </view>
<view @click="checkSpec('shuxing')" style="width: 80px;height: 30px;text-align: center;line-height: 30px;background: rgba(0, 35, 28, 1);border-radius: 30px;color: rgba(166, 255, 234, 1);"> <view @click="checkSpec('shuxing')" style="width: 160rpx;height: 60rpx;text-align: center;line-height: 60rpx;background: rgba(0, 35, 28, 1);border-radius: 60rpx;color: rgba(166, 255, 234, 1);">
选择属性 选择属性
</view> </view>
</view> </view>
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="可售时间" name="sellTime"> <uni-forms-item label="可售时间" name="sellTime">
<view style="display: flex;flex-direction: column;"> <view style="display: flex;flex-direction: column;">
<view style="line-height: 37px;"> <view style="line-height: 74rpx;">
<radio :checked="formData.sellTime==0" name="sellTime" @click="checkSellTime(0)" />全时段售卖 <radio :checked="formData.sellTime==0" name="sellTime" @click="checkSellTime(0)" />全时段售卖
<radio :checked="formData.sellTime==1" name="sellTime" @click="checkSellTime(1)" />自定义时段 <radio :checked="formData.sellTime==1" name="sellTime" @click="checkSellTime(1)" />自定义时段
</view> </view>
@ -86,7 +86,7 @@
<picker mode="time" v-model="formData.sellBeginTime" start="00:00" end="23:59" @change="selectDateRange($event,'start')"> <picker mode="time" v-model="formData.sellBeginTime" start="00:00" end="23:59" @change="selectDateRange($event,'start')">
<view class="uni-input">{{formData.sellBeginTime}}</view> <view class="uni-input">{{formData.sellBeginTime}}</view>
</picker> </picker>
<view style="width: 25px;height: 25px;line-height: 25px;text-align: center;">-</view> <view style="width: 50rpx;height: 50rpx;line-height: 50rpx;text-align: center;">-</view>
<picker mode="time" v-model="formData.sellEndTime" start="00:00" end="23:59" @change="selectDateRange($event,'end')"> <picker mode="time" v-model="formData.sellEndTime" start="00:00" end="23:59" @change="selectDateRange($event,'end')">
<view class="uni-input">{{formData.sellEndTime}}</view> <view class="uni-input">{{formData.sellEndTime}}</view>
</picker> </picker>
@ -94,7 +94,7 @@
</view> </view>
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="设置加料" name="isMoreBuy"> <uni-forms-item label="设置加料" name="isMoreBuy">
<view style="line-height: 37px;"> <view style="line-height: 74rpx;">
<radio :checked="formData.isMoreBuy==0" name="isMoreBuy" @click="checkisMoreBuy('0')" /> <radio :checked="formData.isMoreBuy==0" name="isMoreBuy" @click="checkisMoreBuy('0')" />
<radio :checked="formData.isMoreBuy==1" name="isMoreBuy" @click="checkisMoreBuy('1')" /> <radio :checked="formData.isMoreBuy==1" name="isMoreBuy" @click="checkisMoreBuy('1')" />
</view> </view>
@ -124,11 +124,11 @@
<!-- 添加分类弹出层 --> <!-- 添加分类弹出层 -->
<uni-popup ref="addTypeDialog" background-color="#fff"> <uni-popup ref="addTypeDialog" background-color="#fff">
<view class="add-popup-content"> <view class="add-popup-content">
<view style="height:450px;"> <view style="height:900rpx;">
<view class="content-left" style="float: left;"> <view class="content-left" style="float: left;">
<view class="left-box" v-for="(item,index) in categoryData" :key="index" <view class="left-box" v-for="(item,index) in categoryData" :key="index"
:class="item.parentId ? 'left-box-hover':''" @tap="clickLeftBtn(index)"> :class="item.parentId ? 'left-box-hover':''" @tap="clickLeftBtn(index)">
<text style="width: 100%;height: 50px;line-height: 50px;display: inline-block;overflow: hidden;" <text style="width: 100%;height: 100rpx;line-height: 100rpx;display: inline-block;overflow: hidden;"
:class="item.parentId ? 'red' :''">{{item.title}}</text> :class="item.parentId ? 'red' :''">{{item.title}}</text>
</view> </view>
</view> </view>
@ -136,8 +136,8 @@
{{item.title}} {{item.title}}
</view> </view>
</view> </view>
<view slot="footer" style="display: flex;padding-left: 20px;margin-top: 10px;"> <view slot="footer" style="display: flex;padding-left: 40rpx;margin-top: 20rpx;">
<button type="text" @tap="$refs.addTypeDialog.close()" style="margin-right: 10px;">取消</button> <button type="text" @tap="$refs.addTypeDialog.close()" style="margin-right: 20rpx;">取消</button>
<button type="text" @tap="guigeSubmit">提交</button> <button type="text" @tap="guigeSubmit">提交</button>
</view> </view>
</view> </view>
@ -774,7 +774,7 @@
} }
.title-name { .title-name {
padding-top: 55px; padding-top: 110rpx;
font-size: 36rpx; font-size: 36rpx;
font-weight: 700; font-weight: 700;
flex: 1; flex: 1;
@ -784,10 +784,10 @@
.formBox { .formBox {
padding: 20rpx 26rpx; padding: 20rpx 26rpx;
border-radius: 14rpx; border-radius: 14rpx;
box-shadow: 0px 1px 10px 2px #e2e2e2; box-shadow: 0 1px 20rpx 4rpx #e2e2e2;
background-color: #fff; background-color: #fff;
position: fixed; position: fixed;
top: 100px; top: 200rpx;
left: 2.5%; left: 2.5%;
width: 95%; width: 95%;
overflow: scroll; overflow: scroll;
@ -804,7 +804,7 @@
line-height: 90rpx; line-height: 90rpx;
font-size: 36rpx; font-size: 36rpx;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
border-radius: 10px; border-radius: 20rpx;
font-weight: 700; font-weight: 700;
flex: 1; flex: 1;
} }
@ -817,69 +817,69 @@
line-height: 1; line-height: 1;
font-size: 28rpx; font-size: 28rpx;
height: 70rpx; height: 70rpx;
border: 2px solid #eee; border: 4rpx solid #eee;
padding-left: 20rpx; padding-left: 20rpx;
border-radius: 5px; border-radius: 10rpx;
} }
.add-popup-content { .add-popup-content {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 30rpx 30rpx 30rpx 0; padding: 30rpx 30rpx 30rpx 0;
width: 300px; width: 600rpx;
height: 1050rpx; height: 1050rpx;
background-color: #fff; background-color: #fff;
overflow: scroll; overflow: scroll;
border-radius: 10px; border-radius: 20rpx;
} }
.xiangxi-box{ .xiangxi-box{
flex: 1; flex: 1;
border: 1px solid #eee; border: 1px solid #eee;
border-radius: 10px; border-radius: 20rpx;
} }
.left-box { .left-box {
width: 100%; width: 100%;
height: 50px; height: 100rpx;
font-size: 14px; font-size: 28rpx;
text-align: center; text-align: center;
line-height: 50px; line-height: 100rpx;
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
} }
.left-box-hover { .left-box-hover {
width: 100%; width: 100%;
height: 50px; height: 100rpx;
font-size: 14px; font-size: 28rpx;
text-align: center; text-align: center;
line-height: 50px; line-height: 50rpx;
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
background-color: #fff; background-color: #fff;
} }
.content-left { .content-left {
width: 80px; width: 160rpx;
background: #eee; background: #eee;
height: 450px; height: 900rpx;
overflow: scroll; overflow: scroll;
scrollbar-width: none; scrollbar-width: none;
} }
.content-low{ .content-low{
height: 30px; height: 60rpx;
padding: 0 5px; padding: 0 10rpx;
border: 1px solid #eee; border: 1px solid #eee;
display: inline-block; display: inline-block;
margin: 5px; margin: 10rpx;
font-weight: bold; font-weight: bold;
line-height: 30px; line-height: 60rpx;
} }
.checked{ .checked{
background: #60F3FF; background: #60F3FF;
color: #fff !important; color: #fff !important;
} }
.uni-input{ .uni-input{
width: 100px; width: 200rpx;
height: 25px; height: 50rpx;
line-height: 25px; line-height: 50rpx;
border-radius: 5px; border-radius: 10rpx;
border: 1px solid #eee; border: 1px solid #eee;
text-align: center; text-align: center;
} }

24
package1/myCenter/addType.vue

@ -12,7 +12,7 @@
</view> </view>
<view class="card-list"> <view class="card-list">
<ul> <ul>
<li @tap="clickList(item)" v-for="(item, index) in indexList" :key="index" style="height: 50px;line-height: 50px;padding-left: 20px;border-bottom: 1px solid #eee;overflow: hidden;"> <li @tap="clickList(item)" v-for="(item, index) in indexList" :key="index" style="height: 100rpx;line-height: 100rpx;padding-left: 40rpx;border-bottom: 1px solid #eee;overflow: hidden;">
<view class="name"> <view class="name">
<text>{{item.categoryName}}</text> <text>{{item.categoryName}}</text>
</view> </view>
@ -20,7 +20,7 @@
</li> </li>
</ul> </ul>
</view> </view>
<view style="width: 100%;position: fixed;bottom:0;background: #fff;z-index: 99;height: 86px;"> <view style="width: 100%;position: fixed;bottom:0;background: #fff;z-index: 99;height: 172rpx;">
<view class="add-btn" @tap="inputDialogToggle('add')">添加分类</view> <view class="add-btn" @tap="inputDialogToggle('add')">添加分类</view>
</view> </view>
<!-- 添加分类弹出层 --> <!-- 添加分类弹出层 -->
@ -43,7 +43,7 @@
<!-- 新增编辑分类弹窗 --> <!-- 新增编辑分类弹窗 -->
<uni-popup ref="delDialog" type="dialog"> <uni-popup ref="delDialog" type="dialog">
<view class="type-popup" <view class="type-popup"
style="width:100%;margin-bottom: 0;border-radius: 0;height: 650rpx;border-radius: 10px;"> style="width:100%;margin-bottom: 0;border-radius: 0;height: 650rpx;border-radius: 20rpx;">
<view style="height: 120rpx;font-size: 36rpx;font-weight: bold;line-height: 120rpx;text-align: center;"> <view style="height: 120rpx;font-size: 36rpx;font-weight: bold;line-height: 120rpx;text-align: center;">
编辑分类 编辑分类
</view> </view>
@ -271,7 +271,7 @@
} }
.title-name { .title-name {
padding-top: 55px; padding-top: 110rpx;
font-size: 36rpx; font-size: 36rpx;
font-weight: 700; font-weight: 700;
flex: 1; flex: 1;
@ -283,7 +283,7 @@
border-radius: 10upx; border-radius: 10upx;
background: #fff; background: #fff;
height: auto; height: auto;
margin: -60px auto; margin: -120rpx auto;
} }
.name { .name {
@ -306,21 +306,21 @@
width: 500rpx; width: 500rpx;
height: auto; height: auto;
background: #fff; background: #fff;
border-radius: 10px; border-radius: 20rpx;
position: relative; position: relative;
margin-bottom: 40rpx; margin-bottom: 40rpx;
} }
.add-btn { .add-btn {
width: 95%; width: 95%;
height: 50px; height: 100rpx;
margin: 10px auto 0; margin: 20rpx auto 0;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
font-size: 16px; font-size: 32rpx;
font-weight: 700; font-weight: 700;
text-align: center; text-align: center;
line-height: 50px; line-height: 100rpx;
border-radius: 50px; border-radius: 100rpx;
} }
.add-popup-content { .add-popup-content {
@ -355,7 +355,7 @@
flex: 1; flex: 1;
text-align: center; text-align: center;
background: rgba(0, 35, 28, 1); background: rgba(0, 35, 28, 1);
border-radius: 40px; border-radius: 80rpx;
color: rgba(166, 255, 234, 1); color: rgba(166, 255, 234, 1);
} }
.add-input{ .add-input{

2
package1/myCenter/couponList.vue

@ -99,7 +99,7 @@
position: absolute; position: absolute;
} }
.title-name{ .title-name{
padding-top: 55px; padding-top: 110rpx;
font-size: 36rpx; font-size: 36rpx;
font-weight: 700; font-weight: 700;
flex: 1; flex: 1;

6
package1/myCenter/dataStatistics.vue

@ -10,7 +10,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="margin-top: -60px;"> <view style="margin-top: -120rpx;">
<uni-datetime-picker style="margin-bottom:20rpx;" v-model="range" type="daterange" @change="searchList" /> <uni-datetime-picker style="margin-bottom:20rpx;" v-model="range" type="daterange" @change="searchList" />
</view> </view>
<view style="width: 100%;margin: 20rpx auto;background: #fff;"> <view style="width: 100%;margin: 20rpx auto;background: #fff;">
@ -207,7 +207,7 @@
} }
.title-name { .title-name {
padding-top: 55px; padding-top: 110rpx;
font-size: 36rpx; font-size: 36rpx;
font-weight: 700; font-weight: 700;
flex: 1; flex: 1;
@ -332,6 +332,6 @@
float: left; float: left;
background-image: linear-gradient(#84C1FF, #C4E1FF) !important; background-image: linear-gradient(#84C1FF, #C4E1FF) !important;
color: #fff; color: #fff;
border-radius: 10px; border-radius: 20rpx;
} }
</style> </style>

38
package1/myCenter/goodsList.vue

@ -11,7 +11,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="width: 100%;display: flex;height: 100%;padding-bottom: 30px;padding-top: 28%;position: fixed;top: 0;z-index:80;"> <view style="width: 100%;display: flex;height: 100%;padding-bottom: 60rpx;padding-top: 28%;position: fixed;top: 0;z-index:80;">
<view class="content-left"> <view class="content-left">
<view class="left-box" v-for="(item, index) in indexList" :key="index" <view class="left-box" v-for="(item, index) in indexList" :key="index"
:class="item.parentId ? 'left-box-hover':''" @tap="clickLeftBtn(index)"> :class="item.parentId ? 'left-box-hover':''" @tap="clickLeftBtn(index)">
@ -19,11 +19,11 @@
:class="item.parentId ? 'red' :''">{{item.categoryName}}</text> :class="item.parentId ? 'red' :''">{{item.categoryName}}</text>
</view> </view>
</view> </view>
<view class="content-right" style="padding-bottom: 70px;margin-bottom: 100px;"> <view class="content-right" style="padding-bottom: 140rpx;margin-bottom: 200rpx;">
<view class="right-box" v-for="(item,index) in shopList" :key="index"> <view class="right-box" v-for="(item,index) in shopList" :key="index">
<view style="position: relative;display: flex;"> <view style="position: relative;display: flex;">
<view class="box-left" @tap="largeImg(item)"> <view class="box-left" @tap="largeImg(item)">
<view v-if="(item.buyCountNew!= null && item.buyCountNew!= undefined)" style="position: absolute;left: 110rpx;color: #fff;background: red;width: 45rpx;height: 40rpx;font-size: 28rpx;text-align: center;line-height: 40rpx;border-radius: 5px;"> <view v-if="(item.buyCountNew!= null && item.buyCountNew!= undefined)" style="position: absolute;left: 110rpx;color: #fff;background: red;width: 45rpx;height: 40rpx;font-size: 28rpx;text-align: center;line-height: 40rpx;border-radius: 10rpx;">
{{item.buyCountNew}} {{item.buyCountNew}}
</view> </view>
<img class="img-radius" :src="item.productPicture" alt="" v-if="item.productPicture"> <img class="img-radius" :src="item.productPicture" alt="" v-if="item.productPicture">
@ -44,7 +44,7 @@
<text>{{item.startPayNum}}</text> <text>{{item.startPayNum}}</text>
<text>起售数量</text> <text>起售数量</text>
</view> </view>
<view class="price-box" @tap="changeShow(index,'shopList')" style="flex: 1;text-align: right;padding-top: 13px;"> <view class="price-box" @tap="changeShow(index,'shopList')" style="flex: 1;text-align: right;padding-top: 26rpx;">
<uni-icons type="down" size="18"></uni-icons> <uni-icons type="down" size="18"></uni-icons>
</view> </view>
</view> </view>
@ -77,7 +77,7 @@
<view class="right-box" v-for="(item,index) in shopList1" :key="index"> <view class="right-box" v-for="(item,index) in shopList1" :key="index">
<view style="position: relative;display: flex;"> <view style="position: relative;display: flex;">
<view class="box-left" @tap="largeImg(item)"> <view class="box-left" @tap="largeImg(item)">
<view v-if="(item.buyCountNew!= null && item.buyCountNew!= undefined)" style="position: absolute;left: 110rpx;color: #fff;background: red;width: 45rpx;height: 40rpx;font-size: 28rpx;text-align: center;line-height: 40rpx;border-radius: 5px;"> <view v-if="(item.buyCountNew!= null && item.buyCountNew!= undefined)" style="position: absolute;left: 110rpx;color: #fff;background: red;width: 45rpx;height: 40rpx;font-size: 28rpx;text-align: center;line-height: 40rpx;border-radius: 10rpx;">
{{item.buyCountNew}} {{item.buyCountNew}}
</view> </view>
<img class="img-radius" :src="item.productPicture" alt="" v-if="item.productPicture"> <img class="img-radius" :src="item.productPicture" alt="" v-if="item.productPicture">
@ -97,7 +97,7 @@
<text>{{item.startPayNum}}</text> <text>{{item.startPayNum}}</text>
<text>起售数量</text> <text>起售数量</text>
</view> </view>
<view class="price-box" @tap="changeShow(index,'shopList1')" style="flex: 1;text-align: right;padding-top: 13px;"> <view class="price-box" @tap="changeShow(index,'shopList1')" style="flex: 1;text-align: right;padding-top: 26rpx;">
<uni-icons type="down" size="18"></uni-icons> <uni-icons type="down" size="18"></uni-icons>
</view> </view>
</view> </view>
@ -424,10 +424,10 @@
height: 200rpx; height: 200rpx;
} }
.back-btn{ .back-btn{
padding-top: 55px; padding-top: 110rpx;
} }
.title-search{ .title-search{
margin-top: 55px; margin-top: 110rpx;
display: flex; display: flex;
background: #fff; background: #fff;
height: 54rpx; height: 54rpx;
@ -462,7 +462,7 @@
background-color: #fff; background-color: #fff;
} }
.red { .red {
border-right: 3px solid red; border-right: 6rpx solid red;
} }
.content-right { .content-right {
flex: 1; flex: 1;
@ -504,8 +504,8 @@
padding: 5rpx 0; padding: 5rpx 0;
color: #777; color: #777;
text-align: right; text-align: right;
padding-right: 10px; padding-right: 20rpx;
height: 20px; height: 40rpx;
} }
.box-right-price { .box-right-price {
@ -531,23 +531,23 @@
position: fixed; position: fixed;
bottom: 0; bottom: 0;
display: flex; display: flex;
padding-top: 10px; padding-top: 20rpx;
} }
.bottom-btn { .bottom-btn {
width: 50%; width: 50%;
height: 45px; height: 90rpx;
line-height: 45px; line-height: 90rpx;
border-radius: 45px; border-radius: 90rpx;
font-size: 14px; font-size: 28rpx;
font-weight: 700; font-weight: 700;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
text-align: center; text-align: center;
margin: 0 10px; margin: 0 20rpx;
} }
.show-box{ .show-box{
display: flex; display: flex;
height: 50px; height: 100rpx;
background: #eee; background: #eee;
} }
.show-text{ .show-text{
@ -555,6 +555,6 @@
flex-direction: column; flex-direction: column;
text-align: center; text-align: center;
flex: 1; flex: 1;
padding-top: 7px; padding-top: 14rpx;
} }
</style> </style>

60
package1/myCenter/merchantCenter.vue

@ -158,7 +158,7 @@
</view> </view>
</view> </view>
<view class="menu22" @tap="goDetail('hx')"> <view class="menu22" @tap="goDetail('hx')">
<view class="menu33" style="width: 100%;height: 28px;"> <view class="menu33" style="width: 100%;height: 56rpx;">
<uni-icons type="scan" size="25"></uni-icons> <uni-icons type="scan" size="25"></uni-icons>
</view> </view>
<view class="menu44"> <view class="menu44">
@ -296,7 +296,7 @@
} }
.title-name { .title-name {
padding-top: 55px; padding-top: 110rpx;
font-size: 36rpx; font-size: 36rpx;
font-weight: 700; font-weight: 700;
flex: 1; flex: 1;
@ -305,94 +305,94 @@
.shop-title { .shop-title {
width: 95%; width: 95%;
margin: -65px auto 0; margin: -130rpx auto 0;
padding: 10px; padding: 20rpx;
background: #fff; background: #fff;
border-radius: 10px; border-radius: 20rpx;
display: flex; display: flex;
font-size: 14px; font-size: 28rpx;
font-weight: 700; font-weight: 700;
} }
.title1 { .title1 {
width: 35px; width: 70rpx;
height: 35px; height: 70rpx;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 5px; border-radius: 10rpx;
} }
} }
.title2{ .title2{
flex: 1; flex: 1;
line-height: 35px; line-height: 70rpx;
display: flex; display: flex;
} }
.title22{ .title22{
flex: 1; flex: 1;
padding-left: 10px; padding-left: 20rpx;
} }
.shop-order{ .shop-order{
width: 95%; width: 95%;
margin: 10px auto 0; margin: 20rpx auto 0;
background: #fff; background: #fff;
border-radius: 10px; border-radius: 20rpx;
padding: 0 10px 0; padding: 0 20rpx 0;
} }
.order1{ .order1{
height: 35px; height: 70rpx;
line-height: 35px; line-height: 70rpx;
font-size: 14px; font-size: 28rpx;
font-weight: 700; font-weight: 700;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
} }
.order22{ .order22{
display: flex; display: flex;
height: 50px; height: 100rpx;
padding-top: 10px; padding-top: 20rpx;
} }
.order33{ .order33{
flex: 1; flex: 1;
text-align: center; text-align: center;
} }
.order44{ .order44{
font-size: 14px; font-size: 28rpx;
font-weight: 700; font-weight: 700;
} }
.data2{ .data2{
display: flex; display: flex;
height: 70px; height: 140rpx;
text-align: center; text-align: center;
padding-top: 10px; padding-top: 20rpx;
} }
.data22{ .data22{
flex: 1; flex: 1;
} }
.data222{ .data222{
font-size: 18px; font-size: 36rpx;
font-weight: 700; font-weight: 700;
padding-bottom: 10px; padding-bottom: 20rpx;
} }
.menu2{ .menu2{
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
text-align: center; text-align: center;
padding-top: 10px; padding-top: 20rpx;
} }
.menu22{ .menu22{
width: 25%; width: 25%;
height: 60px; height: 120rpx;
} }
.menu33{ .menu33{
img{ img{
width: 25px; width: 50rpx;
height: 25px; height: 50rpx;
background-size: 100%; background-size: 100%;
} }
} }
.menu44{ .menu44{
height: 20px; height: 40rpx;
line-height: 20px; line-height: 40rpx;
} }
</style> </style>

4
package1/myCenter/myMerchant.vue

@ -15,7 +15,7 @@
学生商家 学生商家
</view> </view>
<view class="text" style="text-align: right;"> <view class="text" style="text-align: right;">
<label class="radio" style="padding-right: 10px;" @tap="clickRadio(1)"> <label class="radio" style="padding-right: 20rpx;" @tap="clickRadio(1)">
<radio :checked="formData.isStudent == 1" /><text></text> <radio :checked="formData.isStudent == 1" /><text></text>
</label> </label>
<label class="radio" @tap="clickRadio(0)"> <label class="radio" @tap="clickRadio(0)">
@ -496,7 +496,7 @@
font-size: 36rpx; font-size: 36rpx;
color: #fff; color: #fff;
background: #5fd9ee; background: #5fd9ee;
border-radius: 10px; border-radius: 20rpx;
margin: 40rpx auto; margin: 40rpx auto;
} }
.hasChosen{ .hasChosen{

156
package1/myCenter/partTimeJobRegister.vue

@ -15,20 +15,20 @@
</view> </view>
<view class="reg-value"> <view class="reg-value">
<input type="text" v-model="formData.name" placeholder="请填写姓名" <input type="text" v-model="formData.name" placeholder="请填写姓名"
style="background: #eee;height: 40px;line-height: 40px;padding: 9px 10px;border-radius: 10px;"> style="background: #eee;height: 80rpx;line-height: 80rpx;padding: 18rpx 20rpx;border-radius: 20rpx;">
</view> </view>
</view> </view>
<view class="box1"> <view class="box1">
<view class="reg-name"> <view class="reg-name">
* 学生证上传 <text style="font-size: 12px;font-weight: 400;color: #777;">身份信息仅用于认证身份平台会严格保密</text> * 学生证上传 <text style="font-size: 28rpx;font-weight: 400;color: #777;">身份信息仅用于认证身份平台会严格保密</text>
</view> </view>
<view class="reg-value"> <view class="reg-value">
<img @tap="pictureAdd('mentou')" <img @tap="pictureAdd('mentou')"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/89d37db7e34c490da24c5dd62183bf2d.png" alt="" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/89d37db7e34c490da24c5dd62183bf2d.png" alt=""
style="width: 80px;height: 80px;background-size: 100%;margin-right: 10px;" /> style="width: 160rpx;height: 160rpx;background-size: 100%;margin-right: 20rpx;" />
<img @tap="largeImg" :src="formData.studentCard" alt="" <img @tap="largeImg" :src="formData.studentCard" alt=""
style="width: 80px;height: 80px;background-size: 100%;" /> style="width: 160rpx;height: 160rpx;background-size: 100%;" />
</view> </view>
</view> </view>
<view class="box1"> <view class="box1">
@ -37,7 +37,7 @@
</view> </view>
<view class="reg-value"> <view class="reg-value">
<input type="number" v-model="formData.highFloorFee" placeholder="可设置金额" <input type="number" v-model="formData.highFloorFee" placeholder="可设置金额"
style="background: #eee;height: 40px;line-height: 40px;padding: 9px 10px;border-radius: 10px;"> style="background: #eee;height: 80rpx;line-height: 80rpx;padding: 18rpx 20rpx;border-radius: 20rpx;">
</view> </view>
</view> </view>
<view class="box1"> <view class="box1">
@ -71,7 +71,7 @@
</view> </view>
</view> </view>
<view class="guize-list"> <view class="guize-list">
<view class="guize1" v-for="(item, index) in waimaRuleList" :key="index" style="flex-direction: column; padding-bottom: 10px; border-bottom: 1px solid #ddd;"> <view class="guize1" v-for="(item, index) in waimaRuleList" :key="index" style="flex-direction: column; padding-bottom: 20rpx; border-bottom: 1px solid #ddd;">
<view style="display: flex; width: 100%;"> <view style="display: flex; width: 100%;">
<view class="guize1-qusong"> <view class="guize1-qusong">
<view class="qusong1"> <view class="qusong1">
@ -91,12 +91,12 @@
</view> </view>
<view class="qusong3" style="display:flex; align-items:center;"> <view class="qusong3" style="display:flex; align-items:center;">
<input type="digit" v-model="item.orderBkge" placeholder="填写配送费" style="flex:1;"> <input type="digit" v-model="item.orderBkge" placeholder="填写配送费" style="flex:1;">
<uni-icons type="closeempty" size="20" @click="removeRule('waima', index)" color="#ff0000" style="margin-left:5px;"></uni-icons> <uni-icons type="closeempty" size="20" @click="removeRule('waima', index)" color="#ff0000" style="margin-left:10rpx;"></uni-icons>
</view> </view>
</view> </view>
<view style="display: flex; width: 100%; margin-top: 10px; align-items: center;"> <view style="display: flex; width: 100%; margin-top: 10px; align-items: center;">
<text style="margin: 0 10px 0 5px; color: #777; font-size: 13px; font-weight: bold;">备注</text> <text style="margin: 0 10px 0 5px; color: #777; font-size: 13px; font-weight: bold;">备注</text>
<input type="text" v-model="item.remark" placeholder="填写备注,如:限时/大件加钱" style="flex:1; background: #fff; border-radius: 5px; padding: 0 10px; height: 30px; line-height: 30px;"> <input type="text" v-model="item.remark" placeholder="填写备注,如:限时/大件加钱" style="flex:1; background: #fff; border-radius: 10rpx; padding: 0 20rpx; height: 60rpx; line-height: 60rpx;">
</view> </view>
</view> </view>
</view> </view>
@ -112,7 +112,7 @@
</view> </view>
</view> </view>
<view class="guize-list"> <view class="guize-list">
<view class="guize1" v-for="(item, index) in paotuiRuleList" :key="index" style="flex-direction: column; padding-bottom: 10px; border-bottom: 1px solid #ddd;"> <view class="guize1" v-for="(item, index) in paotuiRuleList" :key="index" style="flex-direction: column; padding-bottom: 20rpx; border-bottom: 1px solid #ddd;">
<view style="display: flex; width: 100%;"> <view style="display: flex; width: 100%;">
<view class="guize1-qusong"> <view class="guize1-qusong">
<view class="qusong1"> <view class="qusong1">
@ -132,12 +132,12 @@
</view> </view>
<view class="qusong3" style="display:flex; align-items:center;"> <view class="qusong3" style="display:flex; align-items:center;">
<input type="digit" v-model="item.orderBkge" placeholder="填写配送费" style="flex:1;"> <input type="digit" v-model="item.orderBkge" placeholder="填写配送费" style="flex:1;">
<uni-icons type="closeempty" size="20" @click="removeRule('paotui', index)" color="#ff0000" style="margin-left:5px;"></uni-icons> <uni-icons type="closeempty" size="20" @click="removeRule('paotui', index)" color="#ff0000" style="margin-left:10rpx;"></uni-icons>
</view> </view>
</view> </view>
<view style="display: flex; width: 100%; margin-top: 10px; align-items: center;"> <view style="display: flex; width: 100%; margin-top: 20rpx; align-items: center;">
<text style="margin: 0 10px 0 5px; color: #777; font-size: 13px; font-weight: bold;">备注</text> <text style="margin: 0 20rpx 0 10rpx; color: #777; font-size: 26rpx; font-weight: bold;">备注</text>
<input type="text" v-model="item.remark" placeholder="填写备注,如:限时/大件加钱" style="flex:1; background: #fff; border-radius: 5px; padding: 0 10px; height: 30px; line-height: 30px;"> <input type="text" v-model="item.remark" placeholder="填写备注,如:限时/大件加钱" style="flex:1; background: #fff; border-radius: 10rpx; padding: 0 20rpx; height: 60rpx; line-height: 60rpx;">
</view> </view>
</view> </view>
</view> </view>
@ -146,10 +146,10 @@
</view> </view>
<view <view
style="width: 120px;height: 140px;background: rgba(166, 255, 234, 1);margin: 10px auto;border-radius: 20px;text-align: center;"> style="width: 240rpx;height: 280rpx;background: rgba(166, 255, 234, 1);margin: 20rpx auto;border-radius: 40rpx;text-align: center;">
<img show-menu-by-longpress src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d23a9043a8c24731831ec4db909fe3b4.jpg" alt="" <img show-menu-by-longpress src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d23a9043a8c24731831ec4db909fe3b4.jpg" alt=""
style="width: 90px;height: 90px;margin-top: 10px;" /> style="width: 180rpx;height: 180rpx;margin-top: 20rpx;" />
<view style="height: 25px;line-height: 25px;font-weight: 700;">关注公众号</view> <view style="height: 50rpx;line-height: 50rpx;font-weight: 700;">关注公众号</view>
</view> </view>
<view class="btn" @click="submit"> <view class="btn" @click="submit">
提交注册 提交注册
@ -164,34 +164,34 @@
<!-- 规则选择弹出层 --> <!-- 规则选择弹出层 -->
<uni-popup ref="guizePopup" background-color="#fff"> <uni-popup ref="guizePopup" background-color="#fff">
<view class="guize-popup-content"> <view class="guize-popup-content">
<view style="margin-top: 10px;"> <view style="margin-top: 20rpx;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/f06433fa1bd34b31948eaefe5338c357.png" <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/f06433fa1bd34b31948eaefe5338c357.png"
alt="" style="width: 102px;height: 25px;" /> alt="" style="width: 204rpx;height: 50rpx;" />
</view> </view>
<view style="margin-top: 10px;height: auto;overflow:hidden;min-height: 45px;"> <view style="margin-top: 20rpx;height: auto;overflow:hidden;min-height: 90rpx;">
<view class="box-check-btn" @tap="qucanOrsongcan('qucan',index)" v-for="(item,index) in qucan" :key="index" <view class="box-check-btn" @tap="qucanOrsongcan('qucan',index)" v-for="(item,index) in qucan" :key="index"
style="float: left;padding: 0 10px;width: auto;margin-bottom:10px;" style="float: left;padding: 0 20rpx;width: auto;margin-bottom:20rpx;"
:style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'#eee',border:item.checked?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}"> :style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'#eee',border:item.checked?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}">
{{item.title}} {{item.title}}
</view> </view>
<view v-if="qucan.length==0" style="color:#999;font-size:12px;margin:10px 0;">暂无可选取货区域</view> <view v-if="qucan.length==0" style="color:#999;font-size:24rpx;margin:20rpx 0;">暂无可选取货区域</view>
</view> </view>
<view style="margin-top: 65px;"> <view style="margin-top: 130rpx;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/32fd9d723fbf4d778f2631277d316940.png" <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/32fd9d723fbf4d778f2631277d316940.png"
alt="" style="width: 102px;height: 25px;" /> alt="" style="width: 204rpx;height: 50rpx;" />
</view> </view>
<view style="margin-top: 10px;height: auto;overflow:hidden;min-height: 45px;"> <view style="margin-top: 20rpx;height: auto;overflow:hidden;min-height: 90rpx;">
<view class="box-check-btn" @tap="qucanOrsongcan('songcan',index)" v-for="(item,index) in songcan" :key="index" <view class="box-check-btn" @tap="qucanOrsongcan('songcan',index)" v-for="(item,index) in songcan" :key="index"
style="float: left;padding: 0 10px;width: auto;margin-bottom:10px;" style="float: left;padding: 0 20rpx;width: auto;margin-bottom:20rpx;"
:style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'#eee',border:item.checked?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}"> :style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'#eee',border:item.checked?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}">
{{item.title}} {{item.title}}
</view> </view>
<view v-if="songcan.length==0" style="color:#999;font-size:12px;margin:10px 0;">暂无可送货区域</view> <view v-if="songcan.length==0" style="color:#999;font-size:24rpx;margin:20rpx 0;">暂无可送货区域</view>
</view> </view>
<view class="guize-btn" @tap="closeGuize"> <view class="guize-btn" @tap="closeGuize">
确定 确定
</view> </view>
<view style="position: absolute;bottom: -50px;left: 50%;transform:translateX(-50%);" @tap.stop="$refs.guizePopup.close()"> <view style="position: absolute;bottom: -100rpx;left: 50%;transform:translateX(-50%);" @tap.stop="$refs.guizePopup.close()">
<uni-icons type="close" size="40" color="#fff"></uni-icons> <uni-icons type="close" size="40" color="#fff"></uni-icons>
</view> </view>
</view> </view>
@ -503,7 +503,7 @@
.title { .title {
background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/461dd2d5ba1f462ca05da7e2379d1d90.png') no-repeat; background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/461dd2d5ba1f462ca05da7e2379d1d90.png') no-repeat;
width: 100%; width: 100%;
height: 320px; height: 640rpx;
background-size: 100%; background-size: 100%;
} }
@ -522,23 +522,23 @@
.content { .content {
position: absolute; position: absolute;
top: 225px; top: 450rpx;
width: 100%; width: 100%;
border-radius: 20px; border-radius: 40rpx;
background: #fff; background: #fff;
padding: 8px 10px; padding: 16rpx 20rpx;
} }
.reg-name { .reg-name {
font-size: 16px; font-size: 32rpx;
font-weight: 700; font-weight: 700;
height: 35px; height: 70rpx;
line-height: 35px; line-height: 70rpx;
margin-top: 10px; margin-top: 20rpx;
} }
.reg-value { .reg-value {
margin-top: 5px; margin-top: 10rpx;
} }
.img-popup-content { .img-popup-content {
@ -547,30 +547,30 @@
} }
.box-check-btn { .box-check-btn {
width: 80px; width: 160rpx;
height: 35px; height: 70rpx;
background: rgba(180, 255, 238, 0.27); background: rgba(180, 255, 238, 0.27);
text-align: center; text-align: center;
line-height: 35px; line-height: 70rpx;
border-radius: 35px; border-radius: 70rpx;
font-weight: 700; font-weight: 700;
border: 1px solid rgba(180, 255, 238, 1); border: 1px solid rgba(180, 255, 238, 1);
margin-right: 10px; margin-right: 20rpx;
} }
.value1 { .value1 {
background: #eee; background: #eee;
border-radius: 10px; border-radius: 20rpx;
padding: 10px; padding: 20rpx;
margin-bottom: 10px; margin-bottom: 20rpx;
} }
.value-title { .value-title {
display: flex; display: flex;
height: 35px; height: 70rpx;
line-height: 35px; line-height: 70rpx;
font-size: 15px; font-size: 30rpx;
font-weight: 400; font-weight: 400;
} }
@ -590,82 +590,82 @@
.guize1-qusong { .guize1-qusong {
display: flex; display: flex;
flex: 1; flex: 1;
padding-top: 10px; padding-top: 20rpx;
} }
.guize1 { .guize1 {
display: flex; display: flex;
margin-top: 10px; margin-top: 20rpx;
} }
.qusong1 { .qusong1 {
width: 20px; width: 40rpx;
height: 20px; height: 40rpx;
background: rgba(0, 35, 28, 1); background: rgba(0, 35, 28, 1);
color: #fff; color: #fff;
border-radius: 20px; border-radius: 40rpx;
text-align: center; text-align: center;
line-height: 20px; line-height: 40rpx;
font-size: 10px; font-size: 20rpx;
z-index: 80; z-index: 80;
} }
.qusong2 { .qusong2 {
height: 20px; height: 40rpx;
font-size: 12px; font-size: 24rpx;
line-height: 19px; line-height: 38rpx;
text-align: center; text-align: center;
background: rgba(166, 255, 234, 0.5); background: rgba(166, 255, 234, 0.5);
padding: 0 10px; padding: 0 20rpx;
margin-left: -5px; margin-left: -10rpx;
font-weight: 700; font-weight: 700;
border-top-right-radius: 20px; border-top-right-radius: 40rpx;
border-bottom-right-radius: 20px; border-bottom-right-radius: 40rpx;
} }
.qusong3 { .qusong3 {
width: 95px; width: 190rpx;
height: 35px; height: 70rpx;
background: #fff; background: #fff;
border-radius: 5px; border-radius: 10rpx;
padding: 5px 10px; padding: 10rpx 20rpx;
flex: 1; flex: 1;
} }
.btn { .btn {
width: 95%; width: 95%;
height: 50px; height: 100rpx;
font-size: 16px; font-size: 32rpx;
font-weight: 700; font-weight: 700;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
border-radius: 50px; border-radius: 100rpx;
line-height: 50px; line-height: 100rpx;
text-align: center; text-align: center;
margin: 20px auto; margin: 40rpx auto;
} }
.guize-popup-content { .guize-popup-content {
height: auto; height: auto;
background: #fff; background: #fff;
padding: 20px; padding: 40rpx;
border-radius: 20px; border-radius: 40rpx;
width: 90%; width: 90%;
margin: 0 auto; margin: 0 auto;
max-height: 430px; max-height: 860rpx;
overflow: scroll; overflow: scroll;
position: relative; position: relative;
} }
.guize-btn{ .guize-btn{
background: #00231c; background: #00231c;
border-radius: 50px; border-radius: 100rpx;
height: 50px; height: 100rpx;
width: 100%; width: 100%;
margin: 60px auto 0; margin: 120rpx auto 0;
color: #b4ffee; color: #b4ffee;
clear: both; clear: both;
text-align: center; text-align: center;
line-height: 50px; line-height: 100rpx;
font-size:15px; font-size:30rpx;
font-weight: 700 font-weight: 700
} }
</style> </style>

42
package1/order/orderConfirm.vue

@ -13,28 +13,28 @@
</view> </view>
<view class="content"> <view class="content">
<view class="box1"> <view class="box1">
<view style="height: 35px;line-height: 35px;text-align: center;"> <view style="height: 70rpx;line-height: 70rpx;text-align: center;">
支付剩余时间 59:09 支付剩余时间 59:09
</view> </view>
<view style="height: 45px;line-height: 45px;text-align: center;font-weight: 700;font-size: 15px;"> <view style="height: 90rpx;line-height: 90rpx;text-align: center;font-weight: 700;font-size: 30rpx;">
<text style="font-size: 30px;">449.96</text> <text style="font-size: 60rpx;">449.96</text>
</view> </view>
<view style="height: 20px;text-align: center;color: red;"> <view style="height: 40rpx;text-align: center;color: red;">
若拼团失败将会为您自动退款 若拼团失败将会为您自动退款
</view> </view>
</view> </view>
<view class="box1" style="display: flex;padding: 20px;"> <view class="box1" style="display: flex;padding: 40rpx;">
<view style="flex: 1;"> <view style="flex: 1;">
<view style="height: 21px;line-height: 21px;display: flex;"> <view style="height: 42rpx;line-height: 42rpx;display: flex;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4c8e0cc311db4d38ab43e019673c4b8c.png" alt="" style="width: 21px;height: 21px;margin-right: 10px;" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4c8e0cc311db4d38ab43e019673c4b8c.png" alt="" style="width: 42rpx;height: 42rpx;margin-right: 20rpx;" />
<text style="font-size: 15px;font-weight: 700;">微信支付</text> <text style="font-size: 30rpx;font-weight: 700;">微信支付</text>
</view> </view>
<view style="text-align: right;margin-left: 30px;color: #777;width: 73px;"> <view style="text-align: right;margin-left: 60rpx;color: #777;width: 146rpx;">
使用微信支付 使用微信支付
</view> </view>
</view> </view>
<view style="width: 18px;padding-top: 10px;"> <view style="width: 36rpx;padding-top: 20rpx;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/02bff7edc4e04caaa1868955ff684f1f.png" alt="" style="width: 18px;height: 18px;" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/02bff7edc4e04caaa1868955ff684f1f.png" alt="" style="width: 36rpx;height: 36rpx;" />
</view> </view>
</view> </view>
<view class="btn"> <view class="btn">
@ -100,7 +100,7 @@
left: 0; left: 0;
} }
.title-name{ .title-name{
padding-top: 55px; padding-top: 110rpx;
font-size: 36rpx; font-size: 36rpx;
font-weight: 700; font-weight: 700;
flex: 1; flex: 1;
@ -108,26 +108,26 @@
} }
.content{ .content{
position: absolute; position: absolute;
top: 100px; top: 200rpx;
width: 95%; width: 95%;
margin-left: 2.5%; margin-left: 2.5%;
} }
.box1{ .box1{
width: 95%; width: 95%;
margin: 0 auto 10px; margin: 0 auto 20rpx;
background: #fff; background: #fff;
border-radius: 10px; border-radius: 20rpx;
padding: 10px; padding: 20rpx;
} }
.btn { .btn {
width: 95%; width: 95%;
height: 50px; height: 100rpx;
font-size: 16px; font-size: 32rpx;
font-weight: 700; font-weight: 700;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
border-radius: 50px; border-radius: 100rpx;
line-height: 50px; line-height: 100rpx;
text-align: center; text-align: center;
margin: 20px auto; margin: 40rpx auto;
} }
</style> </style>

154
package1/order/orderDetail.vue

@ -13,10 +13,10 @@
<view class="ziqu-xuanfu1"> <view class="ziqu-xuanfu1">
外卖配送 外卖配送
</view> </view>
<view style="width: 100%;line-height: 35px;font-size: 14px;font-weight: 700;"> <view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;">
竹仔园牛仔农庄(第六分店) 竹仔园牛仔农庄(第六分店)
</view> </view>
<view style="display: flex;padding: 10px 0;background: #eee;border-radius: 10px;"> <view style="display: flex;padding: 20rpx 0;background: #eee;border-radius: 20rpx;">
<view class="goods-img1"> <view class="goods-img1">
<img src="/static/images/img/shangpintu.png" alt=""> <img src="/static/images/img/shangpintu.png" alt="">
</view> </view>
@ -36,7 +36,7 @@
<view class="pintuan-left-price1"> <view class="pintuan-left-price1">
90.00 90.00
<view <view
style="background: rgba(255, 57, 57, 0.2);padding: 0px 6px;border-radius: 10px;margin-left: 10px;"> style="background: rgba(255, 57, 57, 0.2);padding: 0px 12rpx;border-radius: 20rpx;margin-left: 20rpx;">
<text>拼团</text> <text>拼团</text>
<text style="color: red;">59.9</text> <text style="color: red;">59.9</text>
</view> </view>
@ -45,11 +45,11 @@
</view> </view>
</view> </view>
</view> </view>
<view class="box11" style="position: absolute;top: 400px;left: 2.5%;"> <view class="box11" style="position: absolute;top: 800rpx;left: 2.5%;">
<view class="kaituan11"> <view class="kaituan11">
<view class="kaituan1-title1"> <view class="kaituan1-title1">
差1人即可成团 差1人即可成团
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/21b403bd13414ce79ad73cf1c8e3de98.png" alt="" style="width: 60px;height: 11px;position: absolute;bottom: 0;right: 15px;" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/21b403bd13414ce79ad73cf1c8e3de98.png" alt="" style="width: 120rpx;height: 11px;position: absolute;bottom: 0;right: 15px;" />
</view> </view>
<view class="kaituan1-title11"> <view class="kaituan1-title11">
快呼唤小伙伴参加吧 快呼唤小伙伴参加吧
@ -57,7 +57,7 @@
</view> </view>
<view class="kaituan21"> <view class="kaituan21">
<view class="kaituan221"> <view class="kaituan221">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/801c569079da4540990c1cc634186fdd.png" alt="" style="width: 45px;height: 45px;border-radius: 45px;margin: 0 auto;display: block;" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/801c569079da4540990c1cc634186fdd.png" alt="" style="width: 90rpx;height: 90rpx;border-radius: 90rpx;margin: 0 auto;display: block;" />
</view> </view>
<view class="kaituan221"> <view class="kaituan221">
<view class="weipincheng1"> <view class="weipincheng1">
@ -71,13 +71,13 @@
</view> </view>
</view> </view>
<view class="kaituan31"> <view class="kaituan31">
剩余<text style="font-size: 16px;font-weight: 700;padding: 0 10px;color: red;">23:59:23</text>结束 剩余<text style="font-size: 32rpx;font-weight: 700;padding: 0 20rpx;color: red;">23:59:23</text>结束
</view> </view>
<view class="kaituan41"> <view class="kaituan41">
分享至微信 <uni-icons type="weixin" size="15"></uni-icons> 分享至微信 <uni-icons type="weixin" size="15"></uni-icons>
</view> </view>
<view class="kaituan51"> <view class="kaituan51">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c1f1b45c98fa4db1a1e5f98b3a0573c2.png" alt="" style="width: 260px;height: 75px;margin: 0 auto;display: block;" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c1f1b45c98fa4db1a1e5f98b3a0573c2.png" alt="" style="width: 520rpx;height: 150rpx;margin: 0 auto;display: block;" />
</view> </view>
</view> </view>
</view> </view>
@ -150,10 +150,10 @@
</view> --> </view> -->
</view> </view>
<view class="box1"> <view class="box1">
<view style="width: 100%;line-height: 35px;font-size: 14px;font-weight: 700;"> <view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;">
竹仔园牛仔农庄(第六分店) 竹仔园牛仔农庄(第六分店)
</view> </view>
<view style="display: flex;padding: 10px;background: #eee;border-radius: 10px;"> <view style="display: flex;padding: 20rpx;background: #eee;border-radius: 20rpx;">
<view class="goods-img"> <view class="goods-img">
<img src="/static/images/img/shangpintu.png" alt=""> <img src="/static/images/img/shangpintu.png" alt="">
</view> </view>
@ -177,7 +177,7 @@
</view> </view>
</view> </view>
<view> <view>
<view style="height: 40px;line-height: 40px;display: flex;"> <view style="height: 80rpx;line-height: 80rpx;display: flex;">
<view style="flex: 1;color: #777;font-weight: 700;"> <view style="flex: 1;color: #777;font-weight: 700;">
打包费 打包费
</view> </view>
@ -185,7 +185,7 @@
1 1
</view> </view>
</view> </view>
<view style="height: 40px;line-height: 40px;display: flex;"> <view style="height: 80rpx;line-height: 80rpx;display: flex;">
<view style="flex: 1;color: #777;font-weight: 700;"> <view style="flex: 1;color: #777;font-weight: 700;">
配送费 配送费
</view> </view>
@ -193,7 +193,7 @@
5 5
</view> </view>
</view> </view>
<view style="height: 40px;line-height: 40px;display: flex;"> <view style="height: 80rpx;line-height: 80rpx;display: flex;">
<view style="flex: 1;color: #777;font-weight: 700;"> <view style="flex: 1;color: #777;font-weight: 700;">
优惠券 优惠券
</view> </view>
@ -202,7 +202,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="display: flex;height: 40px;line-height: 50px;border-top: 1px solid #eee;font-size: 16px;font-weight: 700;"> <view style="display: flex;height: 80rpx;line-height: 100rpx;border-top: 1px solid #eee;font-size: 32rpx;font-weight: 700;">
<view style="flex: 1;"> <view style="flex: 1;">
实付 实付
</view> </view>
@ -213,7 +213,7 @@
</view> </view>
<view class="box1"> <view class="box1">
<view> <view>
<view style="height: 40px;line-height: 40px;display: flex;"> <view style="height: 80rpx;line-height: 80rpx;display: flex;">
<view style="flex: 1;color: #777;font-weight: 700;"> <view style="flex: 1;color: #777;font-weight: 700;">
收件地址 收件地址
</view> </view>
@ -221,7 +221,7 @@
北校区1号宿舍楼5楼512(0702) 北校区1号宿舍楼5楼512(0702)
</view> </view>
</view> </view>
<view style="height: 40px;line-height: 40px;display: flex;"> <view style="height: 80rpx;line-height: 80rpx;display: flex;">
<view style="flex: 1;color: #777;font-weight: 700;"> <view style="flex: 1;color: #777;font-weight: 700;">
配送员 配送员
</view> </view>
@ -229,7 +229,7 @@
不指定 不指定
</view> </view>
</view> </view>
<view style="height: 40px;line-height: 40px;display: flex;"> <view style="height: 80rpx;line-height: 80rpx;display: flex;">
<view style="flex: 1;color: #777;font-weight: 700;"> <view style="flex: 1;color: #777;font-weight: 700;">
订单号 订单号
</view> </view>
@ -237,7 +237,7 @@
3847283739782938 3847283739782938
</view> </view>
</view> </view>
<view style="height: 40px;line-height: 40px;display: flex;"> <view style="height: 80rpx;line-height: 80rpx;display: flex;">
<view style="flex: 1;color: #777;font-weight: 700;"> <view style="flex: 1;color: #777;font-weight: 700;">
送达时间 送达时间
</view> </view>
@ -245,7 +245,7 @@
尽快送达 尽快送达
</view> </view>
</view> </view>
<view style="height: 40px;line-height: 40px;display: flex;"> <view style="height: 80rpx;line-height: 80rpx;display: flex;">
<view style="flex: 1;color: #777;font-weight: 700;"> <view style="flex: 1;color: #777;font-weight: 700;">
下单时间 下单时间
</view> </view>
@ -320,7 +320,7 @@
.content{ .content{
position: absolute; position: absolute;
top: 100px; top: 200rpx;
width: 95%; width: 95%;
margin-left: 2.5%; margin-left: 2.5%;
} }
@ -339,10 +339,10 @@
} }
.box1{ .box1{
width: 95%; width: 95%;
margin: 0 auto 10px; margin: 0 auto 20rpx;
background: #fff; background: #fff;
border-radius: 10px; border-radius: 20rpx;
padding: 10px; padding: 20rpx;
} }
.goods-img { .goods-img {
width: 160rpx; width: 160rpx;
@ -375,7 +375,7 @@
} }
.goods-content-bottom { .goods-content-bottom {
display: flex; display: flex;
line-height: 28px; line-height: 56rpx;
color: #777; color: #777;
} }
.pintuan-left-price { .pintuan-left-price {
@ -385,54 +385,54 @@
color: #000; color: #000;
} }
.status-img{ .status-img{
width: 42px; width: 84rpx;
height: 42px; height: 84rpx;
img{ img{
width: 42px; width: 84rpx;
height: 42px; height: 84rpx;
background-size: 100%; background-size: 100%;
} }
} }
.status-text{ .status-text{
flex: 1; flex: 1;
position: relative; position: relative;
padding-left: 10px; padding-left: 20rpx;
} }
.status-zhu{ .status-zhu{
font-size: 16px; font-size: 32rpx;
font-weight: 700; font-weight: 700;
} }
.status-fu{ .status-fu{
height: 25px; height: 50rpx;
line-height: 25px; line-height: 50rpx;
} }
.status-address{ .status-address{
font-weight: 700; font-weight: 700;
} }
.status-btn{ .status-btn{
position: absolute; position: absolute;
top: 10px; top: 20rpx;
right: 0; right: 0;
background: #eee; background: #eee;
width: 65px; width: 130rpx;
height: 25px; height: 50rpx;
text-align: center; text-align: center;
line-height: 25px; line-height: 50rpx;
border-radius: 8px; border-radius: 16rpx;
color: #777; color: #777;
border: 1px solid #777; border: 1px solid #777;
font-size: 10px; font-size: 20rpx;
} }
.btn-box{ .btn-box{
height: 60px; height: 120rpx;
} }
.btn{ .btn{
width: 90%; width: 90%;
height: 50px; height: 100rpx;
line-height: 50px; line-height: 100rpx;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
font-size: 16px; font-size: 32rpx;
border-radius: 60px; border-radius: 120rpx;
text-align: center; text-align: center;
margin: 0 auto; margin: 0 auto;
font-weight: 700; font-weight: 700;
@ -466,11 +466,11 @@
.box11 { .box11 {
width: 95%; width: 95%;
margin: 0 auto 10px; margin: 0 auto 20rpx;
background: #fff; background: #fff;
border-radius: 10px; border-radius: 20rpx;
padding: 10px; padding: 20rpx;
position: absolute;top: 225px;left: 2.5%; position: absolute;top: 450rpx;left: 2.5%;
} }
.goods-img1 { .goods-img1 {
@ -511,7 +511,7 @@
.goods-content-bottom { .goods-content-bottom {
display: flex; display: flex;
line-height: 28px; line-height: 56rpx;
color: #777; color: #777;
} }
@ -520,21 +520,21 @@
top: 0; top: 0;
right: 0; right: 0;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
border-top-right-radius: 10px; border-top-right-radius: 20rpx;
border-bottom-left-radius: 10px; border-bottom-left-radius: 20rpx;
font-weight: 700; font-weight: 700;
font-size: 10px; font-size: 20rpx;
height: 28px; height: 56rpx;
width: 60px; width: 120rpx;
text-align: center; text-align: center;
line-height: 28px; line-height: 56rpx;
} }
.weipincheng1 { .weipincheng1 {
width: 45px; width: 90rpx;
height: 45px; height: 90rpx;
background: #a6ffea; background: #a6ffea;
border-radius: 45px; border-radius: 90rpx;
text-align: center; text-align: center;
font-size: 60rpx; font-size: 60rpx;
font-weight: 700; font-weight: 700;
@ -542,57 +542,57 @@
z-index: 97; z-index: 97;
color: #02fbdd; color: #02fbdd;
border: 1px solid #a6ffea; border: 1px solid #a6ffea;
line-height: 40px; line-height: 80rpx;
margin: 0 auto; margin: 0 auto;
} }
.kaituan11{ .kaituan11{
display: flex; display: flex;
height: 35px; height: 70rpx;
font-size: 22px; font-size: 44rpx;
font-weight: 700; font-weight: 700;
margin-top: 10px; margin-top: 20rpx;
} }
.kaituan1-title1{ .kaituan1-title1{
position: relative; position: relative;
margin-left: 10px; margin-left: 20rpx;
} }
.kaituan1-title11{ .kaituan1-title11{
font-size: 12px; font-size: 24rpx;
background: rgba(224, 255, 222, 0.65); background: rgba(224, 255, 222, 0.65);
border: 1px solid rgba(166, 255, 234, 1); border: 1px solid rgba(166, 255, 234, 1);
border-radius: 10px; border-radius: 20rpx;
height: 22px; height: 44rpx;
line-height: 19px; line-height: 38rpx;
width: 140px; width: 280rpx;
text-align: center; text-align: center;
margin: 5px 0 0 10px; margin: 10rpx 0 0 20rpx;
} }
.kaituan21{ .kaituan21{
display: flex; display: flex;
width: 90%; width: 90%;
margin: 20px auto; margin: 40rpx auto;
} }
.kaituan221{ .kaituan221{
flex: 1; flex: 1;
} }
.kaituan31{ .kaituan31{
height: 40px; height: 80rpx;
line-height: 40px; line-height: 80rpx;
text-align: center; text-align: center;
color: #777; color: #777;
} }
.kaituan41{ .kaituan41{
width: 95%; width: 95%;
height: 50px; height: 100rpx;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
border-radius: 50px; border-radius: 100rpx;
text-align: center; text-align: center;
line-height: 50px; line-height: 100rpx;
font-size: 15px; font-size: 30rpx;
font-weight: 700; font-weight: 700;
margin: 10px auto; margin: 20rpx auto;
} }
.kaituan51{ .kaituan51{
margin: 40px 0 20px; margin: 80rpx 0 40rpx;
} }
</style> </style>

86
package1/order/orderEvaluate.vue

@ -13,10 +13,10 @@
</view> </view>
<view class="content"> <view class="content">
<view class="box1"> <view class="box1">
<view style="width: 100%;line-height: 35px;font-size: 14px;font-weight: 700;"> <view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;">
竹仔园牛仔农庄(第六分店) 竹仔园牛仔农庄(第六分店)
</view> </view>
<view style="display: flex;padding: 10px;background: rgba(247, 248, 248, 1);border-radius: 10px;"> <view style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 1);border-radius: 20rpx;">
<view class="goods-img"> <view class="goods-img">
<img src="/static/images/img/shangpintu.png" alt=""> <img src="/static/images/img/shangpintu.png" alt="">
</view> </view>
@ -73,9 +73,9 @@
</view> </view>
</view> </view>
<view class="eval-num" style="border: none;"> <view class="eval-num" style="border: none;">
<textarea name="" id="" cols="30" rows="10" placeholder="有什么想说的吗?可以写下来,提交给我们" style="width: 100%;font-size: 14px;padding: 15px;height: 100px;"></textarea> <textarea name="" id="" cols="30" rows="10" placeholder="有什么想说的吗?可以写下来,提交给我们" style="width: 100%;font-size: 28rpx;padding: 30rpx;height: 200rpx;"></textarea>
</view> </view>
<view class="eval-num" style="border: none;padding: 0 15px;display: flex;"> <view class="eval-num" style="border: none;padding: 0 30rpx;display: flex;">
<view class="upload-img" @tap="pictureAdd" <view class="upload-img" @tap="pictureAdd"
style="background: #eee;text-align: center;line-height: 160rpx;"> style="background: #eee;text-align: center;line-height: 160rpx;">
<uni-icons type="camera" size="28" color="#777"></uni-icons> <uni-icons type="camera" size="28" color="#777"></uni-icons>
@ -85,17 +85,17 @@
:key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;"> :key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;">
<img :src="orderPicture" alt="" class="upload-img"> <img :src="orderPicture" alt="" class="upload-img">
</view> </view>
<view style="height: 80px;line-height: 20px;padding: 20px 0 0 10px;color: #777;"> <view style="height: 160rpx;line-height: 40rpx;padding: 40rpx 0 0 20rpx;color: #777;">
发图/发视频能更有效地帮助他人哦~ 发图/发视频能更有效地帮助他人哦~
</view> </view>
</view> </view>
</view> </view>
<view style="border: none;padding: 0 15px;display: flex;height: 50px;line-height: 50px;"> <view style="border: none;padding: 0 30rpx;display: flex;height: 100rpx;line-height: 100rpx;">
<view v-if="selected == 'niming'" @tap="checkVoucher('shiming')" class="radio-check"> <view v-if="selected == 'niming'" @tap="checkVoucher('shiming')" class="radio-check">
<uni-icons type="checkmarkempty" size="12"></uni-icons> <uni-icons type="checkmarkempty" size="12"></uni-icons>
</view> </view>
<view class="radio-no-check" @tap="checkVoucher('niming')" v-else></view> <view class="radio-no-check" @tap="checkVoucher('niming')" v-else></view>
<view style="font-size: 14px;font-weight: 700;color: #777;padding-right: 10px;"> <view style="font-size: 28rpx;font-weight: 700;color: #777;padding-right: 20rpx;">
匿名评价 匿名评价
</view> </view>
<view style="font-weight: 700;color: #777;"> <view style="font-weight: 700;color: #777;">
@ -253,7 +253,7 @@
position: absolute; position: absolute;
} }
.title-name{ .title-name{
padding-top: 55px; padding-top: 110rpx;
font-size: 36rpx; font-size: 36rpx;
font-weight: 700; font-weight: 700;
flex: 1; flex: 1;
@ -306,7 +306,7 @@
} }
.goods-content-bottom { .goods-content-bottom {
display: flex; display: flex;
line-height: 28px; line-height: 56rpx;
color: #777; color: #777;
} }
.pintuan-left-price { .pintuan-left-price {
@ -316,52 +316,52 @@
color: #000; color: #000;
} }
.eval-img{ .eval-img{
width: 46px; width: 92rpx;
height: 46px; height: 92rpx;
background-size: 100%; background-size: 100%;
} }
.eval-title{ .eval-title{
height: 54px; height: 108rpx;
font-size: 14px; font-size: 28rpx;
text-align: center; text-align: center;
background: rgba(235, 255, 243, 1); background: rgba(235, 255, 243, 1);
border-top-left-radius: 10px; border-top-left-radius: 20rpx;
border-top-right-radius: 10px; border-top-right-radius: 20rpx;
border-top: 1px solid rgba(178, 255, 208, 1); border-top: 1px solid rgba(178, 255, 208, 1);
border-left: 1px solid rgba(178, 255, 208, 1); border-left: 1px solid rgba(178, 255, 208, 1);
border-right: 1px solid rgba(178, 255, 208, 1); border-right: 1px solid rgba(178, 255, 208, 1);
z-index: 77; z-index: 77;
line-height: 44px; line-height: 88rpx;
} }
.eval-name{ .eval-name{
margin-top: -10px; margin-top: -20rpx;
border-top-left-radius: 10px; border-top-left-radius: 20rpx;
border-top-right-radius: 10px; border-top-right-radius: 20rpx;
z-index: 88; z-index: 88;
display: block; display: block;
overflow: hidden; overflow: hidden;
background: #fff; background: #fff;
} }
.eval-name1{ .eval-name1{
height: 54px; height: 108rpx;
font-size: 20px; font-size: 40rpx;
font-weight: 700; font-weight: 700;
text-align: center; text-align: center;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
border-top-left-radius: 10px; border-top-left-radius: 20rpx;
border-top-right-radius: 10px; border-top-right-radius: 20rpx;
line-height: 54px; line-height: 108rpx;
overflow: hidden; overflow: hidden;
display: block; display: block;
} }
.eval-num{ .eval-num{
padding-bottom: 15px; padding-bottom: 30rpx;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
} }
.eval-num1{ .eval-num1{
height: 20px; height: 40rpx;
font-size: 14px; font-size: 28rpx;
margin: 15px; margin: 30rpx;
font-weight: 700; font-weight: 700;
} }
.upload-img { .upload-img {
@ -370,34 +370,34 @@
} }
.radio-check { .radio-check {
background: linear-gradient(90deg, #e3ff96, #a6ffea); background: linear-gradient(90deg, #e3ff96, #a6ffea);
width: 20px; width: 40rpx;
height: 20px; height: 40rpx;
border-radius: 20px; border-radius: 40rpx;
text-align: center; text-align: center;
line-height: 20px; line-height: 40rpx;
margin: 15px 10px 0 0; margin: 30rpx 30rpx 0 0;
} }
.radio-no-check { .radio-no-check {
width: 20px; width: 40rpx;
height: 20px; height: 40rpx;
border-radius: 20px; border-radius: 40rpx;
border: 1px solid #eee; border: 1px solid #eee;
margin: 15px 10px 0 0; margin: 30rpx 20rpx 0 0;
} }
.bottom-btn{ .bottom-btn{
width: 95%; width: 95%;
height: 50px; height: 100rpx;
line-height: 50px; line-height: 100rpx;
text-align: center; text-align: center;
margin: 11px auto; margin: 22rpx auto;
border-radius: 50px; border-radius: 100rpx;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
font-size: 16px; font-size: 32rpx;
font-weight: 700; font-weight: 700;
} }
.bottom{ .bottom{
overflow: hidden; overflow: hidden;
height: 86px; height: 152rpx;
background:#fff; background:#fff;
} }
</style> </style>

12
package1/order/orderList.vue

@ -401,7 +401,7 @@
height: 60rpx; height: 60rpx;
line-height: 60rpx; line-height: 60rpx;
text-align: center; text-align: center;
margin-top: 10px; margin-top: 20rpx;
background: #F5F5F5; background: #F5F5F5;
border-radius: 60rpx; border-radius: 60rpx;
color: #777; color: #777;
@ -414,16 +414,16 @@
height: 80rpx; height: 80rpx;
} }
.jiaobiao{ .jiaobiao{
width:38px; width:76rpx;
height:20px; height:40rpx;
background:rgba(227, 255, 150, 1); background:rgba(227, 255, 150, 1);
font-weight:700; font-weight:700;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
border-top-left-radius: 10px; border-top-left-radius: 20rpx;
border-bottom-right-radius: 10px; border-bottom-right-radius: 20rpx;
text-align: center; text-align: center;
line-height: 20px; line-height: 40rpx;
} }
</style> </style>

84
package1/order/pendGroup.vue

@ -12,10 +12,10 @@
<view class="ziqu-xuanfu"> <view class="ziqu-xuanfu">
外卖配送 外卖配送
</view> </view>
<view style="width: 100%;line-height: 35px;font-size: 14px;font-weight: 700;"> <view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;">
竹仔园牛仔农庄(第六分店) 竹仔园牛仔农庄(第六分店)
</view> </view>
<view style="display: flex;padding: 10px 0;background: #eee;border-radius: 10px;"> <view style="display: flex;padding: 20rpx 0;background: #eee;border-radius: 20rpx;">
<view class="goods-img"> <view class="goods-img">
<img src="/static/images/img/shangpintu.png" alt=""> <img src="/static/images/img/shangpintu.png" alt="">
</view> </view>
@ -35,7 +35,7 @@
<view class="pintuan-left-price"> <view class="pintuan-left-price">
90.00 90.00
<view <view
style="background: rgba(255, 57, 57, 0.2);padding: 0px 6px;border-radius: 10px;margin-left: 10px;"> style="background: rgba(255, 57, 57, 0.2);padding: 0px 12rpx;border-radius: 20rpx;margin-left: 20rpx;">
<text>拼团</text> <text>拼团</text>
<text style="color: red;">59.9</text> <text style="color: red;">59.9</text>
</view> </view>
@ -44,11 +44,11 @@
</view> </view>
</view> </view>
</view> </view>
<view class="box1" style="position: absolute;top: 400px;left: 2.5%;"> <view class="box1" style="position: absolute;top: 800rpx;left: 2.5%;">
<view class="kaituan1"> <view class="kaituan1">
<view class="kaituan1-title"> <view class="kaituan1-title">
差1人即可成团 差1人即可成团
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/21b403bd13414ce79ad73cf1c8e3de98.png" alt="" style="width: 60px;height: 11px;position: absolute;bottom: 0;right: 15px;" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/21b403bd13414ce79ad73cf1c8e3de98.png" alt="" style="width: 120rpx;height: 22rpx;position: absolute;bottom: 0;right: 30rpx;" />
</view> </view>
<view class="kaituan1-title1"> <view class="kaituan1-title1">
快呼唤小伙伴参加吧 快呼唤小伙伴参加吧
@ -56,7 +56,7 @@
</view> </view>
<view class="kaituan2"> <view class="kaituan2">
<view class="kaituan22"> <view class="kaituan22">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/801c569079da4540990c1cc634186fdd.png" alt="" style="width: 45px;height: 45px;border-radius: 45px;margin: 0 auto;display: block;" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/801c569079da4540990c1cc634186fdd.png" alt="" style="width: 90rpx;height: 90rpx;border-radius: 90rpx;margin: 0 auto;display: block;" />
</view> </view>
<view class="kaituan22"> <view class="kaituan22">
<view class="weipincheng"> <view class="weipincheng">
@ -70,13 +70,13 @@
</view> </view>
</view> </view>
<view class="kaituan3"> <view class="kaituan3">
剩余<text style="font-size: 16px;font-weight: 700;padding: 0 10px;color: red;">23:59:23</text>结束 剩余<text style="font-size: 32rpx;font-weight: 700;padding: 0 20rpx;color: red;">23:59:23</text>结束
</view> </view>
<view class="kaituan4"> <view class="kaituan4">
分享至微信 <uni-icons type="weixin" size="15"></uni-icons> 分享至微信 <uni-icons type="weixin" size="15"></uni-icons>
</view> </view>
<view class="kaituan5"> <view class="kaituan5">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c1f1b45c98fa4db1a1e5f98b3a0573c2.png" alt="" style="width: 260px;height: 75px;margin: 0 auto;display: block;" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c1f1b45c98fa4db1a1e5f98b3a0573c2.png" alt="" style="width: 520rpx;height: 150rpx;margin: 0 auto;display: block;" />
</view> </view>
</view> </view>
</view> </view>
@ -142,11 +142,11 @@
.box1 { .box1 {
width: 95%; width: 95%;
margin: 0 auto 10px; margin: 0 auto 20rpx;
background: #fff; background: #fff;
border-radius: 10px; border-radius: 20rpx;
padding: 10px; padding: 20rpx;
position: absolute;top: 225px;left: 2.5%; position: absolute;top: 450rpx;left: 2.5%;
} }
.goods-img { .goods-img {
@ -187,7 +187,7 @@
.goods-content-bottom { .goods-content-bottom {
display: flex; display: flex;
line-height: 28px; line-height: 56rpx;
color: #777; color: #777;
} }
@ -196,21 +196,21 @@
top: 0; top: 0;
right: 0; right: 0;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
border-top-right-radius: 10px; border-top-right-radius: 20rpx;
border-bottom-left-radius: 10px; border-bottom-left-radius: 20rpx;
font-weight: 700; font-weight: 700;
font-size: 10px; font-size: 20rpx;
height: 28px; height: 56rpx;
width: 60px; width: 120rpx;
text-align: center; text-align: center;
line-height: 28px; line-height: 56rpx;
} }
.weipincheng { .weipincheng {
width: 45px; width: 90rpx;
height: 45px; height: 90rpx;
background: #a6ffea; background: #a6ffea;
border-radius: 45px; border-radius: 90rpx;
text-align: center; text-align: center;
font-size: 60rpx; font-size: 60rpx;
font-weight: 700; font-weight: 700;
@ -218,57 +218,57 @@
z-index: 97; z-index: 97;
color: #02fbdd; color: #02fbdd;
border: 1px solid #a6ffea; border: 1px solid #a6ffea;
line-height: 40px; line-height: 80rpx;
margin: 0 auto; margin: 0 auto;
} }
.kaituan1{ .kaituan1{
display: flex; display: flex;
height: 35px; height: 70rpx;
font-size: 22px; font-size: 44rpx;
font-weight: 700; font-weight: 700;
margin-top: 10px; margin-top: 20rpx;
} }
.kaituan1-title{ .kaituan1-title{
position: relative; position: relative;
margin-left: 10px; margin-left: 20rpx;
} }
.kaituan1-title1{ .kaituan1-title1{
font-size: 12px; font-size: 24rpx;
background: rgba(224, 255, 222, 0.65); background: rgba(224, 255, 222, 0.65);
border: 1px solid rgba(166, 255, 234, 1); border: 1px solid rgba(166, 255, 234, 1);
border-radius: 10px; border-radius: 20rpx;
height: 22px; height: 44rpx;
line-height: 19px; line-height: 38rpx;
width: 140px; width: 280rpx;
text-align: center; text-align: center;
margin: 5px 0 0 10px; margin: 10rpx 0 0 20rpx;
} }
.kaituan2{ .kaituan2{
display: flex; display: flex;
width: 90%; width: 90%;
margin: 20px auto; margin: 40rpx auto;
} }
.kaituan22{ .kaituan22{
flex: 1; flex: 1;
} }
.kaituan3{ .kaituan3{
height: 40px; height: 80rpx;
line-height: 40px; line-height: 80rpx;
text-align: center; text-align: center;
color: #777; color: #777;
} }
.kaituan4{ .kaituan4{
width: 95%; width: 95%;
height: 50px; height: 100rpx;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
border-radius: 50px; border-radius: 100rpx;
text-align: center; text-align: center;
line-height: 50px; line-height: 100rpx;
font-size: 15px; font-size: 30rpx;
font-weight: 700; font-weight: 700;
margin: 10px auto; margin: 20rpx auto;
} }
.kaituan5{ .kaituan5{
margin: 40px 0 20px; margin: 80rpx 0 40rpx;
} }
</style> </style>
Loading…
Cancel
Save