Commit c3e8b019 by cpa

商家端

parent 7732827b
...@@ -149,7 +149,6 @@ ...@@ -149,7 +149,6 @@
<script> <script>
import {getGoodsDetails, getGoodsInfo,shipsImmediatelyApi,cancelOrderSubApi} from '@/api/mall/merchantMallgoods' import {getGoodsDetails, getGoodsInfo,shipsImmediatelyApi,cancelOrderSubApi} from '@/api/mall/merchantMallgoods'
import {ZmMixin} from '@/mixins/ZmMixin.js' import {ZmMixin} from '@/mixins/ZmMixin.js'
import {mock} from "@/views/businessGoods/goodsEdit/mock_data";
export default { export default {
mixins: [ZmMixin], mixins: [ZmMixin],
data() { data() {
...@@ -221,7 +220,6 @@ ...@@ -221,7 +220,6 @@
} }
}, },
methods: { methods: {
//回填数据 //回填数据
refill(data) { refill(data) {
let skus = data.skus let skus = data.skus
......
...@@ -2,7 +2,7 @@ import request from '@/router/axios' ...@@ -2,7 +2,7 @@ import request from '@/router/axios'
export function getClassifyDropDown() { export function getClassifyDropDown() {
return request({ return request({
url: 'admin/merchantMallGoods/merchantDropDownBox', url: '/admin/merchantMallGoods/merchantDropDownBox',
method: 'get' method: 'get'
}) })
} }
...@@ -41,27 +41,6 @@ export function getGoodsDetails(query) { ...@@ -41,27 +41,6 @@ export function getGoodsDetails(query) {
} }
// addOrEditGoods(this.form)
// .then((res)=>{
// this.$message.success('添加成功')
// this.$emit('success')
// }).catch(e => {
// this.$message.success('添加失败')
// });
// }).catch(() => {
// this.tableLoading = false
// })
// export function addOrEditGoods(data) {
// return request({
// url: '/admin/merchantMallGoods/addOrEditGoods',
// method: 'post',
// params: data
//
// })
// }
/*** 自定义添加 ***/ /*** 自定义添加 ***/
export function getMerchantByAccount(parameter) { export function getMerchantByAccount(parameter) {
return request({ return request({
......
...@@ -380,31 +380,18 @@ ...@@ -380,31 +380,18 @@
this.clearData() this.clearData()
} }
this.loading = true this.loading = true
getClassifyDropDown() let userInfo= JSON.parse(sessionStorage.getItem("linshenxs-userInfo"))
.then(r => { let account=userInfo.content.username
this.classOptions = this.zmRes(r)
if(DBG) { this.$axios.get("/admin/merchantMallGoods/merchantDropDownBox",{
this.refill(mock) params:{merchantId:userInfo.content.username},
} else { }).then(response => {
if(id != undefined) { console.log(JSON.stringify(response) )
return getGoodsDetails({id: id}) return response.data
} }, error => {
} console.log('错误', error.message)
return Promise.resolve()
})
.then(r => {
this.loading = false
if(r) {
let z = this.zmRes(r)
if(z) {
this.refill(z)
}
}
})
.catch(e => {
this.loading = false
console.log(e)
}) })
}, },
//清除数据 //清除数据
clearData() { clearData() {
......
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