Browse Source

修复小程序下载页面无法点击的问题

evoxwht 4 years atrás
parent
commit
83ad384b30

File diff suppressed because it is too large
+ 1 - 1
crmeb/public/admin/css/app.4e3f2cb4.css


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/css/chunk-00e423aa.53a6041b.css


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/css/chunk-970e2280.f8b9d7d5.css


File diff suppressed because it is too large
+ 1 - 1
crmeb/public/admin/index.html


File diff suppressed because it is too large
+ 1 - 0
crmeb/public/admin/js/app.359cb19d.js


File diff suppressed because it is too large
+ 0 - 1
crmeb/public/admin/js/app.9db51be2.js


File diff suppressed because it is too large
+ 1 - 1
crmeb/public/admin/js/chunk-970e2280.0b4f69e6.js


+ 1 - 0
template/admin/src/components/diyComponents/c_upload_img.vue

@@ -154,6 +154,7 @@ export default {
   width: 60px;
   height: 60px;
   margin-bottom: 10px;
+  background-color: #f2f2f2;
 
   img {
     width: 100%;

+ 13 - 8
template/admin/src/pages/app/routine/download/index.vue

@@ -26,7 +26,7 @@
             </div>
             <div class="content-box">
               <div class="left">小程序名称:</div>
-              <div class="right">{{ pageData.routine_name }}</div>
+              <div class="right">{{ pageData.routine_name || "未命名" }}</div>
             </div>
             <div class="content-box">
               <div class="left">小程序码:</div>
@@ -122,15 +122,20 @@ export default {
     downLoad() {
       routineDownload({
         is_live: this.is_live,
-      }).then((res) => {
-        console.log(res);
-        window.open(res.data.url, "_blank");
-      });
+      })
+        .then((res) => {
+          console.log(res);
+          window.open(res.data.url, "_blank");
+        })
+        .catch((err) => {
+          this.$Message.warning(err.msg);
+        });
     },
     downLoadCode(url) {
+      if (!url) return this.$Message.warning("暂无下载链接");
+      console.log("11111");
       var image = new Image();
       image.src = url;
-
       // 解决跨域 Canvas 污染问题
       image.setAttribute("crossOrigin", "anonymous");
       image.onload = function () {
@@ -231,9 +236,9 @@ export default {
 .mask {
   position: absolute;
   left: 0;
-  width: 100%;
   top: 0;
-  height: 100%;
+  width: 312px;
+  height: 550px;
   background-color: rgba(0, 0, 0, 0);
 }
 </style>

+ 28 - 0
template/admin/src/store/module/moren.js

@@ -28,6 +28,18 @@ export default {
                         title: '最多可添加1张图片,图片建议宽度128 * 45px',
                         url: 'http://kaifa.crmeb.net/uploads/attach/2019/10/20191023/db7b7bef9dffdedd27e9a3aa34218cea.png'
                     },
+                    titleInfo:{
+                        title:'',
+                        type: 8,
+                        list:[
+                            {
+                                title:'商城简介',
+                                val:'好物尽享 任你选择',
+                                max: 20,
+                                pla: '选填,不超过10个字'
+                            }
+                        ]
+                    },
                     hotList: {
                         title:'热词最多20个字,鼠标拖拽左侧圆点可调整热词顺序',
                         max:99,
@@ -47,6 +59,18 @@ export default {
                         title: '最多可添加1张图片,图片建议宽度128 * 45px',
                         url: 'http://kaifa.crmeb.net/uploads/attach/2019/10/20191023/db7b7bef9dffdedd27e9a3aa34218cea.png'
                     },
+                    titleInfo:{
+                        title:'',
+                        type: 8,
+                        list:[
+                            {
+                                title:'商城简介',
+                                val:'好物尽享 任你选择',
+                                max: 20,
+                                pla: '选填,不超过10个字'
+                            }
+                        ]
+                    },
                     hotList: {
                         title:'热词最多20个字,鼠标拖拽左侧圆点可调整热词顺序',
                         max:99,
@@ -1772,6 +1796,10 @@ export default {
                         components: toolCom.c_is_show,
                         configNme: 'isShow'
                     },
+                    {
+                        components: toolCom.c_input_list,
+                        configNme: 'titleInfo'
+                    },
                     {
                         components: toolCom.c_upload_img,
                         configNme: 'imgUrl'