合并

pages/config/config.js

@@ -0,0 +1,47 @@
+/**
+ *  Web唐明明
+ *  匆匆数载恍如梦，岁月迢迢华发增。
+ *  碌碌无为枉半生，一朝惊醒万事空。
+ */
+
+import { tabBar } from "../../lib/storeConfig"
+import { mall, video, ticket, user } from "../../lib/tabBarData"
+
+Page({
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(e) {
+        if (e.companyoid && e.companyoid == "") {
+            wx.showToast({
+                title: "参数错误，缺少companyoId"
+            })
+            return
+        }
+
+        wx.$api.publics.storeConfig({
+            company_id: e.companyoid
+        }).then(res => {
+            let tabBarVal = res.concat({})
+            tabBarVal.forEach(res => {
+                switch (res.slug) {
+                    case "video":
+                        tabBar.push(video)
+                        break;
+                    case "mall":
+                        tabBar.push(mall)
+                        break;
+                    case "ticket":
+                        tabBar.push(ticket)
+                        break;
+                    default :
+                        tabBar.push(user)
+                        break;
+                }
+            })
+            wx.switchTab({
+                url: tabBar[0].pagePath
+            })
+        })
+    }
+})

pages/config/config.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/config/config.wxml

@@ -0,0 +1,5 @@
+
+<view class="pack-center pages-loding">
+    <image src="/static/icons/loding.gif" mode="widthFix"></image>
+    <view>加载企业信息</view>
+</view>

pages/config/config.wxss

@@ -0,0 +1 @@
+/* pages/config/config.wxss */

pages/live/index.wxml

@@ -1,2 +1 @@
-<!--pages/live/index.wxml-->
-<text>pages/live/index.wxml</text>
+

pages/mall/mall_details/mall_details.js

@@ -285,8 +285,17 @@ Page({
      * 用户点击右上角分享
      */
     onShareAppMessage() {
+        console.log(this.data.storyData.cover)
         this.setData({
             shareShow: false
         })
+        return({
+            title   : "#" + this.data.storyData.title,
+            path    : '/pages/mall/mall_details/mall_details?id=' + this.data.storyData.id + '&nameList=share',
+            imageUrl: this.data.storyData.cover
+        })
+
+        // + '&share_user_id=' + app.globalData.userInfo.user_id || 0
     },
+    
 })

pages/mall/mall_details/mall_details.wxml

@@ -27,7 +27,9 @@
         <view class="goods-title-name">{{storyData.title}}</view>
         <view class="nowrap-multi goods-title-text">{{storyData.description}}</view>
     </view>
-    <view class="goodsMember">
+
+    <!-- 暂时隐藏 -->
+    <view class="goodsMember" style="display: none">
         <view class="goodsMember-name">
             <image class="goods-tips-gold" src="/static/mall_icon/mallDetails_member_grey.png"></image>开通会员，尊享会员价
         </view>
@@ -35,7 +37,8 @@
             </image>
         </view>
     </view>
-    <view class="goods-tips">
+    <!-- 暂时隐藏 -->
+    <view class="goods-tips" style="display: none">
         <image class="goods-tips-gold" src="/static/mall_icon/mallDetails_gold.png"></image>
         分享奖 <text>¥{{changeSku.prices.bonus1}}</text>
     </view>
@@ -135,10 +138,10 @@
             <image src="/static/mall_icon/mallDetails_service.png"></image>
             客服
         </navigator>
-        <navigator hover-class="none" url="/pages/mall_cart/mall_cart" class="footer-img-tool">
+        <navigator hover-class="none" url="/pages/mall/mall_cart/mall_cart" class="footer-img-tool">
             <image src="/static/mall_icon/mallDetails_car.png"></image>
             购物车
-            <text>1</text>
+            <!-- <text>1</text> -->
         </navigator>
     </view>
     <view class="footer-btn" bindtap="specsTap" wx:if="{{changeSku.prices.stock > 0}}">
@@ -270,12 +273,12 @@
             </view>
             <view class="share-list-text">微信好友</view>
         </button>
-        <button class="share-list" hover-class="none" bindtap="canvasCode">
+        <!-- <button class="share-list" hover-class="none" bindtap="canvasCode">
             <view class="share-list-img">
                 <image src="/static/mall_icon/share_pyq.png" mode="aspectFill"></image>
             </view>
             <view class="share-list-text">海报分享</view>
-        </button>
+        </button> -->
     </view>
     <view class="share-tips">好物推荐，和大家一起分享你发现的好物</view>
 </view>

pages/mall/mall_details/mall_details.wxss

@@ -476,6 +476,11 @@ view.footer-btn-buy {
     transition: .2s;
 }
 
+.couponEject {
+    max-height: 70%;
+    overflow-y: scroll;
+}
+
 .couponEject.active,
 .specsEject.active {
     bottom: 0;

pages/mall/mall_order_submit/mall_order_submit.js

@@ -129,14 +129,14 @@ Page({
                                             icon : 'success'
                                         })
                                         setTimeout(()=>{
-                                            wx.reLaunch({
+                                            wx.redirectTo({
                                                 url: '/pages/mall/mall_order/mall_order'
                                             })
                                         },2000)
                                     }
                                 },
                                 fail  : res=>{
-                                    wx.reLaunch({
+                                    wx.redirectTo({
                                         url: '/pages/mall/mall_order/mall_order?stateType=unpaid'
                                     })
                                 }

pages/shortVideo/index.wxml

@@ -1,3 +1,14 @@
+
+<view>短视频</view>
+<view>短视频</view>
+<view>短视频</view>
+<view>短视频</view>
+<view>短视频</view>
+<view>短视频</view>
+<view>短视频</view>
+<view>短视频</view>
+<navigator url="plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=4">进入直播间</navigator>
+
 <view class="videos-content">
     <swiperViode
         wx:if="{{videoList.length > 0}}"

pages/shortVideo/index.wxss

@@ -19,6 +19,7 @@
 .videos-content{
     position: relative;
     height: 100vh;
+    display: none;
 }
 
 /* 视频信息 */