Merge branch 'master' of https://gitea.zianxin.com/zax/xrhome-pc

src/views/mall/product/device/index.vue

@@ -54,11 +54,16 @@ type="success" plain @click="handleExport" :loading="exportLoading"
       <el-table-column label="设备名称" align="center" prop="name" />
       <el-table-column label="设备IMEI" align="center" prop="deviceId" />
       <el-table-column label="访问商品地址" width="250" align="center" prop="productUrl" />
-      <el-table-column label="文件地址" align="center" prop="fileUrl">
+      <el-table-column label="广告" align="center" prop="fileUrl">
         <template #default="{ row }">
           <el-image :src="row.fileUrl" class="mr-10px h-30px w-30px" @click="imagePreview(row.fileUrl)" />
         </template>
       </el-table-column>
+      <el-table-column label="小程序二维码" width="150" align="center" prop="productUrl">
+        <template #default="{ row }">
+          <el-image :src="row.productUrl" class="mr-10px h-30px w-30px" @click="imagePreview(row.productUrl)" />
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
       <el-table-column label="操作" align="center" min-width="120px">
         <template #default="{ row }">