商家审核

src/const/crud/mall/merchantMallorder.js

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

src/views/businessGoods/goodsEdit/goods_edit.vue

@@ -175,7 +175,7 @@
 
 
 <script>
 <script>
 
 
-  let DBG = true
+  let DBG = false
   import {
   import {
     ZmMixin
     ZmMixin
   } from '@/mixins/ZmMixin.js'
   } from '@/mixins/ZmMixin.js'

src/views/businessGoods/index.vue

@@ -22,7 +22,7 @@
                 <el-button  type="button" size="small"
                 <el-button  type="button" size="small"
                             @click="lookDetail(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">详情</el-button>
                             @click="lookDetail(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">详情</el-button>
                 <el-button  type="button" size="small"
                 <el-button  type="button" size="small"
-                            v-if="scope.row.auditState!=0"
+                            v-if="scope.row.state!=0"
                             @click="handleUpdate(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">编辑</el-button>
                             @click="handleUpdate(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">编辑</el-button>
                 <el-button  type="button" size="small"
                 <el-button  type="button" size="small"
                             @click="handleDel(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">删除</el-button>
                             @click="handleDel(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">删除</el-button>
@@ -99,10 +99,6 @@
              this.id=row.id
              this.id=row.id
               this.goodsEditVue=true
               this.goodsEditVue=true
           }
           }
-          // console.log("执行编辑方法")
-          // this.id=row.id
-          // console.log("赋值id:"+row.id)
-          // this.goodsEditVue=true
         },
         },
         // 添加
         // 添加
         add() {
         add() {

src/views/businessOrder/index.vue

@@ -21,7 +21,7 @@
                 <el-button  type="button" size="small"
                 <el-button  type="button" size="small"
                             @click="checkTheDetails(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">详情</el-button>
                             @click="checkTheDetails(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">详情</el-button>
                 <el-button  type="button" size="small"
                 <el-button  type="button" size="small"
-                            v-if="scope.row.state == 1 || scope.row.state == 2"
+                            v-if="qwlAuth(scope.row)>=0"
                             @click="viewLogistics(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">查看物流</el-button>
                             @click="viewLogistics(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">查看物流</el-button>
                 <el-button type="button" size="small"
                 <el-button type="button" size="small"
                            v-if="scope.row.state == 0"
                            v-if="scope.row.state == 0"
@@ -184,7 +184,12 @@
             }
             }
 
 
           },
           },
-          // 取消订单
+          qwlAuth: function (row) {
+            let str=row.state
+            let text='3,6'//待收货，已完成
+            return text.search(str)
+          },
+          // 是否可以取消订单
           cancelOrderButAuth: function (row) {
           cancelOrderButAuth: function (row) {
             let str=row.state
             let str=row.state
             let text='0,1,2,3,4'
             let text='0,1,2,3,4'