合并

app.json

@@ -1,5 +1,7 @@
 {
     "pages": [
+        "pages/config/config",
+
         "pages/welcome/index",
         "pages/company/index",
         "pages/company/search/search",
@@ -8,6 +10,9 @@
         "pages/login/login",
         "pages/card/index",
         "pages/user/index",
+        "pages/user/companyMine/myActives/myActives",
+        "pages/user/companyMine/focusedProject/focusedProject",
+        "pages/user/companyMine/companyOrder",
         "pages/user/user_coupon/user_coupon",
         "pages/user/user_coupon_data/user_coupon_data",
         "pages/mall/index",
@@ -49,8 +54,7 @@
         "pages/home/activeSuccess/activeSuccess"
     ],
     "tabBar": {
-        "list": [
+        "list": [{
-            {
                 "pagePath": "pages/shortVideo/index",
                 "text": "视频",
                 "iconPath": "/static/tabbar/tabbar_icon_00.png",
@@ -85,6 +89,12 @@
         "navigationBarTitleText": "",
         "navigationBarTextStyle": "black"
     },
+    "plugins": {
+        "live-player-plugin": {
+            "version": "1.2.5",
+            "provider": "wx2b03c6e691cd7370"
+        }
+    },
     "style": "v2",
     "sitemapLocation": "sitemap.json"
 }

custom-tab-bar/index.js

@@ -5,7 +5,7 @@
  *  碌碌无为枉半生，一朝惊醒万事空。
  */
 
-import { mall, video, ticket, user} from "../lib/tabBarData"
+import { tabBar } from "../lib/storeConfig"
 
 Component({
     /**
@@ -15,21 +15,23 @@ Component({
         selected     : 0,
         color        : "#4e4f51",
         selectedColor: "#0b0041",
-        list         : [video, mall, ticket, user]
+        list         : []
     },
 
     /**
      * 生命周期函数
      */
-    lifetimes:{
+    attached(){
-        // attached: ()=>{
+        if(this.data.list.length <= 0 && tabBar.length > 0){
-        //     //获取模版信息
+            this.setData({
-        //     wx.$api.publics.storeConfig({
+                list: tabBar
-        //         company_id: "17"
+            })
-        //     }).then(res=>{
+        }else{
-        //         console.log(res)
+            wx.showToast({
-        //     })
+                title: "获取店铺模块信息失败",
-        // }
+                icon : "none"
+            })
+        }
     },
 
     /**

lib/storeConfig.js

@@ -0,0 +1,13 @@
+
+/**
+ *  Web唐明明
+ *  匆匆数载恍如梦，岁月迢迢华发增。
+ *  碌碌无为枉半生，一朝惊醒万事空。
+ */
+
+//  企业tabBar配置
+const tabBar = []
+
+export {
+    tabBar
+}

lib/tabBarData.js

@@ -7,7 +7,7 @@
 
 //  商城
 const mall = {
-    "pagePath": "pages/mall/index",
+    "pagePath": "/pages/mall/index",
     "text": "商城",
     "iconPath": "/static/tabbar/tabbar_icon_01.png",
     "selectedIconPath": "/static/tabbar/tabbar_icon_show_01.png"
@@ -15,7 +15,7 @@ const mall = {
 
 //  短视频
 const video = {
-    "pagePath": "pages/shortVideo/index",
+    "pagePath": "/pages/shortVideo/index",
     "text": "首页",
     "iconPath": "/static/tabbar/tabbar_icon_00.png",
     "selectedIconPath": "/static/tabbar/tabbar_icon_show_00.png"
@@ -23,7 +23,7 @@ const video = {
 
 //  优惠券
 const ticket = {
-    "pagePath": "pages/ticket/index",
+    "pagePath": "/pages/ticket/index",
     "text": "优惠",
     "iconPath": "/static/tabbar/tabbar_icon_02.png",
     "selectedIconPath": "/static/tabbar/tabbar_icon_show_02.png"
@@ -31,7 +31,7 @@ const ticket = {
 
 //  我的
 const user = {
-    "pagePath": "pages/user/index",
+    "pagePath": "/pages/user/index",
     "text": "我的",
     "iconPath": "/static/tabbar/tabbar_icon_03.png",
     "selectedIconPath": "/static/tabbar/tabbar_icon_show_03.png"
@@ -43,4 +43,3 @@ export {
     ticket,
     user
 }
-

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;
 }
 
 /* 视频信息 */

project.config.json

@@ -1,115 +0,0 @@
-{
-  "description": "项目配置文件",
-  "packOptions": {
-    "ignore": []
-  },
-  "setting": {
-    "urlCheck": true,
-    "es6": true,
-    "enhance": false,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": true,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "useMultiFrameRuntime": false,
-    "useApiHook": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "bundle": false,
-    "useIsolateContext": true,
-    "useCompilerModule": true,
-    "userConfirmedUseCompilerModuleSwitch": false,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true
-  },
-  "compileType": "miniprogram",
-  "libVersion": "2.14.0",
-  "appid": "wxd931d03dfe955254",
-  "projectname": "%E5%88%9B%E5%BB%BA%E4%B8%80%E4%B8%AA%E5%B0%8F%E7%A8%8B%E5%BA%8F",
-  "debugOptions": {
-    "hidedInDevtools": []
-  },
-  "scripts": {},
-  "isGameTourist": false,
-  "simulatorType": "wechat",
-  "simulatorPluginLibVersion": {},
-  "condition": {
-    "plugin": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": [
-        {
-          "name": "登录",
-          "pathName": "pages/login/login",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "搜索",
-          "pathName": "pages/company/search/search",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "商城",
-          "pathName": "pages/mall/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "pages/user/index",
-          "pathName": "pages/user/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "pages/user/companyMine/companyOrder",
-          "pathName": "pages/user/companyMine/companyOrder",
-          "query": "orderid=20201229132338964625",
-          "scene": null
-        },
-        {
-          "name": "pages/user/companyMine/companyOrder",
-          "pathName": "pages/user/companyMine/companyOrder",
-          "query": "orderid=20201229132338964625",
-          "scene": null
-        },
-        {
-          "name": "pages/user/companyMine/projectDetail/projectDetail",
-          "pathName": "pages/user/companyMine/projectDetail/projectDetail",
-          "query": "orderid=20201229132338964625",
-          "scene": null
-        },
-        {
-          "name": "pages/user/companyMine/refundInfo/refundInfo",
-          "pathName": "pages/user/companyMine/refundInfo/refundInfo",
-          "query": "orderid=20201229132338964625",
-          "scene": null
-        }
-      ]
-    }
-  }
-}