Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

custom-tab-bar/index.js

@@ -2,6 +2,17 @@ const app = getApp()
 
 console.log(app, 'apppppppppp')
 Component({
+  pageLifetimes: {
+    show() {
+      console.log('哈哈哈哈')
+      if (typeof this.getTabBar === 'function' &&
+        this.getTabBar()) {
+        this.getTabBar().setData({
+          selected: 1
+        })
+      }
+    }
+  },
   data: {
     selected: 0,
     color: "#7A7E83",
@@ -65,7 +76,9 @@ Component({
     }
 
     // ----------webview 变化
-    console.log('启动1111')
+    console.log('启动1111',this.getTabBar())
+    
+
     app.webviewCallBack = function (state,params) {
       console.log('webview变化',state,params)
     }
@@ -75,27 +88,22 @@ Component({
 
     },
     switchTab(e) {
-      // mpApp.$themeToLink //
       const {
         index
       } = e.currentTarget.dataset
       console.log('755555555', this.data.list[index].link)
-      // if (index == this.data.selected) return
-
 
-      app.globalData.tabBarPageLink=this.data.list[index].link.link
 
-      console.log(app,'aaaa')
-      this.toPage(this.data.list[index].link,index)
+      app.$themeToLink(this.data.list[index]['link'],1)
 
-      // return
-      // app.$themeToLink(this.data.list[index].link)
+      // this.toPage(this.data.list[index].link,index)
         // this.setData({
         //   selected: index
         // })
     },
     toPage(data,index){
-      console.log('index98',index)
+      console.log('index98',index,this)
+      // index=index==0?index+1:index
         // 跳转
         if (data.link=='/') {
           wx.switchTab({

custom-tab-bar/index.wxml

 <!--miniprogram/custom-tab-bar/index.wxml-->
 <cover-view class="tab-bar">
+	<cover-view class="antt ant-daipinglun"></cover-view> 
+	<cover-view class="iconfont icon-fenzhi">3</cover-view> 
+
 	<cover-view class="tab-bar-border"></cover-view>
 	<cover-view wx:for="{{list}}" wx:key="index" class="tab-bar-item" data-path="{{item.link}}" data-index="{{index}}"
 		bindtap="switchTab">

custom-tab-bar/index.wxss

+@font-face {font-family: "iconfont";
+  src: url('//at.alicdn.com/t/font_1457682_3rf83d24buy.eot?t=1604541583326'); /* IE9 */
+  src: url('//at.alicdn.com/t/font_1457682_3rf83d24buy.eot?t=1604541583326#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+  url('//at.alicdn.com/t/font_1457682_3rf83d24buy.woff?t=1604541583326') format('woff'),
+  url('//at.alicdn.com/t/font_1457682_3rf83d24buy.ttf?t=1604541583326') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('//at.alicdn.com/t/font_1457682_3rf83d24buy.svg?t=1604541583326#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-tuceng1:before {
+  content: "\e692";
+}
+
+.icon-tuceng2:before {
+  content: "\e706";
+}
+
+.icon-fenzhi:before {
+  content: "\e629";
+}
+
+.icon-tuceng:before {
+  content: "\e621";
+}
+
+.icon-mokuai:before {
+  content: "\e604";
+}
+
+.icon-fengge:before {
+  content: "\e607";
+}
+
+.icon-iconfontquestion:before {
+  content: "\e60b";
+}
+
+.icon-bianji:before {
+  content: "\e637";
+}
+
+.icon-shezhi:before {
+  content: "\e781";
+}
+
+.icon-lui-dot:before {
+  content: "\e66";
+}
+
+.icon-Notvisible:before {
+  content: "\e6fe";
+}
+
+.icon-browse:before {
+  content: "\e745";
+}
+
+.icon-qingkong1:before {
+  content: "\e624";
+}
+
+.icon-zhongxin:before {
+  content: "\e68b";
+}
+
+.icon-tianjia:before {
+  content: "\e602";
+}
+
+.icon-shangchuantupian11:before {
+  content: "\c652";
+}
+
+.icon-daoru1:before {
+  content: "\e63b";
+}
+
+.icon-theme-fenxiang:before {
+  content: "\e610";
+}
+
+.icon-tuijian:before {
+  content: "\e63f";
+}
+
+.icon-huodong:before {
+  content: "\e606";
+}
+
+.icon-huodong1:before {
+  content: "\e61f";
+}
+
+.icon-tuijian1:before {
+  content: "\e620";
+}
+
+.icon-wode:before {
+  content: "\e603";
+}
+
+.icon-gouwuche:before {
+  content: "\e605";
+}
+
+.icon-fenlei1:before {
+  content: "\e649";
+}
+
+.icon-home:before {
+  content: "\e64b";
+}
+
+.icon-in_gouxuan:before {
+  content: "\e601";
+}
+
+.icon-jiahao:before {
+  content: "\e61c";
+}
+
+.icon-tupian2:before {
+  content: "\e636";
+}
+
+.icon-gonggao:before {
+  content: "\e611";
+}
+
+.icon-dazhuanpan:before {
+  content: "\e616";
+}
+
+.icon-duoxingwenben:before {
+  content: "\e7e1";
+}
+
+.icon-xianshiqianggou:before {
+  content: "\e633";
+}
+
+.icon-icon-test:before {
+  content: "\e61d";
+}
+
+.icon-liebiao:before {
+  content: "\e627";
+}
+
+.icon-article:before {
+  content: "\e7e7";
+}
+
+.icon-fengexian:before {
+  content: "\e66e";
+}
+
+.icon-lunboxiaoguo:before {
+  content: "\e675";
+}
+
+.icon-youhuiquan:before {
+  content: "\e697";
+}
+
+.icon-zixun:before {
+  content: "\e66c";
+}
+
+.icon-lianjie:before {
+  content: "\e623";
+}
+
+.icon-guanggaolianmeng:before {
+  content: "\e7dd";
+}
+
+.icon-fabu:before {
+  content: "\e600";
+}
+
+.icon-pintu:before {
+  content: "\e61e";
+}
+
+.icon-fanhui:before {
+  content: "\e60a";
+}
+
+.icon-shanchuguanbicha:before {
+  content: "\e809";
+}
+
+.icon-shanchu1:before {
+  content: "\e6d0";
+}
+
+.icon-shanchu:before {
+  content: "\e609";
+}
+
+.icon-iconset0308:before {
+  content: "\e6cf";
+}
+
+
 page {
   --main-color: #ffffff;
   --minor-color: #ffffff;

src/App.vue

@@ -53,6 +53,8 @@ export default {
 
           let defaultComponentModel = res.data.data.shopThemeData;
           this.mpApp.globalData.shopThemeData = res.data.data.shopThemeData;
+          this.mpApp.globalData.shopInfo=res.data.data;
+
           // 获取底部栏数据
           let val = JSON.parse(defaultComponentModel);
           if (val && val.defaultComponentModel) {

src/pages/home/index.vue

 <template>
   <div class="domain">
+    <view class="ant-daipinglun">1</view>
     <!-- <goods-list id="goodsList"></goods-list> -->
     <scroll-view @scroll="scrolls" @scrolltolower="scrolltolower" style="height:100vh;" scroll-y="true">
       <div v-for="(item,index) in pageData" :key="index">
@@ -24,7 +25,7 @@
       src="http://cdn.mayi888.com/public/jpg/33ff0efc-96b5-4044-a65a-07799dfe98e1.jpg?x-oss-process=image/resize,limit_1,w_750"
     ></image>
     <van-button type="primary">按钮</van-button>
-    <view class="ant-bofang">1</view> -->
+    -->
     <!-- ----瀑布流开始---- -->
     <!-- <waterfall-flow id="waterfallFlow"></waterfall-flow> -->
     <!-- ----瀑布流结束---- -->
@@ -37,6 +38,8 @@
 </template>
 
 <script>
+import { setTabBarActive, checkTabbarPage } from "../../utils/mayi.js";
+
 export default {
   data() {
     return {
@@ -54,11 +57,16 @@ export default {
       };
     }
   },
+  onShow() {
+    setTabBarActive.bind(this)(checkTabbarPage('/'));
+  },
   methods: {
     init(pageList) {
+      setTabBarActive.bind(this)(checkTabbarPage('/'));
+
       this.pageInfo = pageList.filter((item) => item.pageCode == 1)[0];
       this.pageData = JSON.parse(this.pageInfo.pageData);
-      console.log('36',this.pageData)
+      console.log("36", this.pageData);
     },
     scrolls(el){
       console.log('scroll')
@@ -73,7 +81,7 @@ export default {
 
 <style>
 .domain {
-  text-align: center;
+  /* text-align: center; */
   /* padding-top: 50%; */
 }
 </style>
\ No newline at end of file

src/pages/index/index.vue

@@ -79,15 +79,6 @@ export default {
 
     this.options = options;
     Object.assign(this.$data, this.$options.data());
-    console.log(
-      wx.getStorageSync("sessionid"),
-      options,
-      "index------",
-      this.shopId,
-      "-----",
-      wx.getStorageSync("openid"),
-      this.shopId
-    );
     //获取openId
      wx.login({
       success: res => {
@@ -109,21 +100,7 @@ export default {
     
     //检测登录态
     this.checkLogin();
-    console.log(this.params,6666666)
     this.options = options;
-    console.log('-------1',options.scene)
-    console.log(this.options)
-    console.log('-------link',this.mpApp.globalData.tabBarPageLink)
-    // tabbar 跳转
-    // if (this.mpApp.globalData.tabBarPageLink) {
-    //   this.page = this.mpApp.globalData.tabBarPageLink;
-    //   this.mpApp.globalData.tabBarPageLink=''
-    // }
-    
-    // if (options.from && options.from == "tabbar") {
-    //   this.page = decodeURIComponent(options.backpath);
-    // }
-    // ---------
     if (options.share) {
       //来自分享
       this.link = decodeURIComponent(options.share);
@@ -330,6 +307,19 @@ export default {
     }
     this.init();
   },
+  onShow(){
+    let ss=wx.getStorageSync("sessionid");
+    if (ss && !this.params.includes("sessionid")) {
+       this.params +=`&sessionid=${ss}`
+    }
+    console.log(this.getTabBar,'312')
+    if (typeof this.getTabBar === 'function' &&
+      this.getTabBar()) {
+      this.getTabBar().setData({
+        selected: this.index
+      })
+    }
+  },
   methods: {
     init() {
       // 获取小程序开启的订阅消息配置

src/pages/login/index.vue

@@ -27,12 +27,14 @@
 
 <script>
 import { serialize } from "@/utils/index";
+import { checkTabbarPage } from "@/utils/mayi";
 import { wx_decode } from "@/utils/wxIndex.js";
 import login from "@/api/login";
 import shop from "@/api/shop";
 import indexApi from "@/api/index.js";
 var WXBizDataCrypt = require("@/utils/WXBizDataCrypt");
 export default {
+  name:'login',
   components: {
     // card
   },
@@ -315,12 +317,25 @@ export default {
           delta: 1
         });
       }else{
-        wx.reLaunch({
+        let parseLink=decodeURIComponent(this.backPath);
+        let isTabbarIndex =checkTabbarPage(parseLink)
+        console.log('32111',isTabbarIndex,parseLink)
+          wx.navigateBack()
+        return
+        if(isTabbarIndex>-1){
+          wx.navigateBack()
+          // wx.switchTab({
+          //   url: parseLink == '/' ? '/pages/home/main' : `/pages/tabBar${isTabbarIndex}/main`,
+          // })
+        }else{
+          wx.redirectTo({
             url: `../index/main?from=login&backpath=${
               this.backPath
             }&params=${encodeURIComponent(this.backParams)}`
           });
         }
+
+      }
     },
     getPhoneNumber(e) {
       wx.checkSession({

src/pages/tabBar1/index.vue

@@ -3,28 +3,39 @@
 -->
 <template>
   <div>
+    {{ pageUrl }}
     <web-view :src="pageUrl" @error="handleError"></web-view>
   </div>
 </template>
 
 <script>
-import { getUrlofLink } from "../../utils/mayi.js";
+import {
+  getUrlofLink,
+  setTabBarActive,
+  checkTabbarPage,
+} from "../../utils/mayi.js";
 export default {
   data() {
     return {
       link: process.env.BASE_URL,
       page: "/",
       params: "?mixid=" + this.$store.state.mixid,
-      index:1
+      index: 1,
+      ss: "",
     };
   },
   computed: {
     pageUrl() {
-      return this.link + this.page + this.params;
+      return this.link + this.page + this.params + this.ss;
     },
   },
   onLoad(options) {
+    let ss = wx.getStorageSync("sessionid");
+    this.ss = ss ? `&sessionid=${ss}` : "";
+
     // tabbar 跳转
+    let homeIndex = checkTabbarPage("/");
+    homeIndex != 0 && homeIndex==this.index && (this.index = 0);
     if (this.mpApp.globalData.footerVal.componentData.list[this.index].link) {
       this.page = getUrlofLink(
         this.mpApp.globalData.footerVal.componentData.list[this.index].link
@@ -32,20 +43,13 @@ export default {
       this.mpApp.globalData.tabBarPageLink = "";
     }
   },
-  onShow(){
-    console.log('show')
-    if (this.mpApp.globalData.footerVal.componentData.list[this.index].link) {
-      this.page = getUrlofLink(
-        this.mpApp.globalData.footerVal.componentData.list[this.index].link
-      );
-      this.mpApp.globalData.tabBarPageLink = "";
+  onShow() {
+    let ss = wx.getStorageSync("sessionid");
+    if (!this.ss && ss) {
+      this.ss = `&sessionid=${ss}`;
     }
-    // if (typeof this.getTabBar === 'function' &&
-    //   this.getTabBar()) {
-    //   this.getTabBar().setData({
-    //     selected: 0
-    //   })
-    // }
+
+    setTabBarActive.bind(this)(this.index);
   },
   methods: {
     handleError(data) {

src/pages/tabBar2/index.vue

@@ -3,28 +3,39 @@
 -->
 <template>
   <div>
+    {{ pageUrl }}
     <web-view :src="pageUrl" @error="handleError"></web-view>
   </div>
 </template>
 
 <script>
-import { getUrlofLink } from "../../utils/mayi.js";
+import {
+  getUrlofLink,
+  setTabBarActive,
+  checkTabbarPage,
+} from "../../utils/mayi.js";
 export default {
   data() {
     return {
       link: process.env.BASE_URL,
       page: "/",
       params: "?mixid=" + this.$store.state.mixid,
-      index:2
+      index: 2,
+      ss: "",
     };
   },
   computed: {
     pageUrl() {
-      return this.link + this.page + this.params;
+      return this.link + this.page + this.params + this.ss;
     },
   },
   onLoad(options) {
+    let ss = wx.getStorageSync("sessionid");
+    this.ss = ss ? `&sessionid=${ss}` : "";
+
     // tabbar 跳转
+    let homeIndex = checkTabbarPage("/");
+    homeIndex != 0 && homeIndex==this.index && (this.index = 0);
     if (this.mpApp.globalData.footerVal.componentData.list[this.index].link) {
       this.page = getUrlofLink(
         this.mpApp.globalData.footerVal.componentData.list[this.index].link
@@ -32,14 +43,14 @@ export default {
       this.mpApp.globalData.tabBarPageLink = "";
     }
   },
-  // onShow(){
-  // if (typeof this.getTabBar === 'function' &&
-  //   this.getTabBar()) {
-  //   this.getTabBar().setData({
-  //     selected: 0
-  //   })
-  // }
-  // },
+  onShow() {
+    let ss = wx.getStorageSync("sessionid");
+    if (!this.ss && ss) {
+      this.ss = `&sessionid=${ss}`;
+    }
+
+    setTabBarActive.bind(this)(this.index);
+  },
   methods: {
     handleError(data) {
       wx.showLoading({

src/pages/tabBar3/index.vue

@@ -3,28 +3,39 @@
 -->
 <template>
   <div>
+    {{ pageUrl }}
     <web-view :src="pageUrl" @error="handleError"></web-view>
   </div>
 </template>
 
 <script>
-import { getUrlofLink } from "../../utils/mayi.js";
+import {
+  getUrlofLink,
+  setTabBarActive,
+  checkTabbarPage,
+} from "../../utils/mayi.js";
 export default {
   data() {
     return {
       link: process.env.BASE_URL,
       page: "/",
       params: "?mixid=" + this.$store.state.mixid,
-      index:3
+      index: 3,
+      ss: "",
     };
   },
   computed: {
     pageUrl() {
-      return this.link + this.page + this.params;
+      return this.link + this.page + this.params + this.ss;
     },
   },
   onLoad(options) {
+    let ss = wx.getStorageSync("sessionid");
+    this.ss = ss ? `&sessionid=${ss}` : "";
+
     // tabbar 跳转
+    let homeIndex = checkTabbarPage("/");
+    homeIndex != 0 && homeIndex==this.index && (this.index = 0);
     if (this.mpApp.globalData.footerVal.componentData.list[this.index].link) {
       this.page = getUrlofLink(
         this.mpApp.globalData.footerVal.componentData.list[this.index].link
@@ -32,14 +43,14 @@ export default {
       this.mpApp.globalData.tabBarPageLink = "";
     }
   },
-  // onShow(){
-  // if (typeof this.getTabBar === 'function' &&
-  //   this.getTabBar()) {
-  //   this.getTabBar().setData({
-  //     selected: 0
-  //   })
-  // }
-  // },
+  onShow() {
+    let ss = wx.getStorageSync("sessionid");
+    if (!this.ss && ss) {
+      this.ss = `&sessionid=${ss}`;
+    }
+
+    setTabBarActive.bind(this)(this.index);
+  },
   methods: {
     handleError(data) {
       wx.showLoading({

src/pages/tabbar4/index.vue

@@ -3,28 +3,39 @@
 -->
 <template>
   <div>
+    {{ pageUrl }}
     <web-view :src="pageUrl" @error="handleError"></web-view>
   </div>
 </template>
 
 <script>
-import { getUrlofLink } from "../../utils/mayi.js";
+import {
+  getUrlofLink,
+  setTabBarActive,
+  checkTabbarPage,
+} from "../../utils/mayi.js";
 export default {
   data() {
     return {
       link: process.env.BASE_URL,
       page: "/",
       params: "?mixid=" + this.$store.state.mixid,
-      index:4
+      index: 4,
+      ss: "",
     };
   },
   computed: {
     pageUrl() {
-      return this.link + this.page + this.params;
+      return this.link + this.page + this.params + this.ss;
     },
   },
   onLoad(options) {
+    let ss = wx.getStorageSync("sessionid");
+    this.ss = ss ? `&sessionid=${ss}` : "";
+
     // tabbar 跳转
+    let homeIndex = checkTabbarPage("/");
+    homeIndex != 0 && homeIndex==this.index && (this.index = 0);
     if (this.mpApp.globalData.footerVal.componentData.list[this.index].link) {
       this.page = getUrlofLink(
         this.mpApp.globalData.footerVal.componentData.list[this.index].link
@@ -32,14 +43,14 @@ export default {
       this.mpApp.globalData.tabBarPageLink = "";
     }
   },
-  // onShow(){
-  // if (typeof this.getTabBar === 'function' &&
-  //   this.getTabBar()) {
-  //   this.getTabBar().setData({
-  //     selected: 0
-  //   })
-  // }
-  // },
+  onShow() {
+    let ss = wx.getStorageSync("sessionid");
+    if (!this.ss && ss) {
+      this.ss = `&sessionid=${ss}`;
+    }
+
+    setTabBarActive.bind(this)(this.index);
+  },
   methods: {
     handleError(data) {
       wx.showLoading({

src/utils/mayi.js

@@ -3,13 +3,24 @@ export function getUrlofLink(data) {
     return data.link
 }
 
-// 全局跳转
-export function $themeToLink(data) {
-    let app = getApp()
-    let footerVal = app.globalData.footerVal.componentData.list;
-    console.log('393939', footerVal)
-
+// 全局跳转  data:link数据    option:是否为底部栏触发
+export function $themeToLink(data, option) {
     let type = data.type;
+
+    // 点击底部栏
+    if (option) {
+        let parseLink = getUrlofLink(data);
+        let isTabbarIndex = checkTabbarPage(parseLink);
+        // 替换首页位置
+        isTabbarIndex = isTabbarIndex == 0 ? checkTabbarPage('/') : isTabbarIndex
+        wx.switchTab({
+            url: parseLink == '/' ? '/pages/home/main' : `/pages/tabBar${isTabbarIndex}/main`,
+        })
+        console.log(option, data)
+        return
+    }
+
+
     // 历史数据
     if (type == undefined || type == 'undefined') {
         if (data.length > 0) {
@@ -17,17 +28,16 @@ export function $themeToLink(data) {
         }
         return
     }
+
     // 底部导航跳转
-    let parseLink = getUrlofLink(data)
-    let isFooter = footerVal.findIndex(item => {
-        return item.link.link == parseLink
-    })
-    if (isFooter > -1) {
-        wx.switchTab({
-            url: parseLink == '/' ? '/pages/home/main' : `/pages/tabBar${isFooter}/main`,
-        })
-        return
-    }
+    // let parseLink=getUrlofLink(data)
+    // let isTabbarIndex =checkTabbarPage(parseLink )
+    // if (isTabbarIndex>-1) {
+    //     wx.switchTab({
+    //         url: parseLink == '/' ? '/pages/home/main' : `/pages/tabBar${isTabbarIndex}/main`,
+    //     })
+    //     return
+    // }
 
 
     // -----------------
@@ -83,4 +93,26 @@ function toPage(backPath, backParams = "") {
     });
 }
 
-// check url是否为底部栏配置项
+
\ No newline at end of file
+// check 链接是否为底部导航栏页面 返回索引
+export function checkTabbarPage(link) {
+    let app = getApp()
+    if (!app.globalData.footerVal) return -1
+    let footerVal = app.globalData.footerVal.componentData.list;
+    let isFooter = footerVal.findIndex(item => {
+        return item.link.link == link
+    })
+    return isFooter
+}
+
+// 当前底部栏选中项
+export function setTabBarActive(data) {
+    console.log(this, 'this', data)
+    if (data < 0 || !this.$mp.page) return
+    if (typeof this.$mp.page.getTabBar === 'function' &&
+        this.$mp.page.getTabBar()) {
+        this.$mp.page.getTabBar().setData({
+            selected: data
+        })
+    }
+}