|
|
@@ -1,6 +1,7 @@
|
|
|
<template>
|
|
|
<view class="button-area">
|
|
|
- <view class="active" @click="changeProperty">{{property==1 ? '花材' : '商品'}}</view>
|
|
|
+ <view class="active" @click="changeProperty(1)">花材</view>
|
|
|
+ <view class="active" @click="changeProperty(0)">绿植</view>
|
|
|
<view class="active" @click="openBox">开箱</view>
|
|
|
<view class="active"
|
|
|
style="background-color:orange;color:white;border-color:orange;position:fixed;left:135upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:16upx;"
|
|
|
@@ -93,7 +94,6 @@ export default {
|
|
|
currentJobType:'bill',
|
|
|
currentJobId:0,
|
|
|
calc:'add',
|
|
|
- property:1,
|
|
|
settleOpenStatus:0,
|
|
|
price:0
|
|
|
}
|
|
|
@@ -209,9 +209,8 @@ export default {
|
|
|
calcFn(){
|
|
|
this.calc = this.calc == 'add' ? 'sub' : 'add'
|
|
|
},
|
|
|
- changeProperty(){
|
|
|
- this.property = this.property == 1 ? 0 : 1
|
|
|
- this.$emit('changeProperty',this.property)
|
|
|
+ changeProperty(num){
|
|
|
+ this.$emit('changeProperty',num)
|
|
|
},
|
|
|
settleCommit(params){
|
|
|
if(this.$util.isEmpty(this.selectList)) {
|
shish