Merge remote-tracking branch 'origin/master'

src/api/mall/merchantMallgoods.js

 import request from '@/router/axios'
 import request from '@/router/axios'
 
 
-
-
-
 export function getMerchantByAccount(parameter) {
 export function getMerchantByAccount(parameter) {
   return request({
   return request({
     url: '/admin/merchantMallGoods/getMerchantByAccount',
     url: '/admin/merchantMallGoods/getMerchantByAccount',

src/const/crud/mall/merchantMallgoods.js

@@ -72,7 +72,7 @@ export const tableOption = {
       "prop": "state",
       "prop": "state",
       "search": true,
       "search": true,
       "showColumn":false,
       "showColumn":false,
-      dicUrl: "/general/mallGoods/getStateOptions",
+      dicUrl: "/admin/merchantMallGoods/getStateOptions",
     },
     },
     {
     {
       "type": "input",
       "type": "input",
@@ -85,7 +85,7 @@ export const tableOption = {
       "prop": "auditState",
       "prop": "auditState",
       "search": true,
       "search": true,
       "showColumn":false,
       "showColumn":false,
-      dicUrl: "/general/mallGoods/getAuditStateOptions",
+      dicUrl: "/admin/merchantMallGoods/getAuditStateOptions",
     },
     },
     {
     {
       "type": "input",
       "type": "input",

src/const/crud/mall/merchantMallorder.js

@@ -32,7 +32,7 @@ export const tableOption = {
       "label": "状态",
       "label": "状态",
       "prop": "state",
       "prop": "state",
       "search": true,
       "search": true,
-      "dicUrl": "/general/mallOrder/getOrderStateOptions",
+      "dicUrl": "/admin/merchantMallOrder/getOrderStateOptions",
     },
     },
     {
     {
       "type": "input",
       "type": "input",

src/views/businessGoods/goodsEdit/goods_api.js

@@ -33,7 +33,7 @@ export function getGoodsDetails(query) {
 
 
 export function addOrEditGoods(data) {
 export function addOrEditGoods(data) {
   return request({
   return request({
-    url: '/admin/mallGoodsSpec/addOrEditGoods',
+    url: '/admin/merchantMallGoods/addOrEditGoods',
     method: 'post',
     method: 'post',
     data
     data
   })
   })

src/views/businessGoods/goodsEdit/goods_edit.vue

@@ -192,6 +192,8 @@
 
 
 <script>
 <script>
 
 
+  import {getMerchantByAccount} from "@/api/mall/merchantMallgoods";
+
   let DBG = true
   let DBG = true
   import {
   import {
     ZmMixin
     ZmMixin
@@ -206,6 +208,7 @@
     getGoodsDetails,
     getGoodsDetails,
     addOrEditGoods
     addOrEditGoods
   } from './goods_api.js'
   } from './goods_api.js'
+  import {fetchList} from "@/api/mall/merchantMallorder";
   export default {
   export default {
     mixins: [ZmMixin],
     mixins: [ZmMixin],
     components: {
     components: {
@@ -681,30 +684,25 @@
       doSubmit: function () {
       doSubmit: function () {
         let id = this.id
         let id = this.id
         if(JSON.stringify(id)==='{}'||id===undefined){
         if(JSON.stringify(id)==='{}'||id===undefined){
-          // 根据当前登陆用户id 获取商家id
-          let userId = JSON.parse(sessionStorage.getItem("linshenxs-userInfo")).content.userId
-          this.$axios.get("/admin/merchantMallGoods/getMerchantByUserId",{
-            params:{id:userId},
-          }).then(response => {
+          // 1.获取当前登陆用户ID
+          let userInfo=  JSON.parse(sessionStorage.getItem("linshenxs-userInfo"))
+          let account=userInfo.content.username
+          getMerchantByAccount(
+            {account: account}
+          ).then(response => {
             this.form.merchantId=response.data.data.id
             this.form.merchantId=response.data.data.id
-            const {data: res} = this.$http.post(
-              "/general/mallGoods/addOrEditGoods",
-              this.form).then(r => {
-              this.loading = false
-              this.$emit('success')
+            addOrEditGoods(this.form).then(data => {
               this.$message.success('添加成功')
               this.$message.success('添加成功')
-              // this.$router.go(-1)
-            }).catch(e => {
-              this.loading = false
-            })
-          }, error => {
-            console.log('错误', error.message)
+              done()
+            }).catch(() => {
+            });
+          }).catch(() => {
+            this.tableLoading = false
           })
           })
         }else{
         }else{
           addOrEditGoods(this.form).then(data => {
           addOrEditGoods(this.form).then(data => {
             this.$message.success('修改成功')
             this.$message.success('修改成功')
             done()
             done()
-            // this.$router.go(-1)
           }).catch(() => {
           }).catch(() => {
           });
           });
         }
         }

src/views/businessOrder/index.vue

@@ -270,9 +270,7 @@
               fetchList(Object.assign({
               fetchList(Object.assign({
                 current: page.currentPage,
                 current: page.currentPage,
                 size: page.pageSize,
                 size: page.pageSize,
-                // merchantId:response.data.data.id
-                merchantId:47
-
+                merchantId:response.data.data.id
               }, params, this.searchForm)).then(response => {
               }, params, this.searchForm)).then(response => {
                 this.tableData = response.data.data.records
                 this.tableData = response.data.data.records
                 this.page.total = response.data.data.total
                 this.page.total = response.data.data.total
@@ -283,21 +281,6 @@
             }).catch(() => {
             }).catch(() => {
               this.tableLoading = false
               this.tableLoading = false
             })
             })
-            //
-            // this.tableLoading = true
-            // if(page.currentPage=1){
-            //   page.currentPage=0
-            // }
-            // fetchList(Object.assign({
-            //       current: page.currentPage,
-            //       size: page.pageSize
-            //   }, params, this.searchForm )).then(response => {
-            //       this.tableData = response.data.data.records
-            //       this.page.total = response.data.data.total
-            //       this.tableLoading = false
-            //   }).catch(() => {
-            //       this.tableLoading=false
-            //   })
           },
           },
           // 删除
           // 删除
           handleDel: function (row, index) {
           handleDel: function (row, index) {