no message

src/views/mallManagement/configCenter/slideshowConfig/index.vue

@@ -76,6 +76,7 @@ export default {
         imgSrc: [],
         state: true,
         sortNum: '',
+		port: '',
         type: '',
         goodsId: '',
         appId: '',
@@ -139,20 +140,52 @@ export default {
             rules: []
           }
         },
+		{
+		  md: 8,
+		  isShow: true,
+		  name: 'el-radio',
+		  options: [
+			{ label: '轮播图', value: 'SHOP' },
+		    { label: '以旧换新入口', value: 'YJHX' },
+		    { label: '二手商城', value: 'ESHOP' }
+		  ],
+		  attributes: { filterable: true, placeholder: '请选择' },
+		  formItemAttributes: {
+		    label: '类型',
+		    prop: 'port',
+		    rules: []
+		  },
+		   events: {
+			   change: e=>{
+				   if(e=='YJHX'){
+					   this.formData.type = 4
+				   }else{
+					   this.formData.type = 1
+				   }
+			   }
+		   }
+		},
         {
           md: 8,
           isShow: true,
-          name: 'el-radio',
-          options: [
-            { label: '商品链接', value: 1 },
-            // { label: '凡科活动链接', value: 2 },
-            { label: '专区活动链接', value: 3 }
-          ],
-          attributes: { filterable: true, placeholder: '请选择' },
+          name: 'slot-component',
+      //     options: [
+						// { label: '分类列表', value: 1 },
+      //       { label: '商品链接', value: 1 },
+      //       // { label: '凡科活动链接', value: 2 },
+      //       { label: '专区活动链接', value: 3 }
+      //     ],
           formItemAttributes: {
             label: '链接类型',
             prop: 'type',
             rules: []
+          },render: (h, { props, onInput }) => {
+            var { value } = props
+            return <el-radio-group v-model={this.formData.type}>
+				{this.formData.port == 'YJHX'?<el-radio label={4}>分类列表</el-radio>:null}
+				<el-radio label={3}>专区活动</el-radio>
+				<el-radio label={1}>商品链接</el-radio>
+			</el-radio-group>
           }
         },
         ...(() => {

src/views/mallManagement/goods/classify_index/index.vue

@@ -26,6 +26,11 @@
 				      </template>
 				    </el-table-column>
 				    <el-table-column align="center" prop="createTime" label="创建时间" min-width="160"></el-table-column>
+						<el-table-column align="center" prop="createTime" label="服务首页展示">
+							<template slot-scope="scope" v-if="scope.row.level == 1">
+							  {{ scope.row.isServiceShow ? '展示':'不展示' }}
+							</template>
+						</el-table-column>
 				    <!-- <el-table-column align="center" prop="goodsNum" label="商品数"></el-table-column> -->
 				    <el-table-column align="center" prop="sortNum" label="排序"></el-table-column>
 				    <el-table-column align="center" prop="companyName" label="商户" min-width="120"></el-table-column>
@@ -50,7 +55,7 @@
 			</div>
 			<!-- 新增编辑 一级分类 -->
 			<div v-if="addParentFormVisible" class="app-container">
-				<el-form ref="addParentForm" :model="addParentForm" :rules="addParentFormRules" label-position="left" label-width="80px">
+				<el-form ref="addParentForm" :model="addParentForm" :rules="addParentFormRules" label-position="left" label-width="100px">
 					<el-row :gutter="20">
 						<el-col :span="6">
 							<el-form-item label="一级分类" prop="oneClassify">
@@ -76,6 +81,14 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
+							<el-form-item label="服务首页展示" prop="isServiceShow">
+							  <el-radio-group v-model="addParentForm.isServiceShow">
+							    <el-radio :label="true">展示</el-radio>
+							    <el-radio :label="false">不展示</el-radio>
+							  </el-radio-group>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
 							<el-form-item label="排序" prop="sort">
 							  <el-input placeholder="请输入排序" v-model.number="addParentForm.sort" style="width: 250px;"></el-input>
 							</el-form-item>
@@ -202,6 +215,7 @@ export default {
         imgUrl: '',
         taxNumber: '',
         taxPercent: '',
+		isServiceShow: true,
         status: true,
         sort: 0,
       },
@@ -307,6 +321,7 @@ export default {
 						    imgUrl: res.data.imgUrl,
 						    taxNumber: res.data.taxNumber,
 						    taxPercent: res.data.taxPercent,
+							isServiceShow: res.data.isServiceShow,
 						    sort: res.data.sortNum
 						  }
 						})
@@ -335,6 +350,7 @@ export default {
             imgUrl: this.addParentForm.imgUrl,
             taxNumber: this.addParentForm.taxNumber,
             taxPercent: this.addParentForm.taxPercent,
+			isServiceShow: this.addParentForm.isServiceShow,
             status: this.addParentForm.status,
             sortNum: this.addParentForm.sort,
           }

src/views/setting/organizationManagement/tenantDetails/index.vue

@@ -127,6 +127,14 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+			<el-col :span="6">
+			  <el-form-item label="商户属性" prop="companyType">
+			    <el-radio-group v-model="step1Form.companyType">
+			      <el-radio :label="1">销售</el-radio>
+			      <el-radio :label="2">售后</el-radio>
+			    </el-radio-group>
+			  </el-form-item>
+			</el-col>
             <el-col :span="12">
               <el-form-item label="以旧换新抵扣方式" prop="yjhxDkFlag">
                 <el-radio-group v-model="step1Form.yjhxDkFlag">
@@ -520,6 +528,7 @@ export default {
         moduleZl:'',
         moduleEs:'',
         storePay: '',
+		companyType: 2,
         yjhxDkFlag: '',
       },
 
@@ -644,13 +653,14 @@ export default {
         this.step1Form.password = '************';
         this.step1Form.companyExpireTime = res.data.companyExpireTime
         this.step1Form.moduleMaterialPart = res.data.moduleMaterialPart
-				this.step1Form.billTitle = res.data.billTitle
+		this.step1Form.billTitle = res.data.billTitle
         this.step1Form.moduleYb = res.data.moduleYb
         this.step1Form.moduleWb = res.data.moduleWb
         this.step1Form.joinCode = res.data.joinCode
         this.step1Form.moduleZl = res.data.moduleZl
         this.step1Form.moduleEs = res.data.moduleEs
         this.step1Form.storePay = res.data.storePay
+		this.step1Form.companyType = res.data.companyType
         this.step1Form.yjhxDkFlag = res.data.yjhxDkFlag
 
         this.img1_url = res.data.minLogo1;
@@ -658,7 +668,7 @@ export default {
         this.img3_url = res.data.minLogo3;
         this.qrcode1_url = res.data.qrcode1;
         this.qrcode2_url = res.data.qrcode2;
-				this.qrcode3_url = res.data.payQrcode;
+		this.qrcode3_url = res.data.payQrcode;
 
         this.step3Form.enterpriseId = res.data.corpId;
         this.step3Form.listSecret = res.data.secret2;
@@ -793,13 +803,14 @@ export default {
         // adminUserId: this.id,
         companyWechatId: this.companyWechatId,
         moduleMaterialPart: this.step1Form.moduleMaterialPart,
-				billTitle: this.step1Form.billTitle,
+		billTitle: this.step1Form.billTitle,
         moduleYb: this.step1Form.moduleYb,
         moduleWb: this.step1Form.moduleWb,
         joinCode: this.step1Form.joinCode,
         moduleZl: this.step1Form.moduleZl,
         moduleEs: this.step1Form.moduleEs,
         storePay: this.step1Form.storePay,
+		companyType: this.step1Form.companyType,
         yjhxDkFlag: this.step1Form.yjhxDkFlag,
       }
       editAccount(params).then(res => {