Bläddra i källkod

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-vue

朱鑫波 3 år sedan
förälder
incheckning
82ee5a4b23

+ 24 - 7
src/views/modules/Statistics/change-face/change-face.vue

@@ -46,6 +46,7 @@
                 </a-upload>
                 <p style="margin: 0;">1、请保证脸部无遮挡、光线充足</p>
                 <p style="margin: 0;">2、视频、照片中只能出现一张人脸</p>
+                <p style="margin: 0;">3、图片尺寸不能小于500*500</p>
             </a-form-model-item>
         </a-form-model>
         <div v-else-if="faceType === 'b'" class="face-right-div">
@@ -204,7 +205,6 @@ export default {
                     this.dataAllList = [];
                     this.dataSource = [];
                     this.totalAll = 0;
-                    this.$message.error(result.message);
                 }
             }).catch(error => {
                 console.log(error, 'eeee');
@@ -321,7 +321,7 @@ export default {
                     if (result.code === 0) {
                         this.handlePolicyOperationCancel();
                         this.$emit('sureface');
-                        this.$message.success('图片上传成功');
+                        this.$message.success('图片上传成功');l
                         this.confirmLoading = false;
                     }
                     else {
@@ -332,7 +332,6 @@ export default {
                         this.confirmLoading = false;
                     }
                 }).catch(error => {
-                    console.log(error, 'eeee');
                     this.confirmLoading = false;
                 });
             }
@@ -363,10 +362,28 @@ export default {
                 this.md5Result = '';
                 return;
             }
-            this.handleMd5(info);
-            this.cosUpload(info);
-            this.getBase64(info, imageUrl => {
-                this.imageUrl = imageUrl;
+            new Promise(function (resolve, reject) {
+                let width = 500;
+                let height = 500;
+                let _URL = window.URL || window.webkitURL;
+                let img = new Image();
+                img.onload = function () {
+                    let valid = img.width >= width && img.height >= height;
+                    valid ? resolve() : reject();
+                };
+                img.src = _URL.createObjectURL(info);
+            }).then(() => {
+                this.handleMd5(info);
+                this.cosUpload(info);
+                this.getBase64(info, imageUrl => {
+                    this.imageUrl = imageUrl;
+                });
+            }, () => {
+                this.$message.error('图片尺寸不能小于500*500');
+                this.imageUrl = '';
+                this.urlResult = '';
+                this.md5Result = '';
+                return Promise.reject();
             });
         },
         handleMd5(file) {

+ 19 - 2
src/views/modules/account-config/components/configuration-copy.vue

@@ -158,6 +158,23 @@
                             <a-radio-button value="CPM" disabled>展示量</a-radio-button>
                         </a-radio-group>
                     </a-form-model-item>
+                    <a-form-model-item label="下载链接" prop="adDownloadUrl">
+                        <a-input
+                            class="common-input-long"
+                            v-model="configForm.adDownloadUrl"
+                            placeholder="请输入下载链接"
+                            allow-clear
+                            @change="handleDownloadLink"
+                        />
+                    </a-form-model-item>
+                    <a-form-model-item label="应用包名" prop="adPackage">
+                        <a-input
+                            class="common-input-long"
+                            v-model="configForm.adPackage"
+                            placeholder="请输入应用包名"
+                            allow-clear
+                        />
+                    </a-form-model-item>
                     <a-form-model-item label="下载方式">
                         <a-radio-group
                             v-model="configForm.adDownloadType"
@@ -176,7 +193,7 @@
                             allow-clear
                         />
                     </a-form-model-item>
-                    <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="下载链接" prop="adDownloadUrl">
+                    <!-- <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="下载链接" prop="adDownloadUrl">
                         <a-input
                             class="common-input-long"
                             v-model="configForm.adDownloadUrl"
@@ -192,7 +209,7 @@
                             placeholder="请输入应用包名"
                             allow-clear
                         />
-                    </a-form-model-item>
+                    </a-form-model-item> -->
                     <a-form-model-item label="直达链接内容">
                         <a-input
                             class="common-input-long"

+ 21 - 2
src/views/modules/account-config/components/configuration-modal.vue

@@ -157,6 +157,25 @@
                             <a-radio-button value="CPM" disabled>展示量</a-radio-button>
                         </a-radio-group>
                     </a-form-model-item>
+                    <a-form-model-item label="下载链接" prop="adDownloadUrl">
+                        <a-input
+                            class="common-input-long"
+                            :disabled="modalTitle === 'edit'"
+                            v-model="configForm.adDownloadUrl"
+                            placeholder="请输入下载链接"
+                            allow-clear
+                            @change="handleDownloadLink"
+                        />
+                    </a-form-model-item>
+                    <a-form-model-item label="应用包名" prop="adPackage">
+                        <a-input
+                            class="common-input-long"
+                            :disabled="modalTitle === 'edit'"
+                            v-model="configForm.adPackage"
+                            placeholder="请输入应用包名"
+                            allow-clear
+                        />
+                    </a-form-model-item>
                     <a-form-model-item label="下载方式">
                         <a-radio-group
                             :disabled="modalTitle === 'edit'"
@@ -177,7 +196,7 @@
                             allow-clear
                         />
                     </a-form-model-item>
-                    <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="下载链接" prop="adDownloadUrl">
+                    <!-- <a-form-model-item v-if="configForm.adDownloadType === 'DOWNLOAD_URL'" label="下载链接" prop="adDownloadUrl">
                         <a-input
                             class="common-input-long"
                             :disabled="modalTitle === 'edit'"
@@ -195,7 +214,7 @@
                             placeholder="请输入应用包名"
                             allow-clear
                         />
-                    </a-form-model-item>
+                    </a-form-model-item> -->
                     <a-form-model-item label="直达链接内容">
                         <a-input
                             class="common-input-long"