Commit 69d4801b authored by Facius's avatar Facius

Merge branch 'lwh-dev'

parents 1ac133d0 99844a9a
Pipeline #4008 canceled with stages
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</scroll-view> </scroll-view>
</view> </view>
</view> </view>
<shopping-cart :show.sync="cartShow" :open="show" :autoHide="false" :list="list" @handleClick="handleClickShoppingCart"></shopping-cart> <shopping-cart :type="type" :show.sync="cartShow" :open="show" :autoHide="false" :list="list" @handleClick="handleClickShoppingCart"></shopping-cart>
</view> </view>
</u-popup> </u-popup>
</template> </template>
...@@ -52,6 +52,10 @@ export default { ...@@ -52,6 +52,10 @@ export default {
list: { list: {
type: Array, type: Array,
default: () => [] default: () => []
},
type:{
type: String,
default: 'normal'
} }
}, },
data() { data() {
......
...@@ -104,10 +104,7 @@ export default { ...@@ -104,10 +104,7 @@ export default {
openCart() { openCart() {
this.$emit('handleClick'); this.$emit('handleClick');
}, },
handleClickChange() { resetList(){
if(!this.list.length){
return ;
}
let list=this.list.map(item=>{ let list=this.list.map(item=>{
let goods={ let goods={
name:this.type==='custom'?item.offerName : item.classBProject + '-' + item.classCProject, name:this.type==='custom'?item.offerName : item.classBProject + '-' + item.classCProject,
...@@ -119,6 +116,13 @@ export default { ...@@ -119,6 +116,13 @@ export default {
} }
return goods return goods
}) })
return list
},
handleClickChange() {
if(!this.list.length){
return ;
}
let list=resetList()
this.$u.route({ this.$u.route({
url: 'pages/maintain-bill/bill-style', url: 'pages/maintain-bill/bill-style',
type: 'navigateTo', type: 'navigateTo',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment