Merge remote-tracking branch 'origin/develop' into develop

src/views/Login/components/LoginForm.vue

@@ -97,7 +97,7 @@
 </template>
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import LoginFormTitle from './LoginFormTitle.vue'
+// import LoginFormTitle from './LoginFormTitle.vue'
 import type { RouteLocationNormalizedLoaded } from 'vue-router'
 
 import { useIcon } from '@/hooks/web/useIcon'

src/views/biz/bannerinfo/index.vue

@@ -110,7 +110,7 @@
       <el-table-column label="描述内容" align="center" prop="description" />
       <el-table-column label="状态" align="center" prop="showStatus">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.HOME_INFO_STATUS" :value="scope.row.showStatus" />
+          <dict-tag :type="DICT_TYPE.HOME_INFO_STATUS" :value="Number(scope.row.showStatus)" />
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />

src/views/biz/partner/index.vue

@@ -111,7 +111,7 @@
       <el-table-column label="链接地址" align="center" prop="url" />
       <el-table-column label="状态" align="center" prop="showStatus">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.HOME_INFO_STATUS" :value="scope.row.showStatus" />
+          <dict-tag :type="DICT_TYPE.HOME_INFO_STATUS" :value="Number(scope.row.showStatus)" />
         </template>
       </el-table-column>
       <el-table-column

src/views/mall/product/spu/components/SkuList.vue

@@ -20,7 +20,7 @@
         :key="index"
         :label="item.label"
         align="center"
-        min-width="120"
+        min-width="100"
       >
         <template #default="{ row }">
           <span style="font-weight: bold; color: #40aaff">
@@ -28,9 +28,27 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="鉴权信息" prop="auth" align="center" />
-      <el-table-column label="有效期(单位：天)" prop="expTime" align="center" min-width="100" />
-      <el-table-column label="费用描述" prop="feeInfo" align="center" />
+      <el-table-column label="鉴权信息" prop="auth" align="center">
+        <template #default="{ row }">
+          <el-input v-model="row.auth" class="w-100%" />
+        </template>
+      </el-table-column>
+      <el-table-column label="有效期(单位：天)" prop="expDuration" align="center" min-width="160">
+        <template #default="{ row }">
+          <el-input-number
+            v-model="row.expDuration"
+            :min="0"
+            :step="1"
+            class="w-100%"
+            controls-position="right"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="费用描述" prop="feeInfo" align="center">
+        <template #default="{ row }">
+          <el-input v-model="row.feeInfo" class="w-100%" />
+        </template>
+      </el-table-column>
     </template>
     <el-table-column align="center" label="销售价" min-width="168">
       <template #default="{ row }">
@@ -278,7 +296,10 @@ const skuList = ref<Sku[]>([
     picUrl: '', // 图片地址
     stock: 0, // 库存
     weight: 0, // 商品重量
-    volume: 0 // 商品体积
+    volume: 0, // 商品体积
+    auth: '',
+    expDuration: '365',
+    feeInfo: '元/年'
     // firstBrokeragePrice: 0, // 一级分销的佣金
     // secondBrokeragePrice: 0 // 二级分销的佣金
   }
@@ -410,6 +431,9 @@ const generateTableData = (propertyList: any[]) => {
       stock: 0,
       weight: 0,
       volume: 0,
+      auth: '',
+      expDuration: '365',
+      feeInfo: '元/年'
       // firstBrokeragePrice: 0,
       // secondBrokeragePrice: 0
     }
@@ -483,7 +507,10 @@ watch(
           picUrl: '',
           stock: 0,
           weight: 0,
-          volume: 0
+          volume: 0,
+          auth: '',
+          expDuration: '365',
+          feeInfo: '元/年'
           // firstBrokeragePrice: 0,
           // secondBrokeragePrice: 0
         }