From 6b4a426fbd1af0fb00336f8cd8042772a5bfc1b2 Mon Sep 17 00:00:00 2001
From: unknown <zheng_z@azut.cn>
Date: Thu, 22 Oct 2020 09:50:42 +0800
Subject: [PATCH] =?UTF-8?q?newProj.vue=20=E8=A7=A3=E5=86=B3=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components_web/newProj/newProj.vue | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/views/components_web/newProj/newProj.vue b/src/views/components_web/newProj/newProj.vue
index 86b9e269..4e04b995 100644
--- a/src/views/components_web/newProj/newProj.vue
+++ b/src/views/components_web/newProj/newProj.vue
@@ -107,11 +107,6 @@
                   <div class="clear"></div>
                   <div class="yiyun_col-6">
                     <div class="pageImgBox">
-<<<<<<< HEAD
-                      <img :src="coverSrc" alt="" />
-                      <file-Uploader :mutiple="false" :label="uploadLabel" :auto="true" accept="image" ref="webUploadlist"
-                        :btn-id="filePicker" :companyId="uploadCompId" :typeId="uploadTypeCover" @upload-success="coverUploadSuccess"
-=======
                       <img :src="coverSrc | resolveAvator" alt="" />
                       <!-- <file-Uploader 
                         :mutiple="false" 
@@ -573,12 +568,9 @@
 
 <script>
   import * as templateService from '@/services/template';
-<<<<<<< HEAD
   import { fetchAddressBook } from '@/services/user.js';
-=======
   import { wrapOssProtocol, getFileUrl } from "@/services/oss";
   import FileUploader from "@/components/file-uploader";
->>>>>>> 55cfdb8688760beb8662a0f24448aa896760a805
 
   export default {
     props: {
@@ -1350,7 +1342,7 @@
         // } else {
         //   this.srcIndex = 1;
         // }
-=======      // setSystemCover: function() {
+      // setSystemCover: function() {
       //   this.coverSrc = "static\\img\\faceImg\\face0" + this.srcIndex + ".png";
       //   this.newProjData.projectData.showImgUrl = this.srcIndex;
       //   if (this.srcIndex < 9) {
@@ -1359,10 +1351,11 @@
       //     this.srcIndex = 1;
       //   }
       // },
+      },
       /** 
        * 设置随机封面
       */
-
+      setSystemCoverRandom: function() {
        var temp=Math.ceil(Math.random()*10);    
        while(this.srcIndex ===temp){
          temp=Math.ceil(Math.random()*10);