Commit 05fbba06 by 陈超

A

parent 57def6c9
...@@ -141,7 +141,8 @@ ...@@ -141,7 +141,8 @@
import { import {
mock mock
} from './mock_data.js' } from './mock_data.js'
import {getStore} from '@/util/store' import {mapGetters} from 'vuex'
import { import {
getClassifyDropDown, getClassifyDropDown,
getGoodsDetails, getGoodsDetails,
...@@ -156,9 +157,6 @@ ...@@ -156,9 +157,6 @@
}, },
data() { data() {
return { return {
shopInfo: getStore({
name: 'shopInfo'
}) || {},
uploadExampleDiaLog:'查看认证视频', uploadExampleDiaLog:'查看认证视频',
setUploadExampleDiaLog:false, setUploadExampleDiaLog:false,
//如果是编辑则需要加载数据 //如果是编辑则需要加载数据
...@@ -316,6 +314,7 @@ ...@@ -316,6 +314,7 @@
} }
}, },
computed: { computed: {
...mapGetters(['shopInfo']),
//能否选择规格 //能否选择规格
canSelectType() { canSelectType() {
return this.form.goodsClassId != undefined && this.form.goodsClassId != '' return this.form.goodsClassId != undefined && this.form.goodsClassId != ''
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:before-close="handleClose" append-to-body> :before-close="handleClose" append-to-body>
<goods-edit ref="editContent" :key="id" @success="onChangeDone"/> <goods-edit ref="editContent" :key="generation" @success="onChangeDone"/>
</el-dialog> </el-dialog>
</template> </template>
...@@ -18,6 +18,11 @@ ...@@ -18,6 +18,11 @@
show: Boolean, show: Boolean,
id: [String, Number], id: [String, Number],
}, },
data() {
return {
generation: 0,
}
},
components: { components: {
'goods-edit': () => import('./goods_edit.vue') 'goods-edit': () => import('./goods_edit.vue')
}, },
...@@ -29,6 +34,7 @@ ...@@ -29,6 +34,7 @@
watch: { watch: {
show(n, o) { show(n, o) {
if(n) { if(n) {
this.generation = this.generation + 1
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['editContent'].reload(this.id) this.$refs['editContent'].reload(this.id)
}) })
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</template> </template>
</avue-crud> </avue-crud>
</basic-container> </basic-container>
<goods_edits :show="goodsEditVue" :id="id" @close="goodsEditVue=false" @success="onChangeDone" /> <goods-edits :show="goodsEditVue" :id="id" @close="goodsEditVue=false" @success="onChangeDone" />
</div> </div>
</template> </template>
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
export default { export default {
name: 'businessGoods', name: 'businessGoods',
mixins: [ZmMixin], mixins: [ZmMixin],
data() { data() {
return { return {
merchantId:'', merchantId:'',
...@@ -92,7 +91,7 @@ ...@@ -92,7 +91,7 @@
} }
}, },
components: { components: {
'goods_edits': () => import('./goodsEdit/goods_edit_pop'), 'goods-edits': () => import('./goodsEdit/goods_edit_pop'),
}, },
methods: { methods: {
// 更新 // 更新
......
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