chore: resolve last_build_commit rebase conflict

cfc-web/.last_build_commit

@@ -1 +1 @@
-770a6ac4a2dcad36f7675b5cd08a4ebafcc01bb0
+770a6ac4a2dcad36f7675b5cd08a4ebafcc01bb0

cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.1585",
+  "version": "1.0.1586",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.1585",
+      "version": "1.0.1586",
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^1.0.2",

cfc-web/src/views/admin/CategoryManage.vue

@@ -36,6 +36,7 @@
         </div>
 
         <div class="category-form-panel">
+          <div class="category-form-wrap">
           <el-form ref="form" :model="form" :rules="rules" label-width="90px" size="small">
             <el-form-item label="分类名称" prop="name">
               <el-input v-model="form.name" placeholder="请输入分类名称" maxlength="50" />
@@ -99,6 +100,7 @@
               <el-button v-if="form.id" @click="handleReset">新增</el-button>
             </el-form-item>
           </el-form>
+          </div>
         </div>
       </div>
     </el-card>
@@ -320,6 +322,14 @@ export default {
   flex: 1;
   max-width: 500px;
 }
+.category-form-wrap {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+  overflow-x: hidden;
+  padding-right: 8px;
+  margin-right: -8px;
+}
 .tree-node {
   display: flex;
   justify-content: space-between;

cfc-web/src/views/admin/ProductEdit.vue

@@ -394,6 +394,7 @@ export default {
         deliveryMethod: 1,
         memberEligible: 'no',
         minVisibleLevel: '',
+        isRecommended: 0,
         dimensionWeights: [],
         // 测评商品扩展
         assessmentType: 'single',

cfc-web/src/views/admin/ReportTemplateManage.vue

@@ -51,6 +51,7 @@
         <el-button size="small" @click="activeTab = 'list'">返回列表</el-button>
       </div>
 
+      <div class="report-template-form-wrap">
       <el-form ref="form" :model="form" label-width="110px" style="max-width:900px">
         <el-row :gutter="16">
           <el-col :span="12">
@@ -151,6 +152,7 @@
           <el-button @click="handlePreview">预览效果</el-button>
         </el-form-item>
       </el-form>
+      </div>
     </el-card>
 
     <!-- 预览对话框 -->