Merge branch 'main' of https://gitea.cdlsxd.cn/damao/marketingsystem_temp_h5

src/components/base-dialog/index.scss

@@ -0,0 +1,38 @@
+.base-dialog {
+
+  overflow: initial;
+
+  .dialog-img {
+    margin-top: -38px;
+    width: 100%;
+  }
+
+  .dialog-title {
+    height: 30px;
+    text-align: center;
+    font-size: 23px;
+    font-weight: bold;
+    color: rgb(23, 23, 23);
+  }
+
+  .dialog-text {
+    height: 55px;
+    line-height: 55px;
+    text-align: center;
+    font-size: 15px;
+    color: rgb(82, 77, 77);
+    margin: 10px 0px;
+    padding: 0px 10px;
+  }
+  .dialog-btn {
+    width: 199px;
+    height: 46px;
+    text-align: center;
+    background: rgb(254, 99, 68);
+    border-radius: 23px;
+    font-size: 19px;
+    color: rgb(255, 255, 255);
+    line-height: 45px;
+    margin: auto;
+  }
+}

src/components/base-dialog/index.vue

@@ -0,0 +1,74 @@
+<template>
+  <van-dialog
+    class="base-dialog"
+    v-model:show="model"
+    :width="width"
+    :height="height"
+    :style="{ height: height }"
+    :showConfirmButton="false"
+  >
+    <img class="dialog-img" :src="imgUrl" />
+    <p class="dialog-title">{{ title }}</p>
+    <p class="dialog-text">{{ text }}</p>
+    <div class="dialog-btn">{{ confirmTxt }}</div>
+  </van-dialog>
+</template>
+<script lang="ts">
+export default {
+  name: "base-dialog",
+  props: {
+    // 弹窗显示
+    modelValue: {
+      type: Boolean,
+      default: true,
+    },
+    // 自定义图片
+    imgUrl: {
+      type: String,
+      // https://lsxdmgoss.oss-cn-chengdu.aliyuncs.com/MarketingSystem/image/front/popErr.png
+      default:
+        "https://lsxdmgoss.oss-cn-chengdu.aliyuncs.com/MarketingSystem/image/front/popNotes.png",
+    },
+    // 弹窗title
+    title: {
+      type: String,
+      default: "温馨提示",
+    },
+    // 提示文案
+    text: {
+      type: String,
+      default: "请重新进入",
+    },
+    // 关闭文案
+    confirmTxt: {
+      type: String,
+      default: "我知道了",
+    },
+    cancleTxt: {
+      type: String,
+      default: "",
+    },
+    // 弹窗宽度
+    width: {
+      type: String,
+      default: "274px",
+    },
+    // 弹窗高度
+    height: {
+      type: String,
+      default: "266px",
+    },
+  },
+  data() {
+    return {
+      model: this.modelValue,
+    };
+  },
+  created() {
+    console.log("zgpppppp");
+  },
+};
+</script>
+<style lang="scss">
+@use "./index.scss";
+</style>

src/views/pages/comProduct/index.vue

@@ -381,7 +381,6 @@ export default {
           .then(() => {
             this.copyFn(url);
           })
-          .catch(() => {})
         } else {
           // 唤起支付宝
           location.replace(url);
@@ -398,7 +397,6 @@ export default {
             .then(() => {
               this.copyFn(url);
             })
-            .catch(() => {})
           } else { // 小程序 + 通用领取
             // 唤起小程序 todo
             location.replace('https://www.baidu.com/')