Merge branch 'dev2' into star

# Conflicts:
#	src/components/buy/activityInvite.vue

src/components/buy/activity.vue

@@ -362,10 +362,10 @@
             }
           })
         }
-
       },
       getInviteResult(){
-        getInviteResultApi().then(res=>{
+        let  id=this.$route.query.shopId;
+        getInviteResultApi({},id).then(res=>{
           this.earnings = res.earnings;
           this.userNum = res.user_num;
         });
@@ -375,8 +375,8 @@
           page: 1,
           limit: 4
         }
-        getInviteListApi(json).then(res=>{
-          console.log(res)
+        let  id=this.$route.query.shopId;
+        getInviteListApi(json,id).then(res=>{
           this.inviteList = res.list
         });
       }

src/components/buy/activityInvite.vue

-<template xmlns:v-clipboard="http://www.w3.org/1999/xhtml">
-  <div class="group-index" ref="index" v-if="groupDetail" style="background-color: #fda813;">
+<template>
+  <div class="group-index" ref="index" v-if="groupDetail" style="background-color: #59c1f1;">
     <div>
       <div class="img-cvs" id="capture" ref="imageWrapper" v-if="groupDetail.share_desc.refImg && groupDetail.share_desc.refImg.length > 0">
         <div v-if="avatar && QRCodeB" id="avatarImg">
@@ -10,7 +10,7 @@
         </div>
       </div>
       <img :src="dataURL" class="cvs-img" id="cvs-img"/>
-      
+
       <div class="inviteBtn" id="inviteBtn">
         <div class="content-text">
         <h3>长按保存海报 或发送给好友</h3>
@@ -163,7 +163,7 @@
             }
             let code = `${invite_code[0]}-${invite_code[1]}`;
             let URL = `${process.env.BUY_URL}shopId=${this.shopId}&invite_code=${code}-${this.user_id}`;
-            
+
             if(this.groupId && this.groupId !== 'null'){
               URL += `&groupId=${this.groupId}`
             }
@@ -204,7 +204,7 @@
                       }).catch(res=>{alert(res);console.log()});
                   }
                 })
-                  
+
                 },500)
 
               }else{
@@ -478,7 +478,10 @@
       text-align: left;
       font-size: 14 * @toVw;
       color: #fff;
-      background: url('../../assets/activity/red-bg.png') no-repeat center;
+      // background: url('../../assets/activity/red-bg.png') no-repeat center;
+      background: #f5c10c;
+      border-radius: 25 * @toVw;
+      box-shadow: 2px 2px 2px #888888;
       background-size: cover;
       box-sizing: border-box;
       padding: 2px 58/2*@toVw;

src/components/buy/index.vue

@@ -219,6 +219,7 @@
                       height1,
                       width1
                     } = document.getElementById('capture').getClientRects()[0];
+                    console.log(height1)
                     html2canvas(document.getElementById('capture'),{
                       async: true,
                       timeout: 500,

src/service/api.js

@@ -124,13 +124,13 @@ export const getGoodsListApi = function (json) {
 };
 //获取邀请战绩收益
 const getInviteResultUrl = `${_baseUrl}api/client/user/invite/earnings`;
-export const getInviteResultApi = function (json) {
-  return Vue.prototype.$fetch(getInviteResultUrl,json)
+export const getInviteResultApi = function (json,id) {
+  return Vue.prototype.$fetch(`${getInviteResultUrl}/${id}`,json)
 };
 //获取邀请战绩用户列表
 const getInviteListUrl = `${_baseUrl}api/client/user/invite/list`;
-export const getInviteListApi = function (json) {
-  return Vue.prototype.$fetch(getInviteListUrl,json)
+export const getInviteListApi = function (json,id) {
+  return Vue.prototype.$fetch(`${getInviteListUrl}/${id}`,json)
 };
 // 发送验证码
 const sendMobileCodeUrl = `${_baseUrl}api/client/mobile/code`;