Merge branch 'dev' into 'dev_ren'

# Conflicts:
#   src/views/orderManagement/orderList/index.vue

src/views/orderManagement/orderList/index.vue

@@ -578,51 +578,16 @@ export default {
           message: "请选择审核结果",
           trigger: "change",
         },
-      },
-      listLoading: false,
-      times: [], // 时间
-      list: [],
-      total: 0,
-      orderSendDetailVisible: false, // 查看弹窗
-      sendVisible: false, // 发货弹窗
-      oneRow: {}, // 当前操作项
-      selectDataVisible: false, // 选择数据
-      companyAccountInfo: {}, // 对公信息
-    };
-  },
-  created() {
-    this.listQuery.keywords = this.$route.query.orderNo;
-    this.getList();
-    this.companyInfoByType(); // 获取对公信息
-  },
-  methods: {
-    handleFilter() {
-      this.listQuery.page = 1;
-      this.getList();
-    },
-    handleSizeChange(val) {
-      this.listQuery.limit = val;
-      this.getList();
-    },
-    handleCurrentChange(val) {
-      this.listQuery.page = val;
-      this.getList();
-    },
-    /**
-     * 取消审核
-     */
-    cancel() {
-      this.auditVisible = false;
-    },
-    /**
-     * 对公支付-待审核
-     */
-    handleAudit(row) {
-      this.oneRow = row;
-      this.form = {
-        auditStatus: undefined, // 审核状态： 1、审核通过，2、审核拒绝
-        auditReason: undefined, // 审核理由
-        orderNo: row.orderNo, // 订单号
+        listLoading: false,
+        times: [], // 时间
+        list: [],
+        total: 0,
+        BASE_API: process.env.BASE_API,
+        orderSendDetailVisible: false, // 查看弹窗
+        sendVisible: false, // 发货弹窗
+        oneRow: {}, // 当前操作项
+        selectDataVisible: false, // 选择数据
+        companyAccountInfo: {}, // 对公信息
       };
       this.auditVisible = true;
     },
@@ -881,6 +846,7 @@ export default {
                 }
                 if (iitem.type == 1) {
                   // 标准数据
+                  iitem.itemPic = _this.BASE_API + '/api/datacenter/web/gtdata/app/unauth/image/' + iitem.detailJson.thumbnailPath + '_98_98.jpg'
                   iitem.imageResolutionStr = iitem.detailJson.imageResolution?iitem.detailJson.imageResolution.replace(/{/g, ""):''
                   iitem.imageResolutionStr = iitem.imageResolutionStr?iitem.imageResolutionStr.replace(/}/g, ""):''
                 }