Merge branch 'coupon-v1.5.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/mobileclient into coupon-v1.5.0

* 'coupon-v1.5.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/mobileclient:
  feat:提示框新增动态按钮文字、区分关闭按钮

v1_5_0_C/modelPop.js

@@ -8,12 +8,12 @@ const modelPop = {
                     <p style='width: 1.99rem;height: 0.46rem;
                         background: #FE6344;border-radius: 0.23rem;
                         font-size: 0.19rem;color:#fff;line-height: 0.45rem;margin:auto'
-                        @click='colesFunction'
+                        @click='colesFunction(1)'
-                    >我知道了</p>
+                    >{{bottom_text}}</p>
                 </div>
                 <img v-if="status!==1" style="margin-top:0.6rem;width:0.26rem;"
                   src="http://lsxd-customcard-h5.oss-cn-hangzhou.aliyuncs.com/cardpwd/img/commimgs/close.png" alt=""
-                  @click="colesFunction()">
+                  @click="colesFunction(0)">
               </div>
             `,
   props: {
@@ -33,14 +33,19 @@ const modelPop = {
     status: {
       type: Number,
       default: 1
+    },
+    bottom_text: {
+      type: String,
+      default: "我知道了"
     }
   },
 
   methods: {
     /* 关闭 */
-    colesFunction() {
+    colesFunction(type) {
+      /* type 关闭方式 */
       this.$emit("update:show", false)
-      this.$emit("back_function")
+      this.$emit("back_function", type)
     }
   }
 }