Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/sallCenter/plugin/shopinfo.vue

 <style>
   .Useravatar-icon {
-    background: #E3E3E3;
-    border: 2px solid #fff;
     width: 80px;
     height: 80px;
     border-radius: 9999px;
     display: inline-block;
   }
-
+  .shopInfo_Btn{
+    width:120px;
+    height:52px;
+    border-radius:50px;
+    overflow: hidden;
+    float:left;
+    margin-top:15px;
+    background-size:cover;
+  }
 </style>
 <template>
   <div :class="{'active':shopinfoData.isCked}">
@@ -22,14 +28,18 @@
     <div class="diy-component-preview">
       <div class="user-info-container" flex="cross:center" style=" background-color: rgba(255,255,255,1);background-size: cover;background-position: center;padding: 50px;
        height:156px;box-shadow:0px 6px 12px 0px rgba(76,76,76,0.14);border-radius:20px;"
-        :style="'background-image: url('+getIconLink(data.backgroundPicUrl)+');'">
-        <div style="width: 100%;display:none" :style="cOutBoxStyle">
+        :style="{backgroundImage: 'url(' + getIconLink(data.backgroundPicUrl) + ')',backgroundColor:data.backgroundColor}">
+        <div style="width: 100%;" :style="cOutBoxStyle">
           <div style="width: 100%;">
-            <div :style="cAvatarBoxStyle">
-              <div class="Useravatar-icon"></div>
+            <div :style="cAvatarBoxStyle" style="float:left;">
+              <img class="Useravatar-icon" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/default_head.png" alt="">
+            </div>
+            <div style="margin-left:20px;float:left;width:65%">
+              <div :style="{color:data.fontColor}">{{data.headName}}</div>
+              <div :style="{color:data.fontColor}">{{data.headInfo}}</div>
+            </div>
+            <div class="shopInfo_Btn" :style="{backgroundImage:'url(' + getIconLink(data.bottonImg) + ')'}">
             </div>
-            <div style="color: #fff;" :style="cNameBoxStyle">{{data.headName}}</div><br />
-            <div style="color: #fff;" :style="cNameBoxStyle">{{data.headInfo}}</div>
           </div>
         </div>
       </div>

src/components/sallCenter/templateEdit.vue

@@ -1247,9 +1247,9 @@
                 headImg: "", //头像
                 headName: "赞羊小店", //用户信息
                 headInfo: "赞美生活,样样满意", //用户介绍
-                backgroundPicUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/shopinfo.jpg', //背景图片
+                backgroundPicUrl: '', //背景图片
                 backgroundColor: '#ffffff', //背景颜色      
-                bottonImg:"",//按钮图片   
+                bottonImg:"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/1598255454000_522.png",//按钮图片   
                 fontColor:"",//字体颜色
                 fontName:"",//字体
                 fontSize:12,//字体大小