htc пре 6 дана
родитељ
комит
93da45bf9b

+ 6 - 4
src/views/modules/activity/add.vue

@@ -153,10 +153,10 @@
                         <el-input type="number" v-model="moreForm.valueLimit" style="width: 252px;margin-left: 17px;" placeholder="请输入"></el-input>
                         <div class="f-text2">爱心值</div>
                       </div>
-                      <div v-if="moreForm.activityLimit==2" class="adfac">
+                      <!-- <div v-if="moreForm.activityLimit==2" class="adfac">
                         <el-input type="number" v-model="moreForm.valueLimit" style="width: 252px;margin-left: 17px;" placeholder="请输入"></el-input>
                         <div class="f-text2">专享券</div>
-                      </div>
+                      </div> -->
                     </div>
                   </el-form-item>
                   <el-form-item label="爱心值对应内容" v-if="moreForm.activityLimit==1">
@@ -475,8 +475,10 @@ export default {
           if (!this.basicForm.imageFiles) return this.$message.error('请上传活动详情Banner')
           if (!this.basicForm.activityDetails) return this.$message.error('请输入活动详情')
           this.tidx = 2
-          if (this.basicForm.typeId === '1977564813261750273') this.moreForm.activityLimit = 2
-          else this.moreForm.activityLimit = 1
+          if (this.basicForm.typeId === '1977564813261750273') {
+            this.moreForm.activityLimit = 2
+            this.moreForm.valueLimit = 1
+          }
         } else {
           return false
         }

+ 2 - 0
src/views/modules/member/components/activityRecord.vue

@@ -4,6 +4,8 @@
       <el-table-column prop="xxx" label="序号">
         <template slot-scope="scope">{{ scope.$index + 1 }}</template>
       </el-table-column>
+      <el-table-column prop="memberName" label="会员姓名"></el-table-column>
+      <el-table-column prop="memberAge" label="会员年龄"></el-table-column>
       <el-table-column prop="activityId" label="活动ID"></el-table-column>
       <el-table-column prop="typeName" label="活动类型"></el-table-column>
       <el-table-column prop="activityName" label="活动名称"></el-table-column>