Merge branch 'qiankun-240313' of http://47.102.110.240:3000/yuxiangpei/jzmall_vue.git into qiankun-240313

src/views/goods/create.vue

@@ -113,7 +113,7 @@
             <el-option label="服务类(买约一体)" :value="0" />
             <el-option label="中介类" :value="2" />
             <el-option label="服务类(买约分离)" :value="3" />
-            <el-option label="服务补差类" :value="4" />
+            <!-- <el-option label="服务补差类" :value="4" /> -->
             <el-option label="代金券" :value="5" />
             <el-option label="实物商品" :value="6" />
           </el-select>
@@ -329,7 +329,7 @@
               <el-radio :label="1">单规格无加购</el-radio>
               <el-radio :label="2">多规格</el-radio>
               <el-radio :label="3" v-if="goods.type != 4">加购</el-radio>
-              <el-radio :label="4">无限购</el-radio>
+              <!-- <el-radio :label="4">无限购</el-radio> -->
             </el-radio-group>
           </el-form-item>
         </el-row>

src/views/goods/edit.vue

@@ -101,10 +101,10 @@
             <!-- <el-option label="保险类" :value="1" /> -->
             <el-option label="中介类" :value="2" />
             <el-option label="服务类(买约分离)" :value="3" />
-            <el-option label="服务补差类" :value="4" />
+            <!--<el-option label="服务补差类" :value="4" /> -->
             <el-option label="代金券" :value="5" />
-            <el-option label="实物商品" :value="6" />
-            <!-- <el-option label="补差" :value="7" /> -->
+           <!-- <el-option label="实物商品" :value="6" />
+             <el-option label="补差" :value="7" /> -->
           </el-select>
         </el-form-item>
         <el-form-item label="商品属性" prop="attribute" v-if="goods.type === 0 || goods.type == 3">
@@ -305,7 +305,7 @@
             <el-radio :label="1" :disabled="true">单规格无加购</el-radio>
             <el-radio :label="2" :disabled="true">多规格</el-radio>
             <el-radio :label="3" v-if="goods.type != 4" :disabled="true">加购</el-radio>
-            <el-radio :label="4" :disabled="true">无限购</el-radio>
+            <!-- <el-radio :label="4" :disabled="true">无限购</el-radio> -->
           </el-radio-group>
         </el-form-item>