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

config/dev.env.js

@@ -16,8 +16,8 @@ module.exports = merge(prodEnv, {//zjgyl
   // BASE_URL:"'https://shop.mayi888.com'", 
   // BASE_URL:"'http://192.168.1.146:3005'",
   // BASE_URL:"'http://192.168.1.127:3000'",
-  // BASE_URL:"'https://test-m-shop.mayi888.cn'",
-  BASE_URL:"'http://172.16.1.48:3004'",
+  BASE_URL:"'https://test-m-shop.mayi888.cn'",
+  // BASE_URL:"'http://172.16.1.48:3004'",
 
   OLSHOP_URL:'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"',
   // OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',

custom-tab-bar/index.wxml

@@ -3,7 +3,7 @@
 	<!-- <view class="antt ant-daipinglun"></view> -->
 	<!-- <view class="iconfont icon-fenzhi">3</view> -->
 
-	<view class="tab-bar-border"></view>
+	<!-- <view class="tab-bar-border"></view> -->
 	<view
 	 wx:for="{{list}}"
 	 wx:key="index"

custom-tab-bar/index.wxss

@@ -1386,10 +1386,10 @@
   bottom: 0;
   left: 0;
   background: #f5f5f4;
-  /* border-top: 1px solid #e2e2e2; */
+  border-top: 1px solid #e2e2e2;
 }
 
-.tab-bar-border {
+/* .tab-bar-border {
   background-color: rgba(0, 0, 0, 0.33);
   position: absolute;
   left: 0;
@@ -1397,7 +1397,7 @@
   width: 100%;
   height: 1px;
   transform: scaleY(0.5);
-}
+} */
 
 .tab-bar-item {
   flex: 1;

src/pages/index/index.vue

@@ -131,7 +131,7 @@ export default {
       //来自直播详情
       this.page = decodeURIComponent(options.backpath);
       if(this.page.includes("?")){
-        this.params="&mixid=" + this.shopId;
+        this.params="&mixid=" + this.shopId+'&native=1';
       }
       options.params && (this.params += "&" + serialize(decodeURIComponent(options.params)));
         console.log(this.page,this.params)

src/pages/tabBar2/index.vue

@@ -18,7 +18,7 @@ export default {
     return {
       link: process.env.BASE_URL,
       page: "/",
-      params: "?mixid=" + this.$store.state.mixid + "&tabbar=1&native=1",
+      params: "?mixid=" + this.$store.state.mixid + "&tabbar=2&native=1",
       index: 2,
       ss: "",
     };

src/pages/tabBar3/index.vue

@@ -18,7 +18,7 @@ export default {
     return {
       link: process.env.BASE_URL,
       page: "/",
-      params: "?mixid=" + this.$store.state.mixid + "&tabbar=1&native=1",
+      params: "?mixid=" + this.$store.state.mixid + "&tabbar=3&native=1",
       index: 3,
       ss: "",
     };

src/pages/tabbar4/index.vue

@@ -18,7 +18,7 @@ export default {
     return {
       link: process.env.BASE_URL,
       page: "/",
-      params: "?mixid=" + this.$store.state.mixid + "&tabbar=1&native=1",
+      params: "?mixid=" + this.$store.state.mixid + "&tabbar=4&native=1",
       index: 4,
       ss: "",
     };