tianyi 2 months ago
parent
commit
2692d9ee18
  1. 83
      pages/index/index.vue
  2. 3
      pages/login/login.vue
  3. 2
      pages/shop/addGoods.vue
  4. 434
      pages/shop/attributeList.vue
  5. 1
      pages/shop/orderDetail.vue

83
pages/index/index.vue

@ -30,6 +30,14 @@
</view>
<view class="order2">
<view class="order22">
<view class="order33" @tap="changeIndex(1,3)">
<view class="order44" style="color: red;">
{{daipeisongjiedan}}
</view>
<view class="order55">
待配送接单
</view>
</view>
<view class="order33" @tap="changeIndex(1,13)">
<view class="order44" style="color: red;">
{{daichucan}}
@ -109,15 +117,11 @@
<view style="flex: 1;">
今日实时数据
</view>
<view @tap="goDetail('tj')">
更多
<uni-icons type="right" size="12"></uni-icons>
</view>
</view>
<view class="data2">
<view class="data22">
<view class="data222">
{{shopData.orderRevenueAndCount == undefined ?0:shopData.orderRevenueAndCount.count}}
{{shopData.orderRevenueAndCount ?shopData.orderRevenueAndCount.count:0}}
</view>
<view class="data333">
今日订单
@ -125,12 +129,28 @@
</view>
<view class="data22">
<view class="data222">
{{shopData.orderRevenueAndCount == undefined ?0:shopData.orderRevenueAndCount.amount == undefined ?0:shopData.orderRevenueAndCount.amount}}
{{shopData.orderRevenueAndCount?shopData.orderRevenueAndCount.amount:0}}
</view>
<view class="data333">
营业额
</view>
</view>
<view class="data22">
<view class="data222">
{{shopData.orderRevenueAndCount?shopData.orderRevenueAndCount.afterSaleCount:0}}
</view>
<view class="data333">
退/售后笔数
</view>
</view>
<view class="data22">
<view class="data222">
{{shopData.orderRevenueAndCount?shopData.orderRevenueAndCount.afterSaleAmount:0}}
</view>
<view class="data333">
退/售后金额
</view>
</view>
</view>
</view>
<view class="shop-order">
@ -194,8 +214,16 @@
打印设置
</view>
</view>
<view class="menu22" @tap="goDetail('shjl')">
<view class="menu33" style="width: 100%;height: 56rpx;">
<image src="../../static/image/dingdan/dd0.png" alt="" />
</view>
<view class="menu44">
退款售后记录
</view>
</view>
</view>
<view style="width: 100%;height: 200rpx;"></view>
<view style="width: 100%;height: 20rpx;"></view>
</view>
</view>
<view class="swiper-page" v-show="currentIndex == 1">
@ -229,6 +257,7 @@
data() {
return {
width: 0,
daipeisongjiedan:0,
currentIndex: 0,
businessStatus: 1,
shop: {},
@ -265,10 +294,26 @@
});
this.getData()
this.getBusinessStatus()
this.getShopTakeaway()
if (!uni.getStorageSync('area')) {
this.checkArea()
}
},
getShopTakeaway(){
this.NB.sendRequest("/app/shoptakeaway/getByShopId", {
shopId: uni.getStorageSync('shopId')
}, false, 'get', 'application/x-www-form-urlencoded').then((res) => {
if (res.code == 200) {
uni.setStorageSync('shopTakeaway',res.result)
} else {
uni.showToast({
title: res.message,
icon: 'none'
})
}
})
},
checkArea() {
this.NB.sendRequest("/auth/getShopByUser", {}, false, 'post', 'application/x-www-form-urlencoded').then((
res) => {
@ -346,6 +391,7 @@
},
goDetail(type, index) {
let url = ''
switch (type) {
case 'tj':
@ -376,13 +422,14 @@
url = '/pages/shop/shopOrderList'
break;
case 'tui':
uni.navigateTo({
url: '/pages/shop/shopReturnOrder?type=shop'
})
url = '/pages/shop/shopReturnOrder?type=shop'
break;
case 'zd':
url = '/pages/shop/shopBill'
break;
case 'shjl':
url = '/pages/shop/afterService?type=shop&mode=record'
break;
case 'pj':
let item = {
shopScore: uni.getStorageSync('shopScore'),
@ -404,10 +451,16 @@
this.daisongda = 0
this.daiquhuo = 0
this.daixiaofei = 0
this.daipeisongjiedan = 0
this.daichucan = 0
},
getData() {
let that = this;
this.daixiaofei = 0
this.daipeisongjiedan = 0
this.daichucan = 0
this.daiquhuo = 0
this.daisongda = 0
that.NB.sendRequest("/mall/order/countByShop/" + uni.getStorageSync('shopId'), {}, false, 'GET',
'application/x-www-form-urlencoded').then((res) => {
if (res.code == 200) {
@ -498,7 +551,6 @@
this.indexInit()
break;
case 1:
that.$refs.deLivery.init(type)
break;
case 2:
@ -608,7 +660,8 @@
}
.data22 {
flex: 1;
width:25%;
}
.data222 {
@ -616,7 +669,10 @@
font-weight: 700;
padding-bottom: 20rpx;
}
.data333 {
color: #415c56;
font-size: 28rpx;
}
.menu2 {
display: flex;
flex-wrap: wrap;
@ -640,6 +696,7 @@
.menu44 {
height: 40rpx;
line-height: 40rpx;
font-size:28rpx;
}
.popup-area-content {

3
pages/login/login.vue

@ -316,7 +316,7 @@
//
checkShop(item) {
let that = this;
console.log('看看--------------',item)
uni.getSystemInfo({
success: function (res1) {
that.NB.sendRequest('/auth/chooseShop', {
@ -324,6 +324,7 @@
deviceId:res1.deviceId
}, true, 'POST', 'application/x-www-form-urlencoded').then(res => {
if (res.code == 200) {
console.log('看看--------------',res.result)
uni.setStorageSync('type',item.type)
uni.setStorageSync('warehouseKeeperFlag',item.warehouseKeeperFlag)
uni.setStorageSync('shopId',item.shop.id)

2
pages/shop/addGoods.vue

@ -95,7 +95,7 @@
</view>
</view>
</uni-forms-item>
<uni-forms-item label="设置加料" name="isMoreBuy">
<uni-forms-item label="拼团搭配" name="isMoreBuy">
<view style="line-height: 74rpx;">
<radio :checked="formData.isMoreBuy==0" name="isMoreBuy" @click="checkisMoreBuy('0')" />
<radio :checked="formData.isMoreBuy==1" name="isMoreBuy" @click="checkisMoreBuy('1')" />

434
pages/shop/attributeList.vue

@ -18,7 +18,8 @@
<li v-for="(item, index) in indexList" :key="index" @tap="clickList(item)">
<view class="name">
<text>{{item.attributeName}}</text>
<u-icon name="edit-pen-fill" size="22" v-if="item.attributeName != '默认属性'" @tap.stop="inputDialogToggle('edit', item)"></u-icon>
<view style="width: 10px;"></view>
<uni-icons type="compose" size="22" v-if="item.attributeName != '默认属性'" @tap.stop="inputDialogToggle('edit', item)"></uni-icons>
</view>
<button class="bj-btn" @tap.stop="goGategoryLow(item)">管理属性</button>
</li>
@ -26,27 +27,20 @@
</view>
<u-modal :show="show" :title="'删除'" :content="'是否确认删除此属性?'" showCancelButton="true" @cancel="show = false"
@confirm="delItemModal"></u-modal>
<uni-popup ref="inputDialog" type="dialog">
<uni-popup-dialog ref="inputClose" mode="input" :title="dialogTit" :value="inputVal" placeholder="请输入名称"
@confirm="dialogInputConfirm" @close="dialogClose">
</uni-popup-dialog>
</uni-popup>
<uni-popup ref="delDialog" background-color="#fff">
<view class="add-popup-content">
<view class="add-popup-content attr-name-popup">
<view class="add-popup-title">
<text>编辑属性</text>
<uni-icons @tap='close' type="closeempty" color='red' size="16"
style="height:40rpx;line-height: 40rpx;position: absolute !important;bottom:0;right: 30rpx;"></uni-icons>
<uni-icons class="popup-close" @tap='close' type="closeempty" color='#777' size="18"></uni-icons>
</view>
<view class="add-popup-container">
<view style="width: 90%;margin: 40rpx auto 0;">
属性名称
<view class="form-field">
<view class="form-label">属性名称</view>
<uni-easyinput type="text" v-model="inputVal" @blur="handleBlur" placeholder="请输入属性值" />
</view>
<view style="width: 100%;height: 90rpx;line-height: 90rpx;text-align: center;border-radius: 0;color: #fff;display: flex;position: absolute;bottom: 0;">
<view style="flex: 1;background: linear-gradient(90deg, #60F3FF, #088FEB);" v-if="inputVal != '默认属性'" @tap="dialogDel">删除</view>
<view style="flex: 1;background: linear-gradient(90deg, #FF9797, #FFC1E0);" @tap="dialogInputConfirm">确认</view>
<view class="popup-actions">
<view class="popup-action danger" v-if="inputVal != '默认属性'" @tap="dialogDel">删除</view>
<view class="popup-action primary" @tap="dialogInputConfirm">确认</view>
</view>
<!-- <ul>
<li v-for="(item,index) in defaultList" :key="index">
@ -66,16 +60,16 @@
</uni-popup>
<!-- 添加属性弹出层 -->
<uni-popup ref="addTypeDialog" background-color="#fff">
<view class="add-popup-content">
<view class="add-popup-content attr-name-popup">
<view class="add-popup-title">
<text>新增属性</text>
<uni-icons @tap='close' type="closeempty" color='red' size="16"
style="height:40rpx;line-height: 40rpx;position: absolute !important;bottom:0;right: 30rpx;"></uni-icons>
<uni-icons class="popup-close" @tap='close' type="closeempty" color='#777' size="18"></uni-icons>
</view>
<view class="add-popup-container">
<input type="text" v-model="typeText" style="width: 100%;border: 1px solid #eee;height: 80rpx;padding-left: 20rpx;margin:20rpx 0;font-size: 25rpx;line-height: 80rpx;"
placeholder="请输入属性名称">
<view class="form-field">
<view class="form-label">属性名称</view>
<input type="text" v-model="typeText" class="popup-input" placeholder="请输入属性名称">
</view>
<!-- <ul>
<li v-for="(item,index) in defaultList" :key="index">
<view class="title-fur">
@ -97,28 +91,32 @@
</uni-popup>
<uni-popup ref="attrValueDialog" background-color="#fff">
<view class="add-popup-content" style="width: 640rpx;max-height: 600px;overflow: scroll;">
<view class="add-popup-content attr-value-popup">
<view class="add-popup-title">
<text>管理属性</text>
<uni-icons @tap='close' type="closeempty" color='red' size="16"
style="height:40rpx;line-height: 40rpx;position: absolute !important;bottom:0;right: 30rpx;"></uni-icons>
<uni-icons class="popup-close" @tap='close' type="closeempty" color='#777' size="18"></uni-icons>
</view>
<view class="add-popup-container">
<view>
<text style="color:red;font-size:22rpx;">*点击+号可新增专属自己店铺的属性值</text>
<view class="popup-tip">
点击右侧+号可新增本店铺专属属性值
</view>
<view style="display: flex;font-weight: 700;font-size: 16px;height: 50px;line-height: 50px;padding-right: 10px;">
<view style="flex: 1;">
<view class="attr-value-header">
<view class="attr-value-title">
属性列表
</view>
<uni-icons type="plusempty" @tap="toggle()" color="#5fd9ee" size="20"></uni-icons>
<view class="add-value-btn" @tap="toggle()">
<uni-icons type="plusempty" color="#00231C" size="18"></uni-icons>
<text>新增</text>
</view>
</view>
<ul>
<ul class="attr-value-list">
<li v-for="(item,index) in defaultList" :key="index">
<view class="title-fur">
<view class="name">{{item.value}}</view>
<view class="btn" v-if="inputVal != '默认属性'" @tap="editValue(item)">修改</view>
<view class="btn" v-if="inputVal != '默认属性'" @tap="delValue(item)">删除</view>
<view class="value-actions" v-if="inputVal != '默认属性'">
<view class="btn" @tap="editValue(item)">修改</view>
<view class="btn danger-text" @tap="delValue(item)">删除</view>
</view>
</view>
</li>
</ul>
@ -162,16 +160,23 @@
</view>
</view>
</uni-popup>
<uni-popup ref="addDialog" type="dialog">
<uni-popup-dialog
ref="addClose"
mode="input"
:title="'请输入属性名'"
v-model="specVal"
placeholder="请输入属性名称"
@confirm="addSpec"
@close="dialogClose">
</uni-popup-dialog>
<uni-popup ref="addDialog" background-color="#fff">
<view class="add-popup-content value-edit-popup">
<view class="add-popup-title">
<text>{{isEdieValue ? '修改属性值' : '新增属性值'}}</text>
<uni-icons class="popup-close" @tap='$refs.addDialog.close()' type="closeempty" color='#777' size="18"></uni-icons>
</view>
<view class="add-popup-container">
<view class="form-field">
<view class="form-label">属性值名称</view>
<input type="text" v-model="specVal" class="popup-input" placeholder="请输入属性值名称">
</view>
<view class="popup-actions">
<view class="popup-action plain" @tap="$refs.addDialog.close()">取消</view>
<view class="popup-action primary" @tap="addSpec(specVal)">确认</view>
</view>
</view>
</view>
</uni-popup>
</view>
@ -356,28 +361,41 @@
this.$refs.addDialog.open()
},
delValue(item){
this.tui.request("/app/productAttributeValue/delById", "post", {
this.NB.sendRequest("/app/productAttributeValue/delById", {
id: item.id
}, false, true).then((res) => {
}, false, 'post', 'application/x-www-form-urlencoded').then((res) => {
if (res.code == 200) {
this.tui.toast("删除成功")
uni.showToast({
title: "删除成功",
icon: 'none'
})
this.goGategoryLow(this.editItem)
this.$forceUpdate()
} else {
this.tui.toast("添加失败")
uni.showToast({
title: "删除失败",
icon: 'none'
})
return;
}
}).catch((res) => {})
uni.hideLoading();
}).catch((res) => {});
},
//
getGategoryList() {
this.tui.request("/app/productAttribute/selectByCategoryId", "post", {categoryId:this.attrId}, false, true).then((res) => {
this.NB.sendRequest("/app/productAttribute/selectByCategoryId", {
categoryId:this.attrId
}, false, 'post', 'application/x-www-form-urlencoded').then((res) => {
if (res.code == 200) {
this.indexList = res.result;
} else {
this.tui.toast(res.message)
uni.showToast({
title: res.message,
icon: 'none'
})
}
}).catch((res) => {})
uni.hideLoading();
}).catch((res) => {});
},
//
inputDialogToggle(type, item, parent) {
@ -396,6 +414,9 @@
},
close(){
this.$refs.attrValueDialog.close()
this.$refs.delDialog.close()
this.$refs.addTypeDialog.close()
this.$refs.addDialog.close()
},
handleBlur(e){
this.inputVal = e.detail.value
@ -406,17 +427,17 @@
//
getTypeToNum(id) {
let that = this;
this.tui.request("/app/stock/getlistByAttributeList", "post", {
this.NB.sendRequest("/app/stock/getlistByAttributeList", {
categoryId: id,
}, false, true).then((res) => {
}, false, 'post', 'application/x-www-form-urlencoded').then((res) => {
if (res.code == 200) {
if (res.result != '') {
this.goodsList = res.result
this.$refs.carPopup.open('bottom')
} else {
this.tui.request("/app/productAttribute/selectByCategoryId", "POST", {
this.NB.sendRequest("/app/productAttribute/selectByCategoryId", {
categoryId: this.delItems.id
}, false, true).then((res1) => {
}, false, 'post', 'application/x-www-form-urlencoded').then((res1) => {
if (res1.code == 200) {
if (res1.result.length > 0) {
uni.showModal({
@ -431,11 +452,23 @@
} else {
that.show = true
}
} else {
uni.showToast({
title: res1.message,
icon: 'none'
})
}
}).catch((res) => {})
uni.hideLoading();
}).catch((res) => {});
}
} else {
uni.showToast({
title: res.message,
icon: 'none'
})
}
}).catch((res) => {})
uni.hideLoading();
}).catch((res) => {});
},
//
clickList(item) {
@ -456,34 +489,55 @@
},
addSpec(e){
let that = this;
if(e == ''){
uni.showToast({
title: "请输入属性值名称",
icon: 'none'
})
return
}
if(this.isEdieValue){
that.tui.request("/app/productAttributeValue/edit", "post", {
this.NB.sendRequest("/app/productAttributeValue/edit", {
id: that.valueEditId,
value:e
}, false, true).then((res) => {
}, false, 'post', 'application/x-www-form-urlencoded').then((res) => {
if (res.code == 200) {
that.tui.toast("修改成功")
uni.showToast({
title: "修改成功",
icon: 'none'
})
that.$refs.addDialog.close()
that.goGategoryLow(that.editItem)
that.$forceUpdate()
} else {
that.tui.toast("添加失败")
uni.showToast({
title: res.message,
icon: 'none'
})
}
}).catch((res) => {})
uni.hideLoading();
}).catch((res) => {});
}else{
that.tui.request("/app/productAttributeValue/save", "post", {
this.NB.sendRequest("/app/productAttributeValue/save", {
attributeId: that.editItem.id,
value:e
}, false, true).then((res) => {
}, false, 'post', 'application/x-www-form-urlencoded').then((res) => {
if (res.code == 200) {
that.tui.toast("添加成功")
uni.showToast({
title: "添加成功",
icon: 'none'
})
that.$refs.addDialog.close()
that.goGategoryLow(that.editItem)
that.$forceUpdate()
} else {
that.tui.toast("添加失败")
uni.showToast({
title: "添加失败",
icon: 'none'
})
}
}).catch((res) => {})
uni.hideLoading();
}).catch((res) => {});
}
},
//
@ -501,36 +555,40 @@
}
}
if(e == ''){
that.tui.toast("请输入属性名")
uni.showToast({
title: "请输入属性名",
icon: 'none'
})
return
}
that.tui.request("/app/productAttribute/save", "post", {
this.NB.sendRequest("/app/productAttribute/save", {
categoryId: that.attrId,
attributeName:e
}, false, true).then((res) => {
}, false, 'post', 'application/x-www-form-urlencoded').then((res) => {
if (res.code == 200) {
that.tui.toast("添加成功")
uni.showToast({
title: "添加成功",
icon: 'none'
})
that.$refs.addTypeDialog.close()
that.getGategoryList()
} else {
that.tui.toast("添加失败")
uni.showToast({
title: "添加失败",
icon: 'none'
})
}
uni.hideLoading();
}).catch((res) => {});
}).catch((res) => {})
// that.$refs.addTypeDialog.val = ''
/* for(var i=0;i<that.defaultList.length;i++){
for(var m=0;m<that.defaultList[i].list.length;m++){
that.defaultList[i].list[m].checked = false
}
} */
that.typeText = ''
that.multipleList = []
break;
case 'edit':
that.tui.request("/app/productAttribute/edit", "post", {
this.NB.sendRequest("/app/productAttribute/edit", {
attributeName: this.inputVal,
id: that.editItem.id
}, false, true).then((res) => {
}, false, 'post', 'application/x-www-form-urlencoded').then((res) => {
if (res.code == 200) {
that.getGategoryList()
that.sortText = ''
@ -544,27 +602,25 @@
icon: 'none'
})
}
}).catch((res) => {})
uni.hideLoading();
}).catch((res) => {});
break;
default:
}
that.$refs.delDialog.close()
that.$refs.inputClose.val = ''
this.inputVal = ""
},
//
dialogClose() {
this.inputVal = '';
this.specVal = '';
this.$refs.inputClose.val = ''
this.$refs.addClose.val = ''
},
//
dialogDel() {
this.tui.request("/app/productAttribute/delById", "post", {
this.NB.sendRequest("/app/productAttribute/delById", {
id: this.editItem.id,
}, false, true).then((res) => {
}, false, 'post', 'application/x-www-form-urlencoded').then((res) => {
if (res.code == 200) {
this.getGategoryList()
uni.showToast({
@ -579,14 +635,15 @@
icon: 'none'
})
}
}).catch((res) => {})
uni.hideLoading();
}).catch((res) => {});
},
delItemModal() {
this.show = false;
if (this.delType == 'del') {
this.tui.request("/app/productCategory/delById", "post", {
this.NB.sendRequest("/app/productCategory/delById", {
id: this.delItems.id,
}, false, true).then((res) => {
}, false, 'post', 'application/x-www-form-urlencoded').then((res) => {
if (res.code == 200) {
this.getGategoryList()
uni.showToast({
@ -595,14 +652,14 @@
})
this.$refs.carPopup.close()
this.$refs.delDialog.close()
} else {
uni.showToast({
title: "删除失败",
icon: 'none'
})
}
}).catch((res) => {})
uni.hideLoading();
}).catch((res) => {});
}
},
delItem(item, type) {
@ -613,9 +670,9 @@
//
goGategoryLow(item) {
this.editItem = item
this.tui.request("/app/productAttributeValue/selectByAttributeId", "get", {
this.NB.sendRequest("/app/productAttributeValue/selectByAttributeId", {
id: item.id,
}, false, true).then((res) => {
}, false, 'get', 'application/x-www-form-urlencoded').then((res) => {
if (res.code == 200) {
this.defaultList = res.result;
this.$refs.attrValueDialog.open();
@ -625,8 +682,8 @@
icon: 'none'
})
}
}).catch((res) => {})
uni.hideLoading();
}).catch((res) => {});
},
//
addMultipleType(item,item1,index){
@ -843,16 +900,22 @@
}
.back-btn {
margin-top: 110rpx;
padding-top: 110rpx;
}
.btn{
flex: 1;
line-height: 25px;
min-width: 88rpx;
height: 48rpx;
line-height: 48rpx;
text-align: center;
height: 25px;
color: #1E90FF;
border-radius: 7px;
margin: 5px 0 0 10px;
color: #00231C;
border-radius: 48rpx;
background: rgba(166, 255, 234, 0.45);
margin-left: 16rpx;
font-size: 24rpx;
}
.danger-text {
color: #FF5A4F;
background: #FFF0E6;
}
.title-search {
@ -904,24 +967,90 @@
border-radius: 70rpx;
}
.add-popup-content {
align-items: center;
justify-content: center;
padding: 30rpx;
width: 100%;
height: 325rpx;
background-color: #fff;
overflow: scroll;
width: 640rpx;
max-width: 92vw;
max-height: 82vh;
background: #fff;
border-radius: 28rpx;
padding: 34rpx 30rpx 30rpx;
box-sizing: border-box;
overflow: hidden;
}
.attr-name-popup {
width: 100vw;
max-width: 100vw;
border-radius: 28rpx 28rpx 0 0;
padding-bottom: calc(30rpx + env(safe-area-inset-bottom));
}
.add-popup-title {
font-size: 36rpx;
font-weight: bold;
text-align: center;
text-align: left;
position: relative;
color: #00231C;
padding-right: 70rpx;
}
.popup-close {
position: absolute !important;
top: 4rpx;
right: 0;
width: 48rpx;
height: 48rpx;
line-height: 48rpx;
text-align: center;
border-radius: 50%;
background: #F7F8F8;
}
.add-popup-container {
margin-top: 20rpx;
margin-top: 28rpx;
}
.form-field {
margin-top: 26rpx;
}
.form-label {
font-size: 28rpx;
font-weight: 700;
color: #00231C;
margin-bottom: 16rpx;
}
.popup-input {
width: 100%;
height: 84rpx;
line-height: 84rpx;
border: 2rpx solid #E8ECEB;
background: #F7F8F8;
border-radius: 18rpx;
box-sizing: border-box;
padding: 0 24rpx;
font-size: 28rpx;
}
.popup-actions {
display: flex;
gap: 20rpx;
margin-top: 42rpx;
}
.popup-action {
flex: 1;
height: 84rpx;
line-height: 84rpx;
text-align: center;
border-radius: 84rpx;
font-size: 30rpx;
font-weight: 700;
}
.popup-action.primary {
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
color: #00231C;
}
.popup-action.danger {
background: #FFF0E6;
color: #FF5A4F;
}
.popup-action.plain {
background: #F7F8F8;
color: #00231C;
}
.title-name {
padding-top: 110rpx;
@ -935,27 +1064,88 @@
height: 80rpx;
color: #fff;
line-height: 80rpx;
margin-top: 50rpx;
margin-top: 42rpx;
}
.add-popup-btn {
flex: 1;
text-align: center;
background: linear-gradient(90deg, #60F3FF, #088FEB);
height: 84rpx;
line-height: 84rpx;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
color: #00231C;
border-radius: 84rpx;
font-size: 30rpx;
font-weight: 700;
}
.attr-value-popup {
width: 680rpx;
padding-bottom: 20rpx;
}
.value-edit-popup {
width: 620rpx;
}
.popup-tip {
padding: 18rpx 22rpx;
background: rgba(166, 255, 234, 0.24);
color: #005849;
border-radius: 16rpx;
font-size: 24rpx;
line-height: 36rpx;
}
.attr-value-header {
display: flex;
align-items: center;
height: 88rpx;
}
.attr-value-title {
flex: 1;
font-size: 30rpx;
font-weight: 700;
color: #00231C;
}
.add-value-btn {
display: flex;
align-items: center;
height: 58rpx;
line-height: 58rpx;
padding: 0 22rpx;
border-radius: 58rpx;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
font-size: 26rpx;
font-weight: 700;
color: #00231C;
}
.add-value-btn text {
margin-left: 6rpx;
}
.attr-value-list {
max-height: 58vh;
overflow-y: auto;
padding-bottom: 10rpx;
}
.title-fur {
width: 95%;
height: 70rpx;
width: 100%;
min-height: 82rpx;
margin: 0 auto;
border-bottom: 1px solid #eee;
display: flex;
align-items: center;
.name {
font-size: 30rpx;
width: 65%;
height: 70rpx;
line-height: 70rpx;
flex: 1;
min-width: 0;
line-height: 40rpx;
color: #00231C;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.value-actions {
display: flex;
align-items: center;
}
.content-fur {
padding-bottom: 25rpx;
}
@ -981,7 +1171,7 @@
}
@media screen and (min-width: 760px) {
.add-popup-content{
height: 700px !important;
max-height: 700px !important;
}
.vue-ref{
padding-bottom:0 !important;

1
pages/shop/orderDetail.vue

@ -284,6 +284,7 @@
},
mealServing(item){
let that = this
console.log('确定出餐吗?',item)
uni.showModal({
title: '提示',
content: '确定要出餐吗?',

Loading…
Cancel
Save