Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp

yudao-ui-admin/src/views/mall/market/banner/index.vue

@@ -37,7 +37,7 @@
       <el-table-column label="标题" align="center" prop="title"/>
 
       <el-table-column label="缩略图" align="center" prop="picUrl">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <img v-if="scope.row.picUrl" :src="scope.row.picUrl" alt="缩略图片" class="img-height"/>
         </template>
       </el-table-column>
@@ -45,17 +45,17 @@
       <el-table-column label="排序" align="center" prop="sort"/>
       <el-table-column label="描述" align="center" prop="memo"/>
       <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['market:banner:update']">修改
           </el-button>
@@ -107,7 +107,6 @@
 import {
   createBanner,
   deleteBanner,
-  exportBannerExcel,
   getBanner,
   getBannerPage,
   updateBanner

yudao-ui-admin/src/views/mall/product/brand/index.vue

@@ -35,24 +35,24 @@
       <el-table-column label="品牌编号" align="center" prop="id"/>
       <el-table-column label="品牌名称" align="center" prop="name"/>
       <el-table-column label="品牌图片" align="center" prop="picUrl">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <img v-if="scope.row.picUrl" :src="scope.row.picUrl" alt="分类图片" style="height: 100px;" />
         </template>
       </el-table-column>
       <el-table-column label="品牌排序" align="center" prop="sort"/>
       <el-table-column label="品牌描述" align="center" prop="description"/>
       <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['product:brand:update']">修改
           </el-button>

yudao-ui-admin/src/views/mall/product/category/index.vue

@@ -30,23 +30,23 @@
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
       <el-table-column label="分类名称" prop="name"/>
       <el-table-column label="分类图片" align="center" prop="picUrl">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <img v-if="scope.row.picUrl" :src="scope.row.picUrl" alt="分类图片" style="height: 100px"/>
         </template>
       </el-table-column>
       <el-table-column label="分类排序" align="center" prop="sort"/>
       <el-table-column label="开启状态" align="center" prop="status">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['product:category:update']">修改
           </el-button>
@@ -98,7 +98,6 @@
 import {
   createProductCategory,
   deleteProductCategory,
-  exportCategoryExcel,
   getProductCategory,
   getProductCategoryList,
   updateProductCategory
@@ -106,7 +105,6 @@ import {
 import Editor from '@/components/Editor';
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import IconSelect from "@/components/IconSelect";
 import ImageUpload from '@/components/ImageUpload';
 import {CommonStatusEnum} from "@/utils/constants";