|
|
@@ -33,7 +33,7 @@ export default {
|
|
|
},
|
|
|
onUnload() {},
|
|
|
computed: {
|
|
|
- ...mapGetters(["getSelectInfo"]),
|
|
|
+ ...mapGetters(["getSelectInfo","getMyShopInfo"]),
|
|
|
selectList() {
|
|
|
let selectInfo = this.getSelectInfo;
|
|
|
return selectInfo[this.currentJobType+'_'+this.currentJobId] || []
|
|
|
@@ -349,13 +349,12 @@ export default {
|
|
|
uni.$on('listenGetScanCode',function(data){
|
|
|
that.takeItem(data.code)
|
|
|
})
|
|
|
- //this.getAllProduct()
|
|
|
- //console.log('000000')
|
|
|
+ if(this.getMyShopInfo && this.getMyShopInfo.scan == 1){
|
|
|
+ this.getAllProduct()
|
|
|
+ }
|
|
|
},
|
|
|
getAllProduct(){
|
|
|
- uni.showLoading({mask:false})
|
|
|
allProduct().then(res=>{
|
|
|
- uni.hideLoading()
|
|
|
if(res.code == 1){
|
|
|
this.globalAllProduct = res.data.list
|
|
|
//console.log('载入最新花材...')
|
