1

src/components/CommodityMan/goodsListEdit.vue

@@ -1037,8 +1037,11 @@
     <el-dialog title="选择表单" top="2%" :visible.sync="choosebdDig" width="30%">
       <div>
         <el-radio-group v-model="val1">
-          <el-radio @change="YfSelect1" style="padding-bottom:10px" class="yfradio" :label="{ Name: '默认运费', Id: 0 }">
-            默认表单
+          <el-radio @change="YfSelect1" style="padding-bottom:10px" class="yfradio" :label="{ Name: '默认商城', Id: 0 }">
+            默认商城
+          </el-radio>
+          <el-radio @change="YfSelect1" style="padding-bottom:10px" class="yfradio" :label="{ Name: '教育表单', Id: 1 }">
+            教育表单
           </el-radio>
         </el-radio-group>
       </div>
@@ -2176,6 +2179,11 @@
                   this.GradeCommissionList = this.addMsg.DistributionCommissionTreeList[0].GradeCommissionList;
                 }
               }
+              if(this.addMsg.FormsId == -1 || this.addMsg.FormsId == 0){
+                  this.addMsg.FormsName='默认商城'
+              }else if(this.addMsg.FormsId == 1){
+                this.addMsg.FormsName='教育表单'
+              }
               this.memberList2 = this.addMsg.MemberPriceTreeList;
               this.thisType = 1;
               this.disList1 = [];

src/components/setup/AddsetupActicity.vue

@@ -2,9 +2,9 @@
   <div class="AddsetupActicity">
     <div class="form-box" style="margin-top: 0">
       <div>
-        <span style="color: rgb(64, 158, 255);cursor: pointer;margin-left: 20px" @click="cancel">套餐卡管理</span>
+        <span style="color: rgb(64, 158, 255);cursor: pointer;margin-left: 20px" @click="cancel">活动管理</span>
         <span style="margin: 0 5px;color: #C0C4CC;">/</span>
-        <span>套餐卡编辑</span>
+        <span>活动编辑</span>
       </div>
     </div>
     <div class="el-card__body" style="background-color: white; padding: 0px;margin-top: 20px">
@@ -133,7 +133,7 @@
             <el-switch :active-value="1" :inactive-value="2" v-model="msg.Enable">
             </el-switch>
           </el-form-item>
-          <el-form-item label="套餐卡描述" prop="Description">
+          <el-form-item label="活动描述" prop="Description">
             <el-input type="textarea" :rows="2" v-model="msg.Description">
             </el-input>
           </el-form-item>
@@ -275,7 +275,7 @@
           value: [{
             type: 'array',
             required: true,
-            message: '套餐卡有效期不能为空',
+            message: '活动有效期不能为空',
             trigger: 'change'
           }
 
@@ -550,7 +550,7 @@
               this.msg.EndTime = this.msg.value[1];
               this.msg.IndateDay = 0
             } else {
-              this.Error('套餐卡有效期不能为空')
+              this.Error('活动有效期不能为空')
               return false
             }