Merge branch 'qiantengteng' of http://git.9026.com/xiansin/shop4.3.57 into qiantengteng

components/page-component/app-my-app/app-my-share.vue

@@ -1,5 +1,7 @@
 <template>
-    <view class="app-my-share" v-if="shareInfo.parent_id"  :style="{backgroundColor: newData.background}">
+    <view class="app-my-share" v-if="shareInfo.parent_id"
+          :class="fixed?'fixed':''"
+          :style="{backgroundColor: newData.background}">
         <view class="share-info">
             <view class="headimg">
                 <image :src="shareInfo.parent_headimg"></image>
@@ -29,7 +31,13 @@
 
             <view class="save-btn" @click="saveImg">保存二维码</view>
         </view>
-        <view class="placeholder"></view>
+    </view>
+    <view class="app-my-share" v-else
+          :class="fixed?'fixed':''"
+          :style="{backgroundColor: newData.background}">
+        <view class="share-info">
+            <text class="nickname" :style="{color:newData.color}">{{mall.name}}</text>
+        </view>
     </view>
 </template>
 <script>
@@ -44,6 +52,12 @@
                     }
                 }
             },
+            fixed: {
+              type:Boolean,
+                default(){
+                  return false;
+                }
+            },
             value: {
                 type: Object,
                 default: function() {
@@ -53,8 +67,14 @@
                     }
                 }
             },
-            homePages: {
-                type: Object|Array,
+            tabBarNavs: {
+                type: Object,
+                default() {
+                    return {};
+                }
+            },
+            mall: {
+                type: Object,
                 default() {
                     return {};
                 }
@@ -93,10 +113,7 @@
                         }
                     }
                 });
-            }
-        },
-        onLoad(){
-
+            },
         },
         computed: {
             ...mapState('mallConfig', {
@@ -107,14 +124,9 @@
             }),
             newData() {
                 let value = this.value;
-                if (typeof this.homePages.navs !== "undefined") {
-                    this.homePages.navs.forEach(item => {
-                        item.template.data.forEach(temp => {
-                            if(temp.id === 'search'){
-                                value = temp.data;
-                            }
-                        })
-                    })
+                if(this.tabBarNavs){
+                    this.value.background = this.tabBarNavs.top_background_color;
+                    this.value.top_text_color = this.tabBarNavs.top_text_color;
                 }
                 return value;
             },
@@ -129,6 +141,9 @@
         background: #ffffff;
         font-size: #{26rpx};
         padding: 40rpx #{30rpx} 0;
+        &.fixed{
+            position: fixed;
+        }
         .share-info{
             display: flex;
             align-items: center;

components/page-component/index/app-diy-page.vue

@@ -1,5 +1,5 @@
 <template>
-    <view class="app-diy-page" v-bind:class="mp_link_top ? 'mp_link_top' : ''">
+    <view class="app-diy-page" :style="shareFixed?'padding-top:124rpx':''" v-bind:class="mp_link_top ? 'mp_link_top' : ''">
         <view class="nav-bar dir-left-nowrap" v-bind:class="mp_link_top ? 'mp_link_top' : ''" v-if="newData.show_navs == 1">
             <block v-for="(nav, index) in newData.navs" :key="index">
                 <view class="nav-bar-one cross-center box-grow-0"
@@ -659,6 +659,7 @@
                 }
             },
             is_storage: Boolean,
+            shareFixed: Boolean,
             pageHide: Boolean,
             theme: String,
             coupon_req: Boolean,

components/page-component/index/app-index.vue

@@ -1,5 +1,5 @@
 <template>
-    <view class="app-index">
+    <view class="app-index" :style="shareFixed?'padding-top:124rpx':''">
         <!-- #ifdef MP-WEIXIN -->
         <template v-if="mall.setting.is_official_account == 1">
             <official-account></official-account>
@@ -197,6 +197,7 @@
                 }
             },
             is_storage: Boolean,
+            shareFixed: Boolean,
             pageHide: Boolean,
             theme: Object,
             page_id: Number,

pages/index/index.vue

@@ -2,13 +2,15 @@
     <app-layout :haveBackground="haveBackground">
         <app-my-share
                 :shareInfo="shareInfo"
-                :homePages="homePages"></app-my-share>
+                :tabBarNavs="tabBarNavs"
+                :mall="mall"
+                :fixed="shareFixed"></app-my-share>
         <app-my-app v-if="config.is_add_app == 1"></app-my-app>
         <template v-if="type === 'mall'">
-            <app-index @buyProduct="buyProduct" v-if="destroy" :page-hide="pageHide" :home-pages="homePages" :is_storage="is_storage" :theme="themeObject" :page_id="page_id" :is_required="is_required" :coupon_req="coupon_req"></app-index>
+            <app-index @buyProduct="buyProduct" v-if="destroy" :shareFixed="shareFixed" :page-hide="pageHide" :home-pages="homePages" :is_storage="is_storage" :theme="themeObject" :page_id="page_id" :is_required="is_required" :coupon_req="coupon_req"></app-index>
         </template>
         <template v-else-if="type === 'diy'">
-            <app-diy-page @buyProduct="buyProduct" v-if="destroy" :page-hide="pageHide" :home-pages="homePages" :is_storage="is_storage" :theme="getTheme" :page_id="page_id" :is_required="is_required" :coupon_req="coupon_req"></app-diy-page>
+            <app-diy-page @buyProduct="buyProduct" v-if="destroy" :shareFixed="shareFixed"  :page-hide="pageHide" :home-pages="homePages" :is_storage="is_storage" :theme="getTheme" :page_id="page_id" :is_required="is_required" :coupon_req="coupon_req"></app-diy-page>
         </template>
         <app-buy-prompt v-if="config.is_purchase_frame === `1`"></app-buy-prompt>
         <app-attr :goods="attrGoods.goods" :attrGroupList="attrGoods.goods.attr_groups" :theme="getTheme" :show="attrGoods.attrShow"></app-attr>
@@ -52,7 +54,8 @@
                     goods: {},
                     attrShow: 0
                 },
-                shareInfo:''
+                shareInfo:'',
+                shareFixed: true,
             }
         },
 
@@ -283,8 +286,7 @@
                         _this.shareInfo = response.data.identity
                     }
                 })
-            }
-
+            },
         },
         onShareAppMessage() {
             let args = {

pages/share/summary/summary.vue

@@ -59,7 +59,7 @@
                     {
                         name: '人数',
                         value: 1,
-                        desc:'人数说明',
+                        desc:'新增顾客是指自己发展客户和团队代理发展顾客；新增代理是指自己团队的代理数；团队人数是指截止结束日期团队代理的总数。',
                         listItem:[
                             {
                                 key: 'newCustomer',
@@ -81,7 +81,7 @@
                     {
                         name: '业绩',
                         value: 2,
-                        desc:'业绩说明',
+                        desc:'个人业绩是指个人购买+个人顾客购买；团队业绩是指（自己购买+自己顾客购买）+（代理B购买+代理B顾客购买）+（代理C购买+代理c顾客购买）；总业绩是指筛选结束日起，总共有多少团队业绩',
                         listItem:[
                             {
                                 key: 'selfPerformance',
@@ -103,7 +103,7 @@
                     {
                         name: '销量',
                         value: 3,
-                        desc:'销量说明',
+                        desc:'个人销量是指个人购买+个人顾客购买；团队销量是指（自己购买+自己顾客购买）+（代理B购买+代理B顾客购买）+（代理C购买+代理c顾客购买）；总销量是指筛选结束日起，总共有多少团队销量',
                         listItem:[
                             {
                                 key: 'selfSale',
@@ -125,7 +125,7 @@
                     {
                         name: '返利',
                         value: 4,
-                        desc: '返利说明',
+                        desc: '个人返利是指（自己购买+自己顾客购买）的返利；团队返利是指自己购买+自己顾客购买）的返利+（代理B购买+代理B顾客购买）的返利+（代理C购买+代理c顾客购买）的返利；总返利是指筛选结束日起，总共有多少团队返利\n',
                         listItem:[
                             {
                                 key: 'selfCash',