fix: 合并冲突

src/views/online-shop/goods-group.vue

@@ -267,7 +267,8 @@ async function addConfirm() {
         })
         obj.productIds = arr
       }
-      if (obj.time.length) {
+      console.log(obj, '商品分组的参数')
+      if (obj.time && obj.time.length) {
         obj.saleStartTime = obj.time[0]
         obj.saleEndTime = obj.time[1]
       }
@@ -278,6 +279,10 @@ async function addConfirm() {
           myDialogRefAdd.value.close()
         }
       } else {
+        if (obj.useTime == 0) {
+          obj.saleStartTime = null
+          obj.saleEndTime = null
+        }
         let res = await UserAPI.update(obj)
         if (res.code == 200) {
           ElMessage.success("编辑成功");

src/views/product/indexconfig/addgoods.vue

@@ -65,9 +65,9 @@
       <el-form-item label="套餐商品" v-if="ruleForm.type == 'package'">
         <div style="display: block;width: 100%;">
           <div class="head-container">
-            <el-radio-group v-model="ruleForm.groupType" @change="typeChange" :disabled="isSyncStatus()">
+            <el-radio-group v-model="ruleForm.groupType" @change="typeChange">
-              <el-radio-button label="0">固定套餐</el-radio-button>
+              <el-radio-button :label="0">固定套餐</el-radio-button>
-              <el-radio-button label="1">可选套餐</el-radio-button>
+              <el-radio-button :label="1">可选套餐</el-radio-button>
             </el-radio-group>
           </div>
           <div v-if="ruleForm.groupType == '0'">
@@ -123,8 +123,8 @@
                     <template v-slot="scope">
                       <el-button type="text" :disabled="scope.row.type != 'sku' && isSyncStatus()"
                         @click="showSelectSkuHandle(scope.row, scope.$index, index)">设置规格</el-button>
-                      <el-button type="text"
+                      <el-button type="text" @click="ruleForm.proGroupVo[index].goods.splice(scope.$index, 1)"
-                        @click="ruleForm.proGroupVo[index].goods.splice(scope.$index, 1)" :disabled="isSyncStatus()">删除</el-button>
+                        :disabled="isSyncStatus()">删除</el-button>
                     </template>
                   </el-table-column>
                 </el-table>
@@ -135,7 +135,8 @@
         </div>
       </el-form-item>
       <el-form-item label="选择规格" v-if="ruleForm.type == 'sku'">
-        <el-select v-model="ruleForm.specId" placeholder="请选择规格" style="width: 500px" @change="selectSpecHandle" :disabled="isSyncStatus()">
+        <el-select v-model="ruleForm.specId" placeholder="请选择规格" style="width: 500px" @change="selectSpecHandle"
+          :disabled="isSyncStatus()">
           <el-option :label="item.name" :value="item.id" v-for="item in datas.specificationsconfig"
             :key="item.id"></el-option>
         </el-select>
@@ -189,8 +190,7 @@
       <el-form-item>
         <el-col :span="12">
           <el-time-picker v-model="ruleForm.useTime" is-range range-separator="至" start-placeholder="开始时间"
-            end-placeholder="结束时间"  value-format="HH:mm:ss"
+            end-placeholder="结束时间" value-format="HH:mm:ss" format="HH:mm:ss" />
-            format="HH:mm:ss" />
         </el-col>
       </el-form-item>
       <el-form-item label="上架">
@@ -211,7 +211,8 @@
 
       <el-form-item label="打包费" prop="delivery">
         <div style="display: block;">
-          <el-input-number v-model="ruleForm.packFee" controls-position="right" :disabled="isSyncStatus()"></el-input-number>
+          <el-input-number v-model="ruleForm.packFee" controls-position="right"
+            :disabled="isSyncStatus()"></el-input-number>
           <div style="color: #999;">单份商品打包费。注：店铺开启外卖模式下该数据才生效</div>
         </div>
       </el-form-item>
@@ -789,6 +790,10 @@ const submitForm = async (formEl: FormInstance | undefined) => {
       setTimeout(() => {
         ruleForm.days = ruleForm.days.split(',')
       }, 200);
+
+      if (ruleForm.type == 'weight') {
+        ruleForm.specId = ''
+      }
       if (ruleForm.id) {
         let res = await UserAPI3.update(ruleForm)
         if (res.code == 200) {