tianyi 1 month ago
parent
commit
1fc60241c7
  1. 14
      package1/address/addressList.vue
  2. 12
      package1/buyFood/buyFood.vue
  3. 6
      package1/group/groupBuySingle.vue
  4. 2
      package1/group/searchGroup.vue
  5. 6
      package1/group/shopEvaluate.vue
  6. 58
      package1/index/deliveryPersonList.vue
  7. 4
      package1/myCenter/addGoods.vue
  8. 6
      package1/myCenter/dataStatistics.vue
  9. 4
      package1/myCenter/goodsList.vue
  10. 16
      package1/myCenter/partTimeJobRegister.vue
  11. 14
      package1/order/orderDetail.vue
  12. 6
      package1/order/orderEvaluate.vue
  13. 40
      package1/order/orderList.vue
  14. 2
      package1/order/pendGroup.vue
  15. 8
      package1/order/returnOrder.vue
  16. 16
      package1/runErrand/runErrand.vue

14
package1/address/addressList.vue

@ -6,7 +6,7 @@
</view> </view>
<view style="padding-bottom: 140rpx;"> <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: 20rpx;display: flex;padding: 20rpx 40rpx 40rpx;background: #f5f5f5;border-radius: 20rpx;"> style="margin-bottom: 20rpx;display: flex;padding: 20rpx 40rpx 40rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
<view style="flex: 1;"> <view style="flex: 1;">
<view style="height: 70rpx;line-height: 70rpx;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: 20rpx;color: white;background: red;padding: 4rpx 12rpx;border-radius: 8rpx;margin-right: 10rpx;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>
@ -41,31 +41,31 @@
<view style="height: 80rpx;line-height: 80rpx;font-size: 36rpx;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: 20rpx;background: #f5f5f5;border-radius: 20rpx;"> <view style="margin-bottom: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
<uni-combox :candidates="areaTitleList" placeholder="请搜索选择楼座区域" :border="false" v-model="areaTitleInput" emptyTips="未找到匹配的楼座" @focus="isComboxFocused = true" @blur="isComboxFocused = false"></uni-combox> <uni-combox :candidates="areaTitleList" placeholder="请搜索选择楼座区域" :border="false" v-model="areaTitleInput" emptyTips="未找到匹配的楼座" @focus="isComboxFocused = true" @blur="isComboxFocused = false"></uni-combox>
</view> </view>
<view style="margin-bottom: 20rpx;display: flex;padding: 20rpx;background: #f5f5f5;border-radius: 20rpx;"> <view style="margin-bottom: 20rpx;display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
<input :disabled="isComboxFocused" type="number" v-model="addressForm.floor" placeholder="请填写所在楼层(仅限整数)" style="width: 100%;" /> <input :disabled="isComboxFocused" type="number" v-model="addressForm.floor" placeholder="请填写所在楼层(仅限整数)" style="width: 100%;" />
<view v-show="isComboxFocused" style="width: 100%; height: 42rpx; line-height: 42rpx;"> <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: 20rpx;display: flex;padding: 20rpx;background: #f5f5f5;border-radius: 20rpx;"> <view style="margin-bottom: 20rpx;display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
<input :disabled="isComboxFocused" type="text" v-model="addressForm.roomNum" placeholder="请填写门牌号或所在机构科室" style="width: 100%;" /> <input :disabled="isComboxFocused" type="text" v-model="addressForm.roomNum" placeholder="请填写门牌号或所在机构科室" style="width: 100%;" />
<view v-show="isComboxFocused" style="width: 100%; height: 42rpx; line-height: 42rpx;"> <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: 20rpx;display: flex;padding: 20rpx;background: #f5f5f5;border-radius: 20rpx;"> <view style="margin-bottom: 20rpx;display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
<input :disabled="isComboxFocused" type="text" v-model="addressForm.receiverName" placeholder="收货人名字" style="width: 100%;" /> <input :disabled="isComboxFocused" type="text" v-model="addressForm.receiverName" placeholder="收货人名字" style="width: 100%;" />
<view v-show="isComboxFocused" style="width: 100%; height: 42rpx; line-height: 42rpx;"> <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: 20rpx;display: flex;padding: 20rpx;background: #f5f5f5;border-radius: 20rpx;"> <view style="margin-bottom: 20rpx;display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
<input :disabled="isComboxFocused" type="number" maxlength="11" v-model="addressForm.receiverPhone" placeholder="联系电话" style="width: 100%;" /> <input :disabled="isComboxFocused" type="number" maxlength="11" v-model="addressForm.receiverPhone" placeholder="联系电话" style="width: 100%;" />
<view v-show="isComboxFocused" style="width: 100%; height: 42rpx; line-height: 42rpx;"> <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>
@ -263,6 +263,6 @@
.uni-combox{ .uni-combox{
border: 0 !important; border: 0 !important;
padding: 20rpx 20rpx !important; padding: 20rpx 20rpx !important;
background: #f5f5f5; background: rgba(247, 248, 248, 0.6);
} }
</style> </style>

12
package1/buyFood/buyFood.vue

@ -58,7 +58,7 @@
</view> </view>
<view class="time-box" v-if="isPaotui"> <view class="time-box" v-if="isPaotui">
<view class="time1" @tap="checkTime(true)" <view class="time1" @tap="checkTime(true)"
:style="{'background':formData.isImmediately?'linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))':'#f5f5f5'}"> :style="{'background':formData.isImmediately?'linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))':'rgba(247, 248, 248, 0.6)'}">
<view style="font-weight: 700;"> <view style="font-weight: 700;">
立即送出 立即送出
</view> </view>
@ -67,7 +67,7 @@
</view> </view>
</view> </view>
<view class="time1" @tap="checkTime(false)" <view class="time1" @tap="checkTime(false)"
:style="{'background':formData.isImmediately==false?'linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))':'#f5f5f5'}"> :style="{'background':formData.isImmediately==false?'linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))':'rgba(247, 248, 248, 0.6)'}">
<view style="font-weight: 700;"> <view style="font-weight: 700;">
预约配送 预约配送
</view> </view>
@ -139,7 +139,7 @@
</view> </view>
<block v-if="!isGroupBuy"> <block v-if="!isGroupBuy">
<view style="display: flex;padding: 20rpx;background: #f5f5f5;border-radius: 20rpx; margin-bottom:20rpx;" <view style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx; margin-bottom:20rpx;"
v-for="(cartItem, index) in cartItems" :key="index"> v-for="(cartItem, index) in cartItems" :key="index">
<view class="goods-img"> <view class="goods-img">
<img :src="cartItem.item.productPicture" alt=""> <img :src="cartItem.item.productPicture" alt="">
@ -165,7 +165,7 @@
</view> </view>
</block> </block>
<block v-else> <block v-else>
<view style="display: flex;padding: 20rpx;background: #f5f5f5;border-radius: 20rpx; margin-bottom:20rpx;" <view style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx; margin-bottom:20rpx;"
v-if="groupItem"> v-if="groupItem">
<view class="goods-img"> <view class="goods-img">
<img :src="groupItem.item.productPicture" alt=""> <img :src="groupItem.item.productPicture" alt="">
@ -193,7 +193,7 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="groupItem.item.moreBuyData" style="display: flex;padding: 20rpx;background: #f5f5f5;border-radius: 20rpx; margin-bottom:20rpx;" <view v-if="groupItem.item.moreBuyData" style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx; margin-bottom:20rpx;"
v-for="(cartItem, index) in groupItem.item.moreBuyData" :key="index"> v-for="(cartItem, index) in groupItem.item.moreBuyData" :key="index">
<view class="goods-img"> <view class="goods-img">
<img :src="cartItem.productPicture" alt=""> <img :src="cartItem.productPicture" alt="">
@ -1290,7 +1290,7 @@
} }
.ziqu-box { .ziqu-box {
background: #f5f5f5; background: rgba(247, 248, 248, 0.6);
width: 90%; width: 90%;
margin: 0 auto; margin: 0 auto;
border-radius: 20rpx; border-radius: 20rpx;

6
package1/group/groupBuySingle.vue

@ -2119,7 +2119,7 @@
.spec222 { .spec222 {
display: inline-block; display: inline-block;
padding: 0 20rpx; padding: 0 20rpx;
background: #f5f5f5; background: rgba(247, 248, 248, 0.6);
color: #777; color: #777;
height: 72rpx; height: 72rpx;
line-height: 72rpx; line-height: 72rpx;
@ -2141,7 +2141,7 @@
.team1 { .team1 {
width: 154rpx; width: 154rpx;
background: #f5f5f5; background: rgba(247, 248, 248, 0.6);
border-radius: 20rpx; border-radius: 20rpx;
font-size: 26rpx; font-size: 26rpx;
text-align: center; text-align: center;
@ -2154,7 +2154,7 @@
.team2{ .team2{
width: 190rpx; width: 190rpx;
height: 270rpx; height: 270rpx;
background: #f5f5f5; background: rgba(247, 248, 248, 0.6);
border-radius: 10px; border-radius: 10px;
float: left; float: left;
text-align: center; text-align: center;

2
package1/group/searchGroup.vue

@ -20,7 +20,7 @@
<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:20rpx;margin-bottom:20rpx;background: #f5f5f5;display: inline-block;padding: 10rpx 20rpx;border-radius: 10rpx;float: left;"> <view v-for="(item, index) in historyList" :key="index" @tap="clickHistory(item)" style="margin-right:20rpx;margin-bottom:20rpx;background: rgba(247, 248, 248, 0.6);display: inline-block;padding: 10rpx 20rpx;border-radius: 10rpx;float: left;">
{{item}} {{item}}
</view> </view>
</view> </view>

6
package1/group/shopEvaluate.vue

@ -82,13 +82,13 @@
回复 回复
</view> </view>
<view class="" v-else> <view class="" v-else>
<view class="" style="background: #f5f5f5;border-radius: 10px;border: 1px solid #777;margin-top: 10px;"> <view class="" style="background: rgba(247, 248, 248, 0.6);border-radius: 10px;border: 1px solid #777;margin-top: 10px;">
<view class="eval-num" style="border: none;"> <view class="eval-num" style="border: none;">
<textarea name="" v-model="replyText" id="" cols="30" rows="10" placeholder="有什么想说的吗?可以写下来,提交给我们" style="width: 100%;font-size: 28rpx;padding: 30rpx;height: 200rpx;"></textarea> <textarea name="" v-model="replyText" 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 30rpx;display: flex;margin-bottom: 10px;"> <view class="eval-num" style="border: none;padding: 0 30rpx;display: flex;margin-bottom: 10px;">
<view class="upload-img" @tap="pictureAdd()" <view class="upload-img" @tap="pictureAdd()"
style="background: #f5f5f5;text-align: center;line-height: 160rpx;"> style="background: rgba(247, 248, 248, 0.6);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>
</view> </view>
<view style="flex: 1;display: flex;"> <view style="flex: 1;display: flex;">
@ -537,7 +537,7 @@
/* 卡片整体样式(可根据需要调整外间距) */ /* 卡片整体样式(可根据需要调整外间距) */
.reply-card { .reply-card {
border-radius: 12rpx; border-radius: 12rpx;
background-color: #f5f5f5; background-color: rgba(247, 248, 248, 0.6);
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
margin-top:20rpx; margin-top:20rpx;

58
package1/index/deliveryPersonList.vue

@ -11,7 +11,7 @@
</view> </view>
</view> </view>
</view> </view>
<map id="map" :latitude="latitude" :longitude="longitude" :markers="markers" :polyline="polyline" <map id="map" :latitude="latitude" :longitude="longitude" :markers="markers"
style="width: 95%;height: 300rpx;margin: 0 auto;border-radius: 20rpx;overflow: hidden;position: absolute;top: 200rpx;left: 1%;border: 4rpx solid #fff;"></map> style="width: 95%;height: 300rpx;margin: 0 auto;border-radius: 20rpx;overflow: hidden;position: absolute;top: 200rpx;left: 1%;border: 4rpx solid #fff;"></map>
<view class="title-sort"> <view class="title-sort">
<view class="sort-member" style="position: relative;"> <view class="sort-member" style="position: relative;">
@ -23,21 +23,24 @@
@tap="searchShop('area',item.id)">{{item.title}}</view> @tap="searchShop('area',item.id)">{{item.title}}</view>
</view> </view>
</view> </view>
<view @tap="searchShop('baozhang')" class="sort-member" style="border-radius: 60rpx" :style="{'background':baozhang==true?'rgba(166, 255, 234, 0.16)':'#fff','border':baozhang==true?'1px solid rgba(166, 255, 234, 1)':'0'}"> <view @tap="searchShop('baozhang')" class="sort-member" style="border-radius: 60rpx"
:style="{'background':baozhang==true?'rgba(166, 255, 234, 0.16)':'#fff','border':baozhang==true?'1px solid rgba(166, 255, 234, 1)':'0'}">
交易保障 交易保障
</view> </view>
<view @tap="searchShop('xiangtong')" class="sort-member" style="border-radius: 60rpx" :style="{'background':xiangtong==true?'rgba(138, 255, 67, 0.16)':'#fff','border':xiangtong==true?'1px solid rgba(138, 255, 67, 1)':'0'}"> <view @tap="searchShop('xiangtong')" class="sort-member" style="border-radius: 60rpx"
:style="{'background':xiangtong==true?'rgba(138, 255, 67, 0.16)':'#fff','border':xiangtong==true?'1px solid rgba(138, 255, 67, 1)':'0'}">
相同地址 相同地址
</view> </view>
<view class="sort-member" style="display: flex;padding-left: 10rpx;"> <view class="sort-member" style="display: flex;padding-left: 10rpx;">
<uni-icons type="search" size="12"></uni-icons> <uni-icons type="search" size="12"></uni-icons>
<input type="text" placeholder="搜索" style="height: 60rpx;line-height: 60rpx;" v-model="keyword" @confirm="getShopList"> <input type="text" placeholder="搜索" style="height: 60rpx;line-height: 60rpx;" v-model="keyword"
@confirm="getShopList">
</view> </view>
</view> </view>
<view class="man-box" v-for="(worker, index) in workerList" :key="index" @tap="selectWorker(worker)"> <view class="man-box" v-for="(worker, index) in workerList" :key="index" @tap="selectWorker(worker)">
<view class="man-title"> <view class="man-title">
<img :src="worker.icon || 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/801c569079da4540990c1cc634186fdd.png'" alt="" <img :src="worker.icon || 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/801c569079da4540990c1cc634186fdd.png'"
style="width: 120rpx;height: 120rpx;border-radius:60rpx;" /> alt="" style="width: 120rpx;height: 120rpx;border-radius:60rpx;" />
<view class="man-title1"> <view class="man-title1">
<view class="man-title2"> <view class="man-title2">
<view class="man-name"> <view class="man-name">
@ -45,7 +48,8 @@
</view> </view>
<view style="flex:1;"> <view style="flex:1;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d27fa14c6bb7426482ed7821919d3aa7.png" <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d27fa14c6bb7426482ed7821919d3aa7.png"
alt="" style="width: 140rpx;height: 32rpx;margin-top: 18rpx;" v-if="worker.rebateAmount > 0" /> alt="" style="width: 140rpx;height: 32rpx;margin-top: 18rpx;"
v-if="worker.rebateAmount > 0" />
</view> </view>
<view class="shop-menu-purchase man-name"> <view class="shop-menu-purchase man-name">
¥{{worker.orderBkge}} ¥{{worker.orderBkge}}
@ -55,11 +59,13 @@
<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: 4rpx;"> <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>
<view class="man-num"> <view class="man-num">
平均配送时长 <text style="font-size: 30rpx;font-weight: 700;color: #000;">{{worker.avgTime || 30}}</text>分钟 平均配送时长 <text
style="font-size: 30rpx;font-weight: 700;color: #000;">{{worker.avgTime || 30}}</text>分钟
</view> </view>
</view> </view>
</view> </view>
@ -72,7 +78,8 @@
当前待送 <text style="font-size:36rpx;font-weight:700;color: #000;">{{worker.orderPutCount || 0}}</text> 当前待送 <text style="font-size:36rpx;font-weight:700;color: #000;">{{worker.orderPutCount || 0}}</text>
</view> </view>
<view class="man-dingdan1"> <view class="man-dingdan1">
待接单数 <text style="font-size:36rpx;font-weight:700;color: #000;">{{worker.orderWaitCount || 0}}</text> 待接单数 <text
style="font-size:36rpx;font-weight:700;color: #000;">{{worker.orderWaitCount || 0}}</text>
</view> </view>
</view> </view>
<view class="man-mank"> <view class="man-mank">
@ -157,12 +164,39 @@
this.tui.request("/worker/getMatchingWorkerList", "POST", payload, false, false).then(res => { this.tui.request("/worker/getMatchingWorkerList", "POST", payload, false, false).then(res => {
that.loadStatus = 'nomore'; that.loadStatus = 'nomore';
if (res.code == 200) { if (res.code == 200) {
if (res.result != null) { if (res.result != null) {
if (that.pageNum == 1) { if (that.pageNum == 1) {
that.workerList = res.result.records || []; that.workerList = res.result.records || [];
} else { } else {
that.workerList = [...that.workerList, ...res.result.records]; that.workerList = [...that.workerList, ...res.result.records];
} }
that.markers = []
for (let i = 0; i < that.workerList.length; i++) {
that.workerList[i].geolocation = that.workerList[i].geolocation.split(",");
// //
that.markers.push({
id: i,
latitude: that.workerList[i].geolocation[0],
longitude: that.workerList[i].geolocation[1],
title: that.workerList[i].workerName,
iconPath: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/801c569079da4540990c1cc634186fdd.png', //
width: 30,
height: 30,
callout: {
content: "状态不对",
color: '#333333',
fontSize: 14,
borderRadius: 10,
bgColor: '#ffffff',
padding: 8,
display: 'ALWAYS' // 'BYCLICK'() 'ALWAYS'()
}
});
}
that.latitude = that.markers[0].latitude
that.longitude = that.markers[0].longitude
that.totalPages = res.result.pages; // pages = that.totalPages = res.result.pages; // pages =
that.$forceUpdate(); that.$forceUpdate();
} }
@ -355,6 +389,7 @@
.man-title { .man-title {
display: flex; display: flex;
} }
.man-dingdan { .man-dingdan {
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
@ -365,16 +400,19 @@
margin: 20rpx auto; margin: 20rpx auto;
border: 1px solid rgba(166, 255, 234, 1); border: 1px solid rgba(166, 255, 234, 1);
} }
.man-dingdan1 { .man-dingdan1 {
flex: 1; flex: 1;
text-align: center; text-align: center;
color: #777; color: #777;
} }
.man-mank { .man-mank {
line-height: 40rpx; line-height: 40rpx;
color: #777; color: #777;
font-weight: 700; font-weight: 700;
} }
.shop-menu-purchase { .shop-menu-purchase {
display: flex; display: flex;
background: rgba(255, 57, 57, 0.1); background: rgba(255, 57, 57, 0.1);

4
package1/myCenter/addGoods.vue

@ -18,7 +18,7 @@
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="商品主图" name="productPicture"> <uni-forms-item label="商品主图" name="productPicture">
<view class="upload-img" @tap="pictureAdd" <view class="upload-img" @tap="pictureAdd"
style="background: #f5f5f5;text-align: center;line-height: 160rpx;"> style="background: rgba(247, 248, 248, 0.6);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>
</view> </view>
<view style="overflow-x: scroll;display: flex;width: 350rpx;"> <view style="overflow-x: scroll;display: flex;width: 350rpx;">
@ -897,7 +897,7 @@
} }
.content-left { .content-left {
width: 160rpx; width: 160rpx;
background: #f5f5f5; background: rgba(247, 248, 248, 0.6);
height: 900rpx; height: 900rpx;
overflow: scroll; overflow: scroll;
scrollbar-width: none; scrollbar-width: none;

6
package1/myCenter/dataStatistics.vue

@ -39,7 +39,7 @@
</view> </view>
</view> </view>
<view style="width: 100%;height: 10rpx;background: #f5f5f5;"></view> <view style="width: 100%;height: 10rpx;background: rgba(247, 248, 248, 0.6);"></view>
<view class="box"> <view class="box">
<view style="width: 69%;"> <view style="width: 69%;">
<view style="width: 50rpx;height: 50rpx;float: left;margin-right: 20rpx;"> <view style="width: 50rpx;height: 50rpx;float: left;margin-right: 20rpx;">
@ -52,7 +52,7 @@
</view> </view>
</view> </view>
<view style="width: 100%;height: 10rpx;background: #f5f5f5;"></view> <view style="width: 100%;height: 10rpx;background: rgba(247, 248, 248, 0.6);"></view>
<view class="box"> <view class="box">
<view style="width: 69%;"> <view style="width: 69%;">
<view style="width: 50rpx;height: 50rpx;float: left;margin-right: 20rpx;"> <view style="width: 50rpx;height: 50rpx;float: left;margin-right: 20rpx;">
@ -77,7 +77,7 @@
</view> </view>
</view> </view>
<view style="width: 100%;height: 10rpx;background: #f5f5f5;"></view> <view style="width: 100%;height: 10rpx;background: rgba(247, 248, 248, 0.6);"></view>
<view class="box"> <view class="box">
<view style="width: 69%;"> <view style="width: 69%;">

4
package1/myCenter/goodsList.vue

@ -471,7 +471,7 @@
} }
.content-left { .content-left {
width: 170rpx; width: 170rpx;
background: #f5f5f5; background: rgba(247, 248, 248, 0.6);
overflow: scroll; overflow: scroll;
} }
.left-box { .left-box {
@ -603,7 +603,7 @@
.show-box{ .show-box{
display: flex; display: flex;
height: 100rpx; height: 100rpx;
background: #f5f5f5; background: rgba(247, 248, 248, 0.6);
} }
.show-text{ .show-text{
display: flex; display: flex;

16
package1/myCenter/partTimeJobRegister.vue

@ -15,7 +15,7 @@
</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: #f5f5f5;height: 80rpx;line-height: 80rpx;padding: 18rpx 20rpx;border-radius: 20rpx;"> style="background: rgba(247, 248, 248, 0.6);height: 80rpx;line-height: 80rpx;padding: 18rpx 20rpx;border-radius: 20rpx;">
</view> </view>
</view> </view>
@ -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: #f5f5f5;height: 80rpx;line-height: 80rpx;padding: 18rpx 20rpx;border-radius: 20rpx;"> style="background: rgba(247, 248, 248, 0.6);height: 80rpx;line-height: 80rpx;padding: 18rpx 20rpx;border-radius: 20rpx;">
</view> </view>
</view> </view>
<view class="box1"> <view class="box1">
@ -46,7 +46,7 @@
</view> </view>
<view class="reg-value"> <view class="reg-value">
<input type="number" v-model="formData.mobile" placeholder="手机号" <input type="number" v-model="formData.mobile" placeholder="手机号"
style="background: #f5f5f5;height: 80rpx;line-height: 80rpx;padding: 18rpx 20rpx;border-radius: 20rpx;"> style="background: rgba(247, 248, 248, 0.6);height: 80rpx;line-height: 80rpx;padding: 18rpx 20rpx;border-radius: 20rpx;">
</view> </view>
</view> </view>
<view class="box1"> <view class="box1">
@ -55,11 +55,11 @@
</view> </view>
<view class="reg-value" style="display: flex;"> <view class="reg-value" style="display: flex;">
<view class="box-check-btn" @tap="waimaOrpaotui('waima')" <view class="box-check-btn" @tap="waimaOrpaotui('waima')"
:style="{background:formData.waima?'rgba(180, 255, 238, 0.27)':'#f5f5f5',border:formData.waima?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}"> :style="{background:formData.waima?'rgba(180, 255, 238, 0.27)':'rgba(247, 248, 248, 0.6)',border:formData.waima?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}">
外卖 外卖
</view> </view>
<view class="box-check-btn" @tap="waimaOrpaotui('paotui')" <view class="box-check-btn" @tap="waimaOrpaotui('paotui')"
:style="{background:formData.paotui?'rgba(180, 255, 238, 0.27)':'#f5f5f5',border:formData.paotui?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}"> :style="{background:formData.paotui?'rgba(180, 255, 238, 0.27)':'rgba(247, 248, 248, 0.6)',border:formData.paotui?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}">
快递 快递
</view> </view>
</view> </view>
@ -180,7 +180,7 @@
<view style="margin-top: 20rpx;height: auto;overflow:hidden;min-height: 90rpx;"> <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 20rpx;width: auto;margin-bottom:20rpx;" style="float: left;padding: 0 20rpx;width: auto;margin-bottom:20rpx;"
:style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'#f5f5f5',border:item.checked?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}"> :style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'rgba(247, 248, 248, 0.6)',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:24rpx;margin:20rpx 0;">暂无可选取货区域</view> <view v-if="qucan.length==0" style="color:#999;font-size:24rpx;margin:20rpx 0;">暂无可选取货区域</view>
@ -192,7 +192,7 @@
<view style="margin-top: 20rpx;height: auto;overflow:hidden;min-height: 90rpx;"> <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 20rpx;width: auto;margin-bottom:20rpx;" style="float: left;padding: 0 20rpx;width: auto;margin-bottom:20rpx;"
:style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'#f5f5f5',border:item.checked?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}"> :style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'rgba(247, 248, 248, 0.6)',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:24rpx;margin:20rpx 0;">暂无可送货区域</view> <view v-if="songcan.length==0" style="color:#999;font-size:24rpx;margin:20rpx 0;">暂无可送货区域</view>
@ -570,7 +570,7 @@
} }
.value1 { .value1 {
background: #f5f5f5; background: rgba(247, 248, 248, 0.6);
border-radius: 20rpx; border-radius: 20rpx;
padding: 20rpx; padding: 20rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;

14
package1/order/orderDetail.vue

@ -16,7 +16,7 @@
<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;"> <view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;">
{{orderDetail.shopName}} {{orderDetail.shopName}}
</view> </view>
<view style="display: flex;padding: 20rpx 0;background: #f5f5f5;border-radius: 20rpx;"> <view style="display: flex;padding: 20rpx 0;background: rgba(247, 248, 248, 0.6);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>
@ -204,7 +204,7 @@
<view style="width: 100%;line-height: 70rpx;font-size: 30rpx;font-weight: 700;"> <view style="width: 100%;line-height: 70rpx;font-size: 30rpx;font-weight: 700;">
退款/售后 退款/售后
</view> </view>
<view style="display: flex;margin-top:10px;padding: 20rpx;background: #f5f5f5;border-radius: 20rpx;" <view style="display: flex;margin-top:10px;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;"
v-for="(item2,index2) in orderDetail.mallRefundRecord" :key="index2"> v-for="(item2,index2) in orderDetail.mallRefundRecord" :key="index2">
<view style="width: 100%;"> <view style="width: 100%;">
@ -226,9 +226,9 @@
</view> </view>
<view v-for="(item3,index3) in item2.items" :key="index3" <view v-for="(item3,index3) in item2.items" :key="index3"
v-if="item2.items != null && item2.items.length > 0" v-if="item2.items != null && item2.items.length > 0"
style="display: flex;padding: 20rpx;background: #f5f5f5;border-radius: 20rpx;"> style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
<view class="goods-img"> <view class="goods-img">
<img :src="item3.productPicture" alt=""> <img :src="item3.productPicture" alt="" style="border-radius: 20rpx;">
</view> </view>
<view class="goods-content"> <view class="goods-content">
<view class="goods-name"> <view class="goods-name">
@ -307,7 +307,7 @@
<view v-for="(item1,index1) in orderDetail.goodsList" :key="index1" <view v-for="(item1,index1) in orderDetail.goodsList" :key="index1"
v-if="orderDetail.goodsList != null && orderDetail.goodsList.length > 0" v-if="orderDetail.goodsList != null && orderDetail.goodsList.length > 0"
style="display: flex;padding: 20rpx;background: #f5f5f5;border-radius: 20rpx;"> style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
<view class="goods-img"> <view class="goods-img">
<img :src="item1.productPicture" alt=""> <img :src="item1.productPicture" alt="">
</view> </view>
@ -1486,14 +1486,14 @@
position: absolute; position: absolute;
top: 20rpx; top: 20rpx;
right: 0; right: 0;
background: #f5f5f5; background: rgba(247, 248, 248, 0.6);
width: 130rpx; width: 130rpx;
height: 50rpx; height: 50rpx;
text-align: center; text-align: center;
line-height: 50rpx; line-height: 50rpx;
border-radius: 16rpx; border-radius: 16rpx;
color: #777; color: #777;
border: 1px solid #777; border: 1px solid rgba(0, 35, 28, 0.16);
font-size: 20rpx; font-size: 20rpx;
} }

6
package1/order/orderEvaluate.vue

@ -16,7 +16,7 @@
<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;"> <view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;">
{{shopData.shopName}} {{shopData.shopName}}
</view> </view>
<view v-for="(item,index) in shopData.goodsList" :key="index" style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 1);border-radius: 20rpx;"> <view v-for="(item,index) in shopData.goodsList" :key="index" style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
<view class="goods-img"> <view class="goods-img">
<img :src="item.productPicture" alt=""> <img :src="item.productPicture" alt="">
</view> </view>
@ -65,7 +65,7 @@
</view> </view>
<view class="eval-num" style="border: none;padding: 0 30rpx 20rpx;display: flex;border-bottom: 1px solid #eee;"> <view class="eval-num" style="border: none;padding: 0 30rpx 20rpx;display: flex;border-bottom: 1px solid #eee;">
<view class="upload-img" @tap="pictureAdd('shop')" <view class="upload-img" @tap="pictureAdd('shop')"
style="background: #f5f5f5;text-align: center;line-height: 160rpx;"> style="background: rgba(247, 248, 248, 0.6);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>
</view> </view>
<view style="flex: 1;display: flex;"> <view style="flex: 1;display: flex;">
@ -96,7 +96,7 @@
</view> </view>
<view class="eval-num" style="border: none;padding: 0 30rpx;display: flex;"> <view class="eval-num" style="border: none;padding: 0 30rpx;display: flex;">
<view class="upload-img" @tap="pictureAdd('man')" <view class="upload-img" @tap="pictureAdd('man')"
style="background: #f5f5f5;text-align: center;line-height: 160rpx;"> style="background: rgba(247, 248, 248, 0.6);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>
</view> </view>
<view style="flex: 1;display: flex;"> <view style="flex: 1;display: flex;">

40
package1/order/orderList.vue

@ -46,43 +46,43 @@
</view> </view>
<view class="tab2"> <view class="tab2">
<view class="tabs2" @tap="checkTabs2(10)" v-if="tab1Checked !='quanbu'" <view class="tabs2" @tap="checkTabs2(10)" v-if="tab1Checked !='quanbu'"
:style="{'background':tab2Checked==10?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked==10?'#000':'#777'}"> :style="{'background':tab2Checked==10?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==10?'#000':'#777'}">
全部</view> 全部</view>
<view class="tabs2" @tap="checkTabs2(0)" v-if="tab1Checked !='quanbu'" <view class="tabs2" @tap="checkTabs2(0)" v-if="tab1Checked !='quanbu'"
:style="{'background':tab2Checked==0?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked==0?'#000':'#777'}"> :style="{'background':tab2Checked==0?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==0?'#000':'#777'}">
待支付</view> 待支付</view>
<view class="tabs2" @tap="checkTabs2(1)" v-if="tab1Checked !='quanbu' && tab1Checked == 'fantuan'" <view class="tabs2" @tap="checkTabs2(1)" v-if="tab1Checked !='quanbu' && tab1Checked == 'fantuan'"
:style="{'background':tab2Checked==1?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked==1?'#000':'#777'}"> :style="{'background':tab2Checked==1?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==1?'#000':'#777'}">
待成团</view> 待成团</view>
<view class="tabs2" @tap="checkTabs2(2)" v-if="tab1Checked !='quanbu' && tab1Checked == 'fantuan'" <view class="tabs2" @tap="checkTabs2(2)" v-if="tab1Checked !='quanbu' && tab1Checked == 'fantuan'"
:style="{'background':tab2Checked==2?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked==2?'#000':'#777'}"> :style="{'background':tab2Checked==2?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==2?'#000':'#777'}">
待消费</view> 待消费</view>
<view class="tabs2" @tap="checkTabs2(3)" v-if="tab1Checked !='quanbu' && tab1Checked != 'ershou'" <view class="tabs2" @tap="checkTabs2(3)" v-if="tab1Checked !='quanbu' && tab1Checked != 'ershou'"
:style="{'background':tab2Checked==3?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked==3?'#000':'#777'}"> :style="{'background':tab2Checked==3?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==3?'#000':'#777'}">
待接单</view> 待接单</view>
<view class="tabs2" @tap="checkTabs2(4)" v-if="tab1Checked !='quanbu' && tab1Checked != 'ershou'" <view class="tabs2" @tap="checkTabs2(4)" v-if="tab1Checked !='quanbu' && tab1Checked != 'ershou'"
:style="{'background':tab2Checked==4?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked==4?'#000':'#777'}"> :style="{'background':tab2Checked==4?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==4?'#000':'#777'}">
待取货</view> 待取货</view>
<view class="tabs2" @tap="checkTabs2(5)" v-if="tab1Checked !='quanbu' && tab1Checked != 'ershou'" <view class="tabs2" @tap="checkTabs2(5)" v-if="tab1Checked !='quanbu' && tab1Checked != 'ershou'"
:style="{'background':tab2Checked==5?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked==5?'#000':'#777'}"> :style="{'background':tab2Checked==5?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==5?'#000':'#777'}">
待送达</view> 待送达</view>
<view class="tabs2" @tap="checkTabs2(6)" v-if="tab1Checked !='quanbu'" <view class="tabs2" @tap="checkTabs2(6)" v-if="tab1Checked !='quanbu'"
:style="{'background':tab2Checked==6?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked==6?'#000':'#777'}"> :style="{'background':tab2Checked==6?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==6?'#000':'#777'}">
已完成</view> 已完成</view>
<view class="tabs2" @tap="checkTabs2(7)" v-if="tab1Checked !='quanbu'" <view class="tabs2" @tap="checkTabs2(7)" v-if="tab1Checked !='quanbu'"
:style="{'background':tab2Checked==7?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked==7?'#000':'#777'}"> :style="{'background':tab2Checked==7?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==7?'#000':'#777'}">
待退款</view> 待退款</view>
<view class="tabs2" @tap="checkTabs2(8)" v-if="tab1Checked !='quanbu'" <view class="tabs2" @tap="checkTabs2(8)" v-if="tab1Checked !='quanbu'"
:style="{'background':tab2Checked==8?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked==8?'#000':'#777'}"> :style="{'background':tab2Checked==8?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==8?'#000':'#777'}">
已退款</view> 已退款</view>
<view class="tabs2" @tap="checkTabs2(9)" v-if="tab1Checked !='quanbu'" <view class="tabs2" @tap="checkTabs2(9)" v-if="tab1Checked !='quanbu'"
:style="{'background':tab2Checked==9?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked==9?'#000':'#777'}"> :style="{'background':tab2Checked==9?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==9?'#000':'#777'}">
已取消</view> 已取消</view>
<view class="tabs2" @tap="checkTabs2(11)" v-if="tab1Checked !='quanbu'" <view class="tabs2" @tap="checkTabs2(11)" v-if="tab1Checked !='quanbu'"
:style="{'background':tab2Checked==11?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked==8?'#000':'#777'}"> :style="{'background':tab2Checked==11?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==8?'#000':'#777'}">
售后中</view> 售后中</view>
<view class="tabs2" @tap="checkTabs2(12)" v-if="tab1Checked !='quanbu'" <view class="tabs2" @tap="checkTabs2(12)" v-if="tab1Checked !='quanbu'"
:style="{'background':tab2Checked==12?'rgba(166, 255, 234, 1)':'#F5F5F5','color':tab2Checked==9?'#000':'#777'}"> :style="{'background':tab2Checked==12?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)','color':tab2Checked==9?'#000':'#777'}">
已售后</view> 已售后</view>
</view> </view>
</view> </view>
@ -130,7 +130,7 @@
</view> </view>
{{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '二手物品': item.shopName}} {{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '二手物品': item.shopName}}
</view> </view>
<view v-if="item.otherOrder == 1 || item.otherOrder == 2" style="display: flex;padding: 20rpx;background: #F5F5F5;border-radius: 20rpx;"> <view v-if="item.otherOrder == 1 || item.otherOrder == 2" style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
<view class="goods-img"> <view class="goods-img">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4130b6a412584c71949b3a03e5834453.png" alt=""> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4130b6a412584c71949b3a03e5834453.png" alt="">
<!-- <view class="jiaobiao"> <!-- <view class="jiaobiao">
@ -151,8 +151,8 @@
</view> </view>
</view> </view>
</view> </view>
<view style="display: flex;background: #f5f5f5;border-radius: 10px;align-items: center;"> <view style="display: flex;background: rgba(247, 248, 248, 0.6);border-radius: 10px;align-items: center;">
<view v-else style="width: 80%;overflow: scroll;display: flex;padding: 20rpx;background: #F5F5F5;border-radius: 20rpx;" v-for="(item1,index1) in item.goodsList" :key="index1" v-if="item.goodsList != null && item.goodsList.length > 0"> <view v-else style="width: 80%;overflow: scroll;display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;" v-for="(item1,index1) in item.goodsList" :key="index1" v-if="item.goodsList != null && item.goodsList.length > 0">
<view class="goods-img"> <view class="goods-img">
<img :src="item1.productPicture" alt=""> <img :src="item1.productPicture" alt="">
</view> </view>
@ -164,7 +164,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="height: 80rpx;border-bottom: 1px solid #F5F5F5;display: flex;line-height: 80rpx;"> <view style="height: 80rpx;border-bottom: 1px solid rgba(247, 248, 248, 0.6);display: flex;line-height: 80rpx;">
<view v-if="item.otherOrder == null" style="flex: 1;font-weight: 700;"> <view v-if="item.otherOrder == null" style="flex: 1;font-weight: 700;">
<text v-if="tab1Checked != 'fantuan'">下单时间:</text>{{item.createTime | formatTime}} <text v-if="tab1Checked != 'fantuan'">下单时间:</text>{{item.createTime | formatTime}}
</view> </view>
@ -665,7 +665,7 @@
height: 70rpx; height: 70rpx;
line-height: 70rpx; line-height: 70rpx;
text-align: center; text-align: center;
background: #F5F5F5; background: rgba(247, 248, 248, 0.6);
border-radius: 20rpx; border-radius: 20rpx;
font-weight: 700; font-weight: 700;
margin-right: 20rpx; margin-right: 20rpx;
@ -677,7 +677,7 @@
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
background: #F5F5F5; background: rgba(247, 248, 248, 0.6);
border-top-right-radius: 20rpx; border-top-right-radius: 20rpx;
border-bottom-left-radius: 20rpx; border-bottom-left-radius: 20rpx;
font-weight: 700; font-weight: 700;
@ -747,7 +747,7 @@
line-height: 60rpx; line-height: 60rpx;
text-align: center; text-align: center;
margin-top: 20rpx; margin-top: 20rpx;
background: #F5F5F5; background: rgba(247, 248, 248, 0.6);
border-radius: 60rpx; border-radius: 60rpx;
color: #777; color: #777;
font-weight: 700; font-weight: 700;

2
package1/order/pendGroup.vue

@ -15,7 +15,7 @@
<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;"> <view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;">
竹仔园牛仔农庄(第六分店) 竹仔园牛仔农庄(第六分店)
</view> </view>
<view style="display: flex;padding: 20rpx 0;background: #f5f5f5;border-radius: 20rpx;"> <view style="display: flex;padding: 20rpx 0;background: rgba(247, 248, 248, 0.6);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>

8
package1/order/returnOrder.vue

@ -18,7 +18,7 @@
<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;"> <view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;">
{{orderDetail.shopName}} {{orderDetail.shopName}}
</view> </view>
<view v-for="(item1,index1) in orderDetail.goodsList" :key="index1" v-if="orderDetail.goodsList != null && orderDetail.goodsList.length > 0" style="display: flex;padding: 20rpx;background: #f5f5f5;border-radius: 20rpx;"> <view v-for="(item1,index1) in orderDetail.goodsList" :key="index1" v-if="orderDetail.goodsList != null && orderDetail.goodsList.length > 0" style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
<view class="goods-img"> <view class="goods-img">
<img :src="item1.productPicture" alt=""> <img :src="item1.productPicture" alt="">
</view> </view>
@ -180,7 +180,7 @@
</view> </view>
<view style="color: #000;font-weight: 700;width: 160rpx;"> <view style="color: #000;font-weight: 700;width: 160rpx;">
<view class="upload-img" @tap="pictureAdd" <view class="upload-img" @tap="pictureAdd"
style="background: #f5f5f5;text-align: center;line-height: 160rpx;"> style="background: rgba(247, 248, 248, 0.6);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>
</view> </view>
<view style="overflow-x: scroll;display: flex;width: 350rpx;"> <view style="overflow-x: scroll;display: flex;width: 350rpx;">
@ -194,7 +194,7 @@
<view style="flex: 1;color: #777;font-weight: 700;"> <view style="flex: 1;color: #777;font-weight: 700;">
订单备注 订单备注
</view> </view>
<view style="height: 200rpx;background: #f5f5f5;border-radius: 40rpx;padding: 20rpx;width: 70%;"> <view style="height: 200rpx;background: rgba(247, 248, 248, 0.6);border-radius: 40rpx;padding: 20rpx;width: 70%;">
<textarea name="" id="" cols="30" rows="10" placeholder="请填写备注" v-model="returnData.reason" <textarea name="" id="" cols="30" rows="10" placeholder="请填写备注" v-model="returnData.reason"
style="height: 160rpx;width: 100%;"></textarea> style="height: 160rpx;width: 100%;"></textarea>
</view> </view>
@ -670,7 +670,7 @@
position: absolute; position: absolute;
top: 20rpx; top: 20rpx;
right: 0; right: 0;
background: #f5f5f5; background: rgba(247, 248, 248, 0.6);
width: 130rpx; width: 130rpx;
height: 50rpx; height: 50rpx;
text-align: center; text-align: center;

16
package1/runErrand/runErrand.vue

@ -84,12 +84,12 @@
<!-- 配送时间 --> <!-- 配送时间 -->
<view class="time-box"> <view class="time-box">
<view class="time1" @tap="checkTime(true)" <view class="time1" @tap="checkTime(true)"
:style="{'background':formData.isImmediately?'linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))':'#f5f5f5'}"> :style="{'background':formData.isImmediately?'linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))':'rgba(247, 248, 248, 0.6)'}">
<view style="font-weight: 700;">立即送出</view> <view style="font-weight: 700;">立即送出</view>
<view style="font-size: 20rpx;color: #777;">预计{{immediateTimeStr}}送达</view> <view style="font-size: 20rpx;color: #777;">预计{{immediateTimeStr}}送达</view>
</view> </view>
<view class="time1" @tap="checkTime(false)" <view class="time1" @tap="checkTime(false)"
:style="{'background':formData.isImmediately==false?'linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))':'#f5f5f5'}"> :style="{'background':formData.isImmediately==false?'linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))':'rgba(247, 248, 248, 0.6)'}">
<view style="font-weight: 700;">预约配送</view> <view style="font-weight: 700;">预约配送</view>
<view> <view>
<view style="font-size: 20rpx;color: #777;" v-if="formData.isImmediately!=true&&formData.deliveryTime!=''"> <view style="font-size: 20rpx;color: #777;" v-if="formData.isImmediately!=true&&formData.deliveryTime!=''">
@ -146,7 +146,7 @@
<view class="content-title"> <view class="content-title">
取件数量<text style="color:red;">*</text> 取件数量<text style="color:red;">*</text>
</view> </view>
<view style="display:flex;height: 80rpx;margin-top: 20rpx;line-height: 80rpx;border: 1px solid #777;background: #f5f5f5;border-radius: 20rpx;width: 40%;"> <view style="display:flex;height: 80rpx;margin-top: 20rpx;line-height: 80rpx;border: 1px solid #777;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;width: 40%;">
<view @tap="addFormData.num > 1 ? addFormData.num-- : 1" style="width: 30%;font-size: 44rpx;font-weight: 700;text-align: center;">-</view> <view @tap="addFormData.num > 1 ? addFormData.num-- : 1" style="width: 30%;font-size: 44rpx;font-weight: 700;text-align: center;">-</view>
<input type="number" v-model="addFormData.num" disabled style="line-height: 80rpx;height: 80rpx;flex: 1;font-size: 36rpx;font-weight: 700;text-align: center;"> <input type="number" v-model="addFormData.num" disabled style="line-height: 80rpx;height: 80rpx;flex: 1;font-size: 36rpx;font-weight: 700;text-align: center;">
<view @tap="addFormData.num++" style="width: 30%;font-size: 44rpx;font-weight: 700;text-align: center;">+</view> <view @tap="addFormData.num++" style="width: 30%;font-size: 44rpx;font-weight: 700;text-align: center;">+</view>
@ -177,7 +177,7 @@
<view style="line-height:70rpx;">截图凭证</view> <view style="line-height:70rpx;">截图凭证</view>
<view> <view>
<view style="display: flex; flex-wrap: wrap;"> <view style="display: flex; flex-wrap: wrap;">
<view class="upload-img" @tap="pictureAdd" style="background: #f5f5f5;text-align: center;line-height: 160rpx;border-radius:10rpx;margin-top:10rpx;"> <view class="upload-img" @tap="pictureAdd" style="background: rgba(247, 248, 248, 0.6);text-align: center;line-height: 160rpx;border-radius:10rpx;margin-top:10rpx;">
<uni-icons type="camera" size="28" color="#777"></uni-icons> <uni-icons type="camera" size="28" color="#777"></uni-icons>
</view> </view>
<view v-for="(item,index) in addFormData.picture" :key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;margin-top:10rpx;position:relative;"> <view v-for="(item,index) in addFormData.picture" :key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;margin-top:10rpx;position:relative;">
@ -194,7 +194,7 @@
特殊情况 特殊情况
</view> </view>
<view style="flex: 1;"> <view style="flex: 1;">
<view class="duoxuan" @tap="checkWeightOrVolume" :style="{'background':addFormData.isOverweightOrOvervolume?'rgba(166, 255, 234, 1)':'#f5f5f5'}"> <view class="duoxuan" @tap="checkWeightOrVolume" :style="{'background':addFormData.isOverweightOrOvervolume?'rgba(166, 255, 234, 1)':'rgba(247, 248, 248, 0.6)'}">
超重/超大 超重/超大
</view> </view>
</view> </view>
@ -207,7 +207,7 @@
<view class="content-title"> <view class="content-title">
订单备注 订单备注
</view> </view>
<view style="height: 200rpx;background: #f5f5f5;border-radius: 40rpx;padding: 20rpx;width: 70%;margin-top: 20rpx;"> <view style="height: 200rpx;background: rgba(247, 248, 248, 0.6);border-radius: 40rpx;padding: 20rpx;width: 70%;margin-top: 20rpx;">
<textarea v-model="addFormData.remark" cols="30" rows="10" placeholder="请填写备注" style="height: 160rpx;width: 100%;"></textarea> <textarea v-model="addFormData.remark" cols="30" rows="10" placeholder="请填写备注" style="height: 160rpx;width: 100%;"></textarea>
</view> </view>
</view> </view>
@ -267,7 +267,7 @@
</view> </view>
<scroll-view scroll-y style="flex: 1; padding: 20rpx; box-sizing: border-box;"> <scroll-view scroll-y style="flex: 1; padding: 20rpx; box-sizing: border-box;">
<view v-for="(item, index) in kuaidiAreaList" :key="index" @tap="selectKuaidiArea(item)" <view v-for="(item, index) in kuaidiAreaList" :key="index" @tap="selectKuaidiArea(item)"
style="padding: 30rpx 20rpx; border-bottom: 1px solid #f5f5f5; display: flex; align-items: center; justify-content: space-between;"> style="padding: 30rpx 20rpx; border-bottom: 1px solid rgba(247, 248, 248, 0.6); display: flex; align-items: center; justify-content: space-between;">
<text style="font-size: 30rpx;">{{item.title}}</text> <text style="font-size: 30rpx;">{{item.title}}</text>
<uni-icons v-if="selectedPickupArea && selectedPickupArea.id === item.id" type="checkmarkempty" size="20" color="#a6ffea"></uni-icons> <uni-icons v-if="selectedPickupArea && selectedPickupArea.id === item.id" type="checkmarkempty" size="20" color="#a6ffea"></uni-icons>
</view> </view>
@ -1072,7 +1072,7 @@
display: inline-block; display: inline-block;
text-align: center; text-align: center;
height: 72rpx; height: 72rpx;
background: #f5f5f5; background: rgba(247, 248, 248, 0.6);
line-height: 72rpx; line-height: 72rpx;
border-radius: 10rpx; border-radius: 10rpx;
padding: 0 20rpx; padding: 0 20rpx;

Loading…
Cancel
Save