Merge branch 'feature/3.0维稳-卡券营销删除转增规则'

src/views/card/form.js

@@ -162,7 +162,7 @@ export default {
         useDescript: { required: true, message: '使用说明不能为空', trigger: 'blur' },
         sendDateTime: { required: true, validator: checkSendDateTime, trigger: 'change' },
         giveContent: { validator: validGiveContent, message: '请输入转赠对话框文字', trigger: 'blur' },
-        giveRule: { required: true, message: '请输入卡券转赠规则', trigger: 'blur' },
+        // giveRule: { required: true, message: '请输入卡券转赠规则', trigger: 'blur' },
         // giveImage: { required: true, message: '请上传转赠封面', trigger: 'change' },
         // bannerImage: { required: true, message: '请上传转赠页面首图', trigger: 'change' },
         bannerJumpUrl: { validator: validBannerJumpUrl, trigger: 'change' }

src/views/card/form.vue

@@ -328,9 +328,9 @@
               </span>
             </div>
           </el-form-item>
-          <el-form-item label="卡券转赠规则" prop="giveRule" v-show="form.giveFlag === 1">
+          <!-- <el-form-item label="卡券转赠规则" prop="giveRule" v-show="form.giveFlag === 1">
             <dm-input type="textarea" :disabled="isEdit || isInfo" class="autosize w400" :rows="4" :autosize="{ minRows: 4, maxRows: 8 }" v-model="form.giveRule" :byte-type="1" :maxlength="200" />
-          </el-form-item>
+          </el-form-item> -->
         </template>
       </template>
       <el-form-item prop="cardExplain" label="适用门店说明">

src/views/card/partials/send-preview.vue

@@ -44,9 +44,9 @@
                   <dt class="gray02">--<span class="fr gray03">2021.01.01 00:00:00</span></dt>
                 </dl>
                 <dl class="give-rule">
-                  <dd>转 赠 规 则</dd>
+                  <dd>使 用 说 明</dd>
                   <dt style="max-height:145px;overflow-y:auto;">
-                    <pre style="white-space: pre-wrap;word-wrap: break-word;">{{ data.giveRule }}</pre>
+                    <pre style="white-space: pre-wrap;word-wrap: break-word;">{{ data.useDescript }}</pre>
                     <!-- <div>{{ data.giveRule.slice(0, 12) }}</div>
                       <div>{{ data.giveRule.slice(12, 24) }}</div> -->
                   </dt>