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

组件

master
tianyi 4 weeks ago
parent
2f52020b24
commit
db59052e47
2 changed files with 423 additions and 126 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 373
      components/tab-bar/delivery.vue
  2. 6
      components/tab-bar/myCenter.vue

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

@ -9,14 +9,16 @@
:style="{'color':tab1Checked == 'daiqu'?'#000':'#777','font-size':tab1Checked== 'daiqu'?'36rpx':'30rpx'}">
待取货
<img v-if="tab1Checked == 'daiqu'"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png" alt=""
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png"
alt=""
style="width: 120rpx;height: 12rpx;position: absolute;bottom: 4rpx;left: 30rpx;" />
</view>
<view class="tabs1" @tap="checkTab1('daisong')"
:style="{'color':tab1Checked == 'daisong'?'#000':'#777','font-size':tab1Checked== 'daisong'?'36rpx':'30rpx'}">
待送达
<img v-if="tab1Checked == 'daisong'"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png" alt=""
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png"
alt=""
style="width: 80rpx;height: 14rpx;position: absolute;bottom: 4rpx;left: 32rpx;" />
</view>
</view>
@ -30,7 +32,8 @@
#<text>021</text>
</view>
<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;display: flex;">
<view style="height: 40rpx;line-height: 40rpx;background: rgba(255, 233, 89, 1);padding: 0 16rpx;border-radius: 40rpx;margin: 14rpx 20rpx 0 0;">
<view
style="height: 40rpx;line-height: 40rpx;background: rgba(255, 233, 89, 1);padding: 0 16rpx;border-radius: 40rpx;margin: 14rpx 20rpx 0 0;">
代买饭
</view>
<!-- <view style="height: 40rpx;line-height: 40rpx;background: rgba(166, 255, 234, 1);padding: 0 16rpx;border-radius: 40rpx;margin: 14rpx 20rpx 0 0;">
@ -44,10 +47,12 @@
</view> -->
立即送达（10：30前）
</view>
<view class="" style="background: #f5f5f5;height: 40px;line-height: 40px;font-weight: 500;padding: 0 10px;border-radius: 10px;">
<view class=""
style="background: #f5f5f5;height: 40px;line-height: 40px;font-weight: 500;padding: 0 10px;border-radius: 10px;">
备注：不要葱，不要香菜
</view>
<view class="" style="background: #f5f5f5;line-height: 40px;font-weight: 500;padding: 0 10px;border-radius: 10px;margin-top: 10px;">
<view class=""
style="background: #f5f5f5;line-height: 40px;font-weight: 700;padding: 0 10px;border-radius: 10px;margin-top: 10px;color: #777;">
<view style="display: flex;">
<view style="flex:1">
取件方式（3件）
@ -63,24 +68,25 @@
</view>
</view>
<!-- <view class="">
<img src="" alt="" />
<view style="display: flex;padding: 10px 0;">
<img @tap="largeImg" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/1f77398a73454a6595c12a3c18731599.png" alt="" style="width: 45px;height: 53px;background-size: 100%;margin-right:10px;"/>
</view>
<view class="">
<view class="">
<!-- <view style="display: flex;padding: 10px 0;">
<view class="code-box" style="margin-right:10px;">
1-3-1290
</view>
</view> -->
<view class="">
<view class="">
<!-- <view style="display: flex;padding: 10px 0;">
<view class="code-box">
手机尾号 - 5741
</view>
</view>
</view> -->
</view>
<view style="display: flex;border-radius: 20rpx;margin-top: 16px;">
<view class="goods-content">
<view class="goods-name" style="font-size: 24rpx;line-height: 50rpx;display: flex;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/1f77398a73454a6595c12a3c18731599.png" alt="" style="width: 50rpx;height: 50rpx;" />
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/1f77398a73454a6595c12a3c18731599.png"
alt="" style="width: 50rpx;height: 50rpx;" />
<view style="flex: 1;">
<view class="">
沁园春第三食堂A20窗口
@ -90,11 +96,15 @@
</view>
</view>
<view class="right">
<img @tap="makeCall(shopItem.contactPhone)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 30px;height: 30px;"/>
<img @tap="makeCall(shopItem.contactPhone)"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
alt="" style="width: 30px;height: 30px;" />
</view>
</view>
<view class="goods-name" style="font-size: 24rpx;line-height: 50rpx;display: flex;margin-top: 14rpx;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d0764fb4138747769538cf1cafa3b017.png" alt="" style="width: 50rpx;height: 50rpx;" />
<view class="goods-name"
style="font-size: 24rpx;line-height: 50rpx;display: flex;margin-top: 14rpx;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d0764fb4138747769538cf1cafa3b017.png"
alt="" style="width: 50rpx;height: 50rpx;" />
<view style="flex: 1;">
<view class="">
11号宿舍楼610
@ -104,7 +114,9 @@
</view>
</view>
<view class="right">
<img @tap="makeCall(shopItem.contactPhone)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 30px;height: 30px;"/>
<img @tap="makeCall(shopItem.contactPhone)"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
alt="" style="width: 30px;height: 30px;" />
</view>
</view>
</view>
@ -114,8 +126,11 @@
<view class="goods-name" style="font-size: 24rpx;line-height: 50rpx;display: flex;">
<img src="" alt="" style="width: 50rpx;height: 50rpx;" />
<view style="flex: 1;display: flex;">
<view style="color: #777;">
<view style="color: #777;display: flex;">
配送佣金
<view class="chaoda">
超大/超重
</view>
</view>
<view style="flex: 1;text-align: right;">
￥5.00 <text style="color: #777;font-size: 10px;">（包含￥2平台佣金）</text>
@ -125,7 +140,8 @@
</view>
</view>
<view style="width: 100%;height: 50px;margin-top: 16px;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c318cf292a4f40b296995c30e5e539ea.png" alt="" style="width: 100%;height: 50px;background-size: 100%;" />
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c318cf292a4f40b296995c30e5e539ea.png"
alt="" style="width: 100%;height: 50px;background-size: 100%;" />
</view>
<view class="sort-member" style="width: 260rpx;">
@ -135,11 +151,11 @@
上下线 <text style="font-size: 20rpx;">▼</text>
</view>
<view class="sort-value" v-if="isArea">
<view class="sort-value1" v-for="(item,index) in lineStatus" :key="index" @tap="changeOnline(item.value)">{{item.title}}</view>
<view class="sort-value1" v-for="(item,index) in lineStatus" :key="index"
@tap="changeOnline(item.value)">{{item.title}}</view>
</view>
</view>
<view class="tabs1" @tap="openPopup()"
style="color:#777;font-size:30rpx">
<view class="tabs1" @tap="openPopup()" style="color:#777;font-size:30rpx">
设置指派单规则
</view>
</view>
@ -149,8 +165,27 @@
<!-- 设置指派单规则弹窗 -->
<uni-popup ref="carPopup" background-color="#fff" style="height: 800px !important;">
<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 style="display: flex; width: 100%;">
<view style="height: 40px;line-height: 40px;font-size: 18px;font-weight: 700;text-align: center;">
设置指派单规则
</view>
<view class="zhipai-box">
接受指派单
<view class="zhipai">
<switch :checked="zhipaiCheck" @change="zhipaiChange"
style="transform: scale(0.7);text-align: right;" />
</view>
</view>
<view style="height: 25px;line-height: 25px;font-weight: 700;display: flex;">
外卖规则
<view @tap="allCheck('waimai')" v-if="zhipaiCheck" style="color: #1E90FF;flex:1;text-align: right;padding-right: 10px;">
全选
</view>
</view>
<view class="guize1" v-for="(item, index) in waimaRuleList" :key="index"
style="flex-direction: column; padding-bottom: 10px; border-bottom: 1px solid #ddd;position: relative;">
<view v-if="!zhipaiCheck" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;background: rgba(255, 255, 255, 0.5);"></view>
<view style="display: flex; width: 100%;" @tap="checkVoucher(index,'waimai')">
<view class="guize1-qusong">
<view class="qusong1">
取
@ -167,19 +202,60 @@
{{item.putAreaName}}
</view>
</view>
<view class="qusong3" style="display:flex; align-items:center;">
<input type="digit" v-model="item.orderBkge" placeholder="填写配送费" style="flex:1;">
<uni-icons type="closeempty" size="20" @click="selectRule(item)" color="#ff0000" style="margin-left:5px;"></uni-icons>
<view class="radio-check" v-if="item.isChecked">
<uni-icons type="checkmarkempty" size="12"></uni-icons>
</view>
<view class="radio-no-check" v-else></view>
<!-- <uni-icons type="closeempty" size="20" @click="selectRule(item)" color="#ff0000"
style="margin-left:5px;"></uni-icons> -->
</view>
<view 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>
<input type="text" v-model="item.remark" placeholder="填写备注，如：限时/大件加钱" style="flex:1; background: #fff; border-radius: 5px; padding: 0 10px; height: 30px; line-height: 30px;">
</view>
<view style="height: 25px;line-height: 25px;font-weight: 700;display: flex;">
跑腿规则
<view @tap="allCheck('paotui')" v-if="zhipaiCheck" style="color: #1E90FF;flex:1;text-align: right;padding-right: 10px;">
全选
</view>
</view>
</uni-popup>
<view class="guize1" v-for="(item, index) in paotuiRuleList" :key="index"
style="flex-direction: column; padding-bottom: 10px; border-bottom: 1px solid #ddd;position: relative;">
<view v-if="!zhipaiCheck" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;background: rgba(255, 255, 255, 0.5);"></view>
<view style="display: flex; width: 100%;" @tap="checkVoucher(index,'paotui')">
<view class="guize1-qusong">
<view class="qusong1">
取
</view>
<view class="qusong2">
{{item.getAreaName}}
</view>
</view>
<view class="guize1-qusong">
<view class="qusong1">
送
</view>
<view class="qusong2" style="background: rgba(209, 206, 255, 1);">
{{item.putAreaName}}
</view>
</view>
<view class="radio-check" v-if="item.isChecked">
<uni-icons type="checkmarkempty" size="12"></uni-icons>
</view>
<view class="radio-no-check" v-else></view>
<!-- <uni-icons type="closeempty" size="20" @click="selectRule(item)" color="#ff0000"
style="margin-left:5px;"></uni-icons> -->
</view>
</view>
<view class="btn" @tap="selectRule">
确认修改
</view>
</view>
</uni-popup>
<!-- 查看大图弹出层 -->
<uni-popup ref="imgPopup" background-color="#fff">
<view class="img-popup-content">
<img :src="bigImg" alt="" style="width: 100%;height: 100%;">
</view>
</uni-popup>
<view style="width: 100%;height: 80px;"></view>
<uni-load-more :status="loadStatus" />
</view>
@ -190,14 +266,15 @@
export default {
data() {
return {
bigImg:'',
zhipaiCheck: false,
tab1Checked: 'daiqu',
menuButtonInfo: {},
isArea: false,
waimaRuleList: [],
selectRuleList: [],
paotuiRuleList: [],
lineStatus:[
{
lineStatus: [{
title: '上线',
value: 0
},
@ -226,35 +303,103 @@
console.log("配送初始化")
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
},
//查看大图
largeImg(img) {
this.bigImg = 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/00b1f011787c4549bbea650d95a4eb39.png'
this.$refs.imgPopup.open()
},
zhipaiChange(e) {
this.zhipaiCheck = e.detail.value
},
checkVoucher(index,type) {
if (type == 'waimai'){
this.waimaRuleList[index].isChecked = !this.waimaRuleList[index].isChecked
}else{
this.paotuiRuleList[index].isChecked = !this.paotuiRuleList[index].isChecked
}
},
selectRule(item) {
//TODO 这里应该改成 复选，选中的遍历再放进来
// let rule = {
// id: item.id,
// getPushOrder: 1
// }
// this.selectRuleList.push(rule)
this.selectRuleList = []
this.waimaiData = []
this.paotuiData = []
for(let i=0;i<this.waimaRuleList.length;i++){
if(this.waimaRuleList[i].isChecked){
let rule = {
id: this.waimaRuleList[i].id,
getPushOrder: 1
}
this.selectRuleList.push(rule)
this.waimaiData.push(this.waimaRuleList[i])
}
}
for(let i=0;i<this.paotuiRuleList.length;i++){
if(this.paotuiRuleList[i].isChecked){
let rule = {
id:item.id,
id: this.paotuiRuleList[i].id,
getPushOrder: 1
}
this.selectRuleList.push(rule)
this.paotuiData.push(this.paotuiRuleList[i])
}
}
let submitData = {
userId: uni.getStorageSync('id'),
workerRelaPriceList: this.selectRuleList
workerRelaPriceList: this.selectRuleList,
getPushOrder: this.zhipaiCheck?1:0
};
this.tui.request('/app/workerRelaPrice/batchUpdate', 'post', submitData).then(res => {
uni.hideLoading();
if (res.code == 200) {
uni.showToast({title: '设置成功'});
let worker = uni.getStorageSync('worker') || {}; // 避免取不到时出错
worker.getPushOrder = this.zhipaiCheck ? 1 : 0;
uni.setStorageSync('worker', worker);
uni.setStorageSync('waimaiData',JSON.stringify(this.waimaiData))
uni.setStorageSync('paotuiData',JSON.stringify(this.paotuiData))
if(this.zhipaiCheck == false){
uni.removeStorageSync('waimaiData')
uni.removeStorageSync('paotuiData')
}
uni.showToast({
title: '设置成功'
});
} else {
uni.showToast({title: res.message, icon: 'none'});
uni.showToast({
title: res.message,
icon: 'none'
});
}
}).catch(err => {
uni.hideLoading();
});
},
allCheck(type){
let data = []
if(type=='waimai'){
data = this.waimaRuleList
}else{
data = this.paotuiRuleList
}
for(let i=0;i<data.length;i++){
data[i].isChecked = true
}
},
openPopup() {
let that = this
that.tui.request("/app/workerRelaPrice/getByWorkerId?workerId=" + uni.getStorageSync('worker').workerId, "GET", {}, false, true).then((res) => {
that.tui.request("/app/workerRelaPrice/getByWorkerId?workerId=" + uni.getStorageSync('worker').workerId,
"GET", {}, false, true).then((res) => {
if (res.code == 200) {
if (res.result != null) {
let data = res.result;
let list = data.workerRelaPriceList || [];
for(let i=0;i<list.length;i++){
list[i].isChecked = false
}
let waimaList = list.filter(item => item.orderType == 0);
let paotuiList = list.filter(item => item.orderType == 1);
@ -264,10 +409,31 @@
if (paotuiList.length > 0) {
that.paotuiRuleList = paotuiList;
}
that.$forceUpdate();
}
this.$refs.carPopup.open('bottom')
this.zhipaiCheck = uni.getStorageSync('worker').getPushOrder==1?true:false
if(uni.getStorageSync('waimaiData')){
let waimaiData = JSON.parse(uni.getStorageSync('waimaiData'))
for(let i=0;i<waimaiData.length;i++){
for(let m=0;m<that.waimaRuleList.length;m++){
if(waimaiData[i].id == that.waimaRuleList[m].id){
that.waimaRuleList[m].isChecked = true
}
}
}
}
if(uni.getStorageSync('paotuiData')){
let paotuiData = JSON.parse(uni.getStorageSync('paotuiData'))
for(let i=0;i<paotuiData.length;i++){
for(let m=0;m<that.paotuiRuleList.length;m++){
if(paotuiData[i].id == that.paotuiRuleList[m].id){
that.paotuiRuleList[m].isChecked = true
}
}
}
}
this.$refs.carPopup.open()
} else {
that.tui.toast(res.message)
return
@ -291,6 +457,9 @@
id: uni.getStorageSync('worker').workerId
}, false, true).then((res) => {
if (res.code == 200) {
let worker = uni.getStorageSync('worker') || {}; // 避免取不到时出错
worker.isOnLine = value;
uni.setStorageSync('worker', worker);
this.tui.toast(res.message)
} else {
this.tui.toast(res.message)
@ -339,22 +508,26 @@
display: flex;
flex-direction: column;
}
.title {
background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
width: 100%;
height: 190px;
}
.title-sreach {
width: 100%;
display: flex;
height: 200rpx;
position: relative;
}
.sort-member {
line-height: 60rpx;
text-align: center;
height: 60rpx;
}
.tab1 {
height: 60rpx;
line-height: 60rpx;
@ -368,6 +541,7 @@
color: #777;
flex: 1;
}
.content {
flex: 1;
width: 95%;
@ -375,6 +549,7 @@
-webkit-overflow-scrolling: touch;
margin: -90px auto 0;
}
.box1 {
width: 100%;
margin: 20rpx auto 20rpx;
@ -392,6 +567,7 @@
font-size: 32rpx;
font-weight: 900;
}
.maotou {
width: 90rpx;
background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/a1584a13e9db4b6fbcc66890219d0018.png') no-repeat;
@ -405,8 +581,125 @@
font-weight: 900;
font-size: 24rpx;
}
.right {
width: 30px;
padding-top: 10px;
}
.guize-list {
width: 300px;
padding: 10px;
overflow: scroll;
background: #fff;
border-radius: 10px;
max-height: 500px;
}
.zhipai-box {
display: flex;
height: 50px;
line-height: 50px;
font-size: 16px;
font-weight: 700;
border-bottom: 1px solid #eee;
}
.zhipai {
flex: 1;
text-align: right;
}
.radio-check {
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
width: 24px;
height: 24px;
border-radius: 24px;
text-align: center;
line-height: 24px;
margin: 8px 10px 0 0;
}
.radio-no-check {
width: 24px;
height: 24px;
border-radius: 24px;
border: 1px solid #eee;
margin: 8px 10px 0 0;
}
.guize1-qusong {
display: flex;
flex: 1;
padding-top: 10px;
}
.guize1 {
display: flex;
}
.qusong1 {
width: 20px;
height: 20px;
background: rgba(0, 35, 28, 1);
color: #fff;
border-radius: 20px;
text-align: center;
line-height: 20px;
font-size: 10px;
z-index: 80;
}
.qusong2 {
height: 20px;
font-size: 12px;
line-height: 19px;
text-align: center;
background: rgba(166, 255, 234, 0.5);
padding: 0 10px;
margin-left: -5px;
font-weight: 700;
border-top-right-radius: 20px;
border-bottom-right-radius: 20px;
}
.qusong3 {
width: 95px;
height: 35px;
background: #fff;
border-radius: 5px;
padding: 5px 10px;
flex: 1;
}
.btn {
width: 95%;
height: 50px;
font-size: 16px;
font-weight: 700;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
border-radius: 50px;
line-height: 50px;
text-align: center;
margin: 20px auto;
}
.code-box{
display: inline-block;
height: 26px;
line-height: 26px;
background: rgba(166, 255, 234, 0.4);
padding: 0 10px;
border-radius: 5px;
color: #000;
border: 1px solid rgba(2, 251, 221, 1);
}
.img-popup-content {
width: 500rpx;
height: 500rpx;
}
.chaoda{
height: 15px;
line-height: 15px;
margin: 5px 0 0 10px;
padding: 0 5px;
background: rgba(255, 117, 88, 1);
color: #fff;
border-radius: 5px;
}
</style>

6
components/tab-bar/myCenter.vue
View File

@ -4,7 +4,7 @@
<view style="margin-top: 200px;" @click="navigatorTo('addgoods')">新增商品</view>
<view style="margin-top: 200px;" @click="navigatorTo('merchant')">商家入驻</view>
<view style="margin-top: 100px;" @click="navigatorTo('jianzhizhuce')">兼职注册</view>
<!-- 购物车弹窗 -->
<!-- 未注册兼职弹窗 -->
<uni-popup ref="jianzhiPopup" background-color="rgba(2, 171, 255, 1)" borderRadius="40px 40px 40px 40px">
<view class="jianzhi-content" @tap="navigatorTo('partTimeReg')">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/faf25c687bc1417282ebac719fd1bfba.png" alt="" style="width: 100%;height: 100%;">
@ -63,9 +63,13 @@
this.$refs.jianzhiPopup.close()
}
}else if(e=='jianzhizhuce'){
if(uni.getStorageSync('worker')){
url = '/package1/myCenter/partTimeJobRegister'
}else{
this.$refs.jianzhiPopup.open()
return
}
}
uni.navigateTo({
url: url
})

Write Preview
Loading…
Cancel
Save