修改商家端商品查询异常

src/api/mall/merchantMallgoods.js

 import request from '@/router/axios'
 import request from '@/router/axios'
 
 
+
+
+
+export function getMerchantByAccount(parameter) {
+  return request({
+    url: '/admin/merchantMallGoods/getMerchantByAccount',
+    method: 'get',
+    params:parameter
+  })
+}
+
 export function isUpon(parameter) {
 export function isUpon(parameter) {
   return request({
   return request({
     url: '/admin/merchantMallGoods/batchUpon',
     url: '/admin/merchantMallGoods/batchUpon',
@@ -31,6 +42,7 @@ export function getGoodsInfo(query) {
     params: query
     params: query
   })
   })
 }
 }
+
 //
 //
 // export function addObj(obj) {
 // export function addObj(obj) {
 //   return request({
 //   return request({

src/views/businessGoods/index.vue

@@ -54,13 +54,14 @@
 </template>
 </template>
 
 
 <script>
 <script>
-  import {fetchList,addObj,delObj,isUpon, isNotUpon} from '@/api/mall/merchantMallgoods'
+  import {fetchList,addObj,delObj,isUpon, isNotUpon,getMerchantByAccount} from '@/api/mall/merchantMallgoods'
   import {tableOption} from '@/const/crud/mall/merchantMallgoods'
   import {tableOption} from '@/const/crud/mall/merchantMallgoods'
   import {mapGetters} from 'vuex'
   import {mapGetters} from 'vuex'
   export default {
   export default {
       name: 'businessGoods',
       name: 'businessGoods',
       data() {
       data() {
           return {
           return {
+            merchantId:'',
             goodsEditVue:false,
             goodsEditVue:false,
             id:undefined,
             id:undefined,
             searchForm: {},
             searchForm: {},
@@ -106,19 +107,31 @@
         onChangeDone() {
         onChangeDone() {
           this.refreshChange()
           this.refreshChange()
         },
         },
-          //   列表查询
-        getList(page, params) {
-            this.tableLoading = true
+        //   列表查询
+        getList: function (page, params) {
+          this.tableLoading = true
+
+          // 1.获取当前登陆用户ID
+          let userInfo=  JSON.parse(sessionStorage.getItem("linshenxs-userInfo"))
+          let account=userInfo.content.username
+
+          getMerchantByAccount(
+          {account: account}
+          ).then(response => {
             fetchList(Object.assign({
             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
+              current: page.currentPage,
+              size: page.pageSize,
+              merchantId:response.data.data.id
+            }, params, this.searchForm)).then(response => {
+              this.tableData = response.data.data.records
+              this.page.total = response.data.data.total
+              this.tableLoading = false
             }).catch(() => {
             }).catch(() => {
-                this.tableLoading=false
+              this.tableLoading = false
             })
             })
+          }).catch(() => {
+            this.tableLoading = false
+          })
         },
         },
         // 删除
         // 删除
         handleDel: function (row, index) {
         handleDel: function (row, index) {

src/views/businessOrder/index.vue

@@ -197,7 +197,6 @@
           // 立即发货-对话框
           // 立即发货-对话框
           shipsImmediately(row){
           shipsImmediately(row){
             this.form.orderNo=row.orderNo
             this.form.orderNo=row.orderNo
-
             this.$axios.get("/admin/merchantMallOrder/isNeedMailed",{
             this.$axios.get("/admin/merchantMallOrder/isNeedMailed",{
               params:{orderNo:row.orderNo},
               params:{orderNo:row.orderNo},
             }).then(response => {
             }).then(response => {