Merge remote-tracking branch 'origin/test' into test_zxm

src/views/login.vue

@@ -83,8 +83,8 @@ const router = useRouter()
 const { proxy } = getCurrentInstance()
 const { proxy } = getCurrentInstance()
 
 
 const loginForm = ref({
 const loginForm = ref({
-  username: 'admin',
-  password: '12345',
+  username: '',
+  password: '',
   rememberMe: false,
   rememberMe: false,
   code: '',
   code: '',
   uuid: ''
   uuid: ''

src/views/merchandise/components/comeInfo.vue

@@ -10,6 +10,7 @@
       </el-col>
       </el-col>
     </el-row>
     </el-row>
     <el-table
     <el-table
+      height="70%"
       :data="tableData"
       :data="tableData"
       :span-method="objectSpanMethod"
       :span-method="objectSpanMethod"
       border
       border
@@ -52,7 +53,7 @@
       :close-on-click-modal="false"
       :close-on-click-modal="false"
     >
     >
       <!-- 表格数据 -->
       <!-- 表格数据 -->
-      <el-table v-loading="settingLoading" :data="settingList" border ref="settingTableRef">
+      <el-table v-loading="settingLoading" :data="settingList" border ref="settingTableRef" height="75%">
         <el-table-column
         <el-table-column
           label="序号 "
           label="序号 "
           width="55"
           width="55"

src/views/merchandise/components/productBaseInfo.vue

@@ -16,7 +16,13 @@
             <el-row>
             <el-row>
               <el-col :span="12">
               <el-col :span="12">
                 <div class="commonHeader">产品标题</div>
                 <div class="commonHeader">产品标题</div>
-                <el-select
+                  <el-input
+                  v-model="form['apiProductLaunchDto'].title"
+                  placeholder="请输入"
+                  maxlength="20"
+                  show-word-limit
+                />
+                <!-- <el-select
                   v-model="form['apiProductLaunchDto'].title"
                   v-model="form['apiProductLaunchDto'].title"
                   filterable
                   filterable
                   remote
                   remote
@@ -35,7 +41,7 @@
                     :label="item.productName"
                     :label="item.productName"
                     :value="item.productBizId"
                     :value="item.productBizId"
                   />
                   />
-                </el-select>
+                </el-select> -->
               </el-col>
               </el-col>
               <el-col :span="24" :class="showNameTip ? '' : 'colBottomGap'">
               <el-col :span="24" :class="showNameTip ? '' : 'colBottomGap'">
                 <div class="nameTip">
                 <div class="nameTip">

src/views/merchandise/components/sendInfo.vue

@@ -7,7 +7,7 @@
         </div>
         </div>
       </el-col>
       </el-col>
     </el-row>
     </el-row>
-    <el-table :data="tableData" :span-method="objectSpanMethod" border style="width: 100%; margin-top: 20px"
+    <el-table :data="tableData" :span-method="objectSpanMethod" border style="width: 100%; margin-top: 20px"  height="70%"
       row-key="rowKey">
       row-key="rowKey">
       <!-- 动态生成所有列 -->
       <!-- 动态生成所有列 -->
       <template v-for="column in tableColumns" :key="column.prop">
       <template v-for="column in tableColumns" :key="column.prop">

src/views/merchandise/productsList.vue

@@ -42,15 +42,15 @@
               label="短标题"
               label="短标题"
               prop="shortTitle"
               prop="shortTitle"
               :show-overflow-tooltip="true"
               :show-overflow-tooltip="true"
-              width="150"
+              width="200"
             />
             />
 
 
-            <el-table-column label="状态" prop="status" align="left">
+            <el-table-column label="状态" prop="status" align="left" width="100">
               <template #default="scope">
               <template #default="scope">
                 <dict-tag :options="product_launch_status" :value="scope.row.status" />
                 <dict-tag :options="product_launch_status" :value="scope.row.status" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-              <el-table-column label="创建时间" prop="createTime" align="left">
+              <el-table-column label="创建时间" prop="createTime" align="left" sortable >
               <template #default="scope">
               <template #default="scope">
                 {{ formatIsoToDateTime(scope.row.createTime) }}
                 {{ formatIsoToDateTime(scope.row.createTime) }}
               </template>
               </template>