[订单添加退款，签收，购物车支付]

apis/interfaces/public.js

@@ -6,8 +6,10 @@ import {req} from "../request"
 
 const richText = (key) => req({url: "single/" + key, data: {key: "string"}}) //富文本
 const getStatus = (key) => req({url: "ajax/status/" + key})  //状态查询
+const storeConfig = (data) => req({url: "wechat/mini/myComponents", data: data})  //企业工具模块配置
 
 export default({
     richText,
-    getStatus
+    getStatus,
+    storeConfig
 })

app.js

@@ -18,6 +18,13 @@ App({
 
         //挂载api方法
         wx.$api = apis
+
+        //获取模版信息
+        apis.publics.storeConfig({
+            company_id: "17"
+        }).then(res=>{
+            console.log(res)
+        })
     },
     globalData: {
         navAppInfo  : {
@@ -25,6 +32,25 @@ App({
             envVersion  : "trial",
             goodUrl     : "/pages/goods/show?goodsId=",
             cardUrl     : "/pages/card/index?cardid="
+        },
+        storeModule: {
+            selected     : 0,
+            color        : "#4e4f51",
+            selectedColor: "#0b0041",
+            list         : [
+                {
+                    "pagePath": "/pages/mall/index",
+                    "text": "商城",
+                    "iconPath": "/static/tabbar/tabbar_icon_01.png",
+                    "selectedIconPath": "/static/tabbar/tabbar_icon_show_01.png"
+                },
+                {
+                    "pagePath": "/pages/user/index",
+                    "text": "我的",
+                    "iconPath": "/static/tabbar/tabbar_icon_03.png",
+                    "selectedIconPath": "/static/tabbar/tabbar_icon_show_03.png"
+                }
+            ]
         }
     }
 })

app.json

@@ -25,6 +25,7 @@
         "pages/mall/mall_pay/mall_pay",
         "pages/mall/mall_search/mall_search",
         "pages/mall/mall_video/mall_video",
+        "pages/mall/mall_refund/mall_refund",
         "pages/live/index",
         "pages/ticket/index",
         "pages/ticket/goods/goods",
@@ -37,8 +38,7 @@
         "pages/home/beSureOrder/beSureOrder",
         "pages/home/companyMore/companyMore",
         "pages/home/projectSuccess/projectSuccess",
-        "pages/home/activeSuccess/activeSuccess",
+        "pages/home/activeSuccess/activeSuccess"
-        "pages/mall/mall_refund/mall_refund"
     ],
     "window": {
         "backgroundTextStyle": "light",

components/company/enterprise/enterprise.js

@@ -4,8 +4,8 @@ Component({
    * 组件的属性列表
    */
   properties: {
-    info:{
+    info: {
-      type:Object
+      type: Object
     }
   },
 
@@ -73,9 +73,12 @@ Component({
           break;
       }
     },
-
+    // 跳转到员工名片详情
-
+    goCard(e) {
-
+      console.log(e.currentTarget.dataset.cardid);
-
+      wx.navigateTo({
+        url: '/pages/card/index?cardid='+e.currentTarget.dataset.cardid,
+      })
+    }
   }
 })

components/company/enterprise/enterprise.wxml

@@ -35,7 +35,7 @@
   <!-- 管理层人员展示 -->
   <scroll-view class="scroll-view_H" scroll-x="true" bindscroll="scroll" style="width: 100%">
     <view class="scroll-view-item_H" wx:for='{{info.colleagues}}'>
-      <view class="enterprise_list ">
+      <view class="enterprise_list " catchtap="goCard" data-cardid='{{item.card_id}}'>
         <image class="enterprise_header" src="{{item.cover || '/static/images/company_bg4.png'}} "></image>
         <view class="enterprise_nickname">{{item.name}}</view>
         <view class="enterprise_job">{{item.job}}</view>

components/company/fengcaiInfo/fengcaiInfo.wxss

@@ -7,7 +7,7 @@
   background-color: #fff;
   box-shadow: 0 0 14rpx rgba(0, 0, 0, 0.3);
   margin-top: 20rpx;
-  padding:30rpx 30rpx 20rpx 30rpx;
+  padding:30rpx 20rpx 20rpx 20rpx;
 
 }
 .enterprise_content .content{

components/company/personalInfo/personalInfo.js

@@ -17,7 +17,12 @@ Component({
    * 组件的方法列表
    */
   methods: {
-  // 获取员工列表
+      // 跳转到员工名片详情
-  
+      goCard(e) {
+        console.log(e.currentTarget.dataset.cardid);
+        wx.navigateTo({
+          url: '/pages/card/index?cardid='+e.currentTarget.dataset.cardid,
+        })
+      }
   }
 })

components/company/personalInfo/personalInfo.wxml

@@ -1,4 +1,4 @@
-<view class="personal_list">
+<view class="personal_list" catchtap="goCard" data-cardid="{{info.card_id}}">
   <image class="personal_header" src="{{info.cover}}"></image>
   <view class='personal_left'>
     <view class="personal_nickname">{{info.name}}<span class="personal_job">({{info.job}})</span></view>

components/company/videoInfo/videoInfo.wxss

@@ -1,16 +1,21 @@
 /* 企业视频*/
-.enterprise_content{
+.enterprise_content {
-  font-size:29rpx ;
+  font-size: 29rpx;
   color: #333;
   margin: 0 30rpx;
   border-radius: 12rpx;
   background-color: #fff;
   box-shadow: 0 0 14rpx rgba(0, 0, 0, 0.3);
   margin-top: 20rpx;
-  padding:30rpx 30rpx 20rpx 30rpx;
+  padding: 30rpx 20rpx 20rpx 20rpx;
 
 }
-.enterprise_content .content{
+
+.enterprise_content video {
+  width: 100%;
+}
+
+.enterprise_content .content {
   position: relative;
   text-overflow: -o-ellipsis-lastline;
   overflow: hidden;
@@ -23,7 +28,7 @@
 }
 
 /* 播放 */
-.content .play{
+.content .play {
   background-color: rgba(0, 0, 0, 0.3);
   width: 100%;
   height: calc(100% - 10rpx);
@@ -36,7 +41,8 @@
   align-items: center;
   box-sizing: border-box;
 }
-.content .play image{
+
+.content .play image {
   width: 102rpx;
   height: 102rpx;
 }

custom-tab-bar/index.js

@@ -0,0 +1,43 @@
+
+/**
+ *  Web唐明明
+ *  匆匆数载恍如梦，岁月迢迢华发增。
+ *  碌碌无为枉半生，一朝惊醒万事空。
+ */
+
+Component({
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        selected     : getApp().globalData.storeModule.selected,
+        color        : getApp().globalData.storeModule.color,
+        selectedColor: getApp().globalData.storeModule.selectedColor,
+        list         : getApp().globalData.storeModule.list
+    },
+
+    /**
+     * 生命周期函数
+     */
+    pageLifetimes: {
+        show(){
+            console.log("获取配置信息")
+        }
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        switchTab(e) {
+            const data = e.currentTarget.dataset
+            const url  = data.path
+            wx.switchTab({
+                url
+            })
+            this.setData({
+                selected: data.index
+            })
+        }
+    }
+})

custom-tab-bar/index.json

@@ -0,0 +1,3 @@
+{
+    "component": true
+}

custom-tab-bar/index.wxml

@@ -0,0 +1,9 @@
+
+<cover-view class="tab-bar">
+    <cover-view class="tab-bar-border"></cover-view>
+    <cover-view wx:for="{{list}}" wx:key="index" class="tab-bar-item" data-path="{{item.pagePath}}"
+        data-index="{{index}}" bindtap="switchTab">
+        <cover-image src="{{selected === index ? item.selectedIconPath : item.iconPath}}"></cover-image>
+        <cover-view style="color: {{selected === index ? selectedColor : color}}">{{item.text}}</cover-view>
+    </cover-view>
+</cover-view>

custom-tab-bar/index.wxss

@@ -0,0 +1,44 @@
+
+/**
+ *  Web唐明明
+ *  匆匆数载恍如梦，岁月迢迢华发增。
+ *  碌碌无为枉半生，一朝惊醒万事空。
+ */
+
+.tab-bar {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 48px;
+    background: white;
+    display: flex;
+    padding-bottom: env(safe-area-inset-bottom);
+}
+
+.tab-bar-border {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 1px;
+    transform: scaleY(0.5);
+}
+
+.tab-bar-item {
+    flex: 1;
+    text-align: center;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+}
+
+.tab-bar-item cover-image {
+    width: 24px;
+    height: 24px;
+}
+
+.tab-bar-item cover-view {
+    font-size: 10px;
+}

pages/home/beSureOrder/beSureOrder.js

@@ -4,16 +4,19 @@ Page({
     addressList: [],
     info: '',
     remark: '',
-    crowdfund_id: ''
+    crowdfund_id: '',
+    addressDel: {},
   },
+
   onLoad(e) {
     wx.$api.companyModule.crowdfundsCreat(e.crowdfund_item_id).then(res => {
-      console.log(res);
       if (res.address.length > 0) {
         this.setData({
-          address_id: res.address[0].address_id,
           addressList: res.address,
+          addressDel: res.address[0]
         })
+        console.log(res);
+        console.log(this.data.addressDel)
       }
       this.setData({
         crowdfund_item_id: e.crowdfund_item_id,
@@ -25,6 +28,9 @@ Page({
       wx.navigateBack({})
     })
   },
+  onShow() {
+    console.log(this.data.addressDel)
+  },
   input(e) {
     this.setData({
       remark: e.detail.value
@@ -35,7 +41,7 @@ Page({
       title: '创建中...',
       mask: 'true'
     })
-    wx.$api.companyModule.crowdfundsCreatOrder(this.data.crowdfund_item_id, this.data.address_id, this.data.remark).then(res => {
+    wx.$api.companyModule.crowdfundsCreatOrder(this.data.crowdfund_item_id, this.data.addressDel.address_id, this.data.remark).then(res => {
       var data = {};
       if (res.trade_no) {
         wx.login({
@@ -76,6 +82,12 @@ Page({
     }).catch(res => {
       wx.navigateBack({})
     })
+  },
+  // 跳转到地址列表和新增地址页面
+  goAddress(){
+    wx.navigateTo({
+      url: '/pages/mall/mall_address/mall_address?type=selectAddress',
+    })
   }
 
 })

pages/home/beSureOrder/beSureOrder.wxml

@@ -1,10 +1,17 @@
 <!-- 地址信息 -->
-<view class="besure_address">
+<view class="besure_address" wx:if='{{addressDel}}' catchtap="goAddress">
   <view style="flex:1;">
-    <view class="userinfo">张冬雪 14745798066 <span class="type"> 学校 </span> <span class="moren"> 默认 </span></view>
+    <view class="userinfo">{{addressDel.name}} {{addressDel.mobile}} <span class="type" wx:if='{{false}}'> 学校 </span>
-    <view class="des">黑龙江省哈尔滨市南岗区汉水路451号省科学院研究所7楼</view>
+      <span class="moren"> 默认 </span></view>
+    <view class="des">{{addressDel.address}}</view>
   </view>
   <image class="icon_right" src="/static/images/icon_right.png" mode="widthFix" style="width:12rpx;"></image>
+  <image class="arrows-right" src="/static/mall_icon/address_back.png" mode="widthFix"></image>
+</view>
+<view wx:else class="besure_address jc_start" catchtap="goAddress">
+  添加收货地址
+  <image class="icon_right " src="/static/images/icon_right.png" mode="widthFix" style="width:13rpx;"></image>
+  <image class="arrows-right" src="/static/mall_icon/address_back.png" mode="widthFix"></image>
 </view>
 <!-- 商品信息 -->
 <view class="besure_goods">

pages/home/beSureOrder/beSureOrder.wxss

@@ -17,9 +17,10 @@
   height: 120rpx;
 }
 
-.besure_bottom .left{
+.besure_bottom .left {
   width: 160rpx;
 }
+
 .besure_now_act .left span {
   font-size: 28rpx;
   color: #333;
@@ -58,7 +59,8 @@
   border-top: solid 1rpx #f7f7f7;
 }
 
-.besure_bottom input , .besure_bottom>span {
+.besure_bottom input,
+.besure_bottom>span {
   flex: 1;
   /* margin-left: 30rpx; */
   padding-top: 4rpx;
@@ -138,6 +140,7 @@
   justify-content: space-between;
   align-items: center;
   box-sizing: border-box;
+  position: relative;
 }
 
 .besure_address .userinfo {
@@ -180,3 +183,46 @@
   font-size: 24rpx;
   padding-top: 10rpx;
 }
+
+.arrows-right {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+}
+
+.order-add-address {
+  text-align: center;
+  padding: 30rpx 0;
+  position: relative;
+}
+
+.order-add-address navigator {
+  display: inline-block;
+  background: #e92344;
+  color: white;
+  line-height: 60rpx;
+  padding: 0 30rpx;
+  margin-right: 20rpx;
+}
+
+.arrows-add {
+  text-align: center;
+  width: 100%;
+}
+
+.arrows-add-img {
+  width: 30rpx;
+  vertical-align: middle;
+  margin: -8rpx 6rpx 0 0;
+}
+
+.arrows-add {
+  width: 100%;
+  background-color: red;
+  height: 90rpx;
+}
+
+.jc_start {
+  justify-content: start;
+}

pages/home/index.js

@@ -7,17 +7,12 @@ Page({
     selectMenuId: 0, //默认是企业信息0  视频1 活动2 项目筹集3
     company_id: wx.getStorageSync('company_id'), //企业Id,
     info: '', //企业信息
+    loaded:false
   },
   onLoad(e) {
-    console.log(e)
-    if(e.id){
-      this.company(e.id)
-      wx.setStorageSync('company_id', e.id)
-    }else{
-      this.company(this.company_id)
-    }
   },
   onShow() {
+    this.company(wx.getStorageSync('company_id'))
   },
   onUnload: function () {
     wx.removeStorageSync('company_id')
@@ -65,7 +60,8 @@ Page({
     wx.$api.companyModule.company(this.data.company_id, this.data.page).then(res => {
       console.log(res)
       this.setData({
-        info: res
+        info: res,
+        loaded:true,
       })
     })
   },
@@ -77,5 +73,14 @@ Page({
     wx.makePhoneCall({
       phoneNumber: this.data.info.certification.phone,
     })
+  },
+  /**
+   * 进入商城
+   */
+  goMall(e){
+    console.log('1111')
+    wx.navigateTo({
+      url: '/pages/mall/index',
+    })
   }
 })

pages/home/index.wxml

@@ -1,45 +1,50 @@
 <!-- 公司logo及基本信息 -->
-<view class="company_info">
+<block wx:if='{{loaded}}'>
-  <image class="cop_bg" mode="widthFix" src="/static/images/company_bg4.png" alt="" />
+  <view class="company_info">
-  <view class="cop_title">{{info.base.name}}</view>
+    <image class="cop_bg" mode="widthFix" src="/static/images/company_bg4.png" alt="" />
-  <image class="cop_logo" mode="widthFix" src="{{info.base.cover || '/static/images/company_bg4.png'}}" alt="" />
+    <view class="cop_title">{{info.base.name}}</view>
-</view>
+    <image class="cop_logo" mode="widthFix" src="{{info.base.cover || '/static/images/company_bg4.png'}}" alt="" />
-
-<!-- 基本信息 -->
-<view class="cop_info">
-  <view class="cop_info_item">
-    <image src="/static/images/com_tu.png" mode="widthFix"></image>
-    <span>注册资本：<span class="newTxt">{{info.base.registered_capital||'未完善' }}元</span></span>
   </view>
-  <view class="cop_info_item">
+  <!-- 基本信息 -->
-    <image src="/static/images/com_date.png" mode="widthFix"></image>
+  <view class="cop_info">
-    <span>成立时间：<span class="newTxt">{{info.base.setup_at||'未完善' }}</span></span>
+    <view class="cop_info_item">
-  </view>
+      <image src="/static/images/com_tu.png" mode="widthFix"></image>
-  <view class="cop_info_item">
+      <span>注册资本：<span class="newTxt">{{info.base.registered_capital||'未完善' }}元</span></span>
-    <image src="/static/images/com_person.png" mode="widthFix"></image>
-    <span>企业法人：<span class="newTxt">{{info.certification.name||'未完善' }}</span></span>
-  </view>
-  <view class="cop_call_shop">
-    <view class="cop_call" catchtap="call">
-      <image src="/static/images/com_call.png" mode="widthFix" ></image>拨打电话
     </view>
-    <view class=" cop_call cop_shop">
+    <view class="cop_info_item">
-      <image src="/static/images/com_shop.png" mode="widthFix"></image>进入商城
+      <image src="/static/images/com_date.png" mode="widthFix"></image>
+      <span>成立时间：<span class="newTxt">{{info.base.setup_at||'未完善' }}</span></span>
     </view>
-    <view class=" cop_call cop_focus">
+    <view class="cop_info_item">
-      <image src="/static/images/eye.png" mode="widthFix"></image>关注企业
+      <image src="/static/images/com_person.png" mode="widthFix"></image>
+      <span>企业法人：<span class="newTxt">{{info.certification.name||'未完善' }}</span></span>
+    </view>
+    <view class="cop_call_shop">
+      <view class="cop_call" catchtap="call">
+        <image src="/static/images/com_call.png" mode="widthFix"></image>拨打电话
+      </view>
+      <view class=" cop_call cop_shop" catchtap="goMall">
+        <image src="/static/images/com_shop.png" mode="widthFix"></image>进入商城
+      </view>
+      <view class=" cop_call cop_focus">
+        <image src="/static/images/eye.png" mode="widthFix"></image>关注企业
+      </view>
     </view>
   </view>
-</view>
+</block>
 
 <!-- 滚动菜单 -->
 <view class="scroll_menu">
   <scroll-view class="scroll-view_H" scroll-x="true" bindscroll="scroll" style="width: 100%">
-    <view id="menu1" catchtap="menuSelect" data-id='0' class="scroll-view-item_H {{selectMenuId==0?'scroll_view_select':''}}">企业信息</view>
+    <view id="menu1" catchtap="menuSelect" data-id='0'
+      class="scroll-view-item_H {{selectMenuId==0?'scroll_view_select':''}}">企业信息</view>
     <!-- <view id="menu2" catchtap="menuSelect" data-id='1' class="scroll-view-item_H {{selectMenuId==1?'scroll_view_select':''}}">视频 28</view> -->
-    <view id="menu4" catchtap="menuSelect" data-id='4' class="scroll-view-item_H {{selectMenuId==4?'scroll_view_select':''}}">企业动态</view>
+    <view id="menu4" catchtap="menuSelect" data-id='4'
-    <view id="menu3" catchtap="menuSelect" data-id='2' class="scroll-view-item_H {{selectMenuId==2?'scroll_view_select':''}}">企业活动</view>
+      class="scroll-view-item_H {{selectMenuId==4?'scroll_view_select':''}}">企业动态</view>
-    <view id="menu4" catchtap="menuSelect" data-id='3' class="scroll-view-item_H {{selectMenuId==3?'scroll_view_select':''}}">项目筹集</view>
+    <view id="menu3" catchtap="menuSelect" data-id='2'
+      class="scroll-view-item_H {{selectMenuId==2?'scroll_view_select':''}}">企业活动</view>
+    <view id="menu4" catchtap="menuSelect" data-id='3'
+      class="scroll-view-item_H {{selectMenuId==3?'scroll_view_select':''}}">项目筹集</view>
   </scroll-view>
 </view>
 

pages/home/projectDetail/projectDetail.wxss

@@ -223,7 +223,8 @@ swiper {
   height: 100%;
 }
 
-.project_now_act span , .project_now_act button {
+.project_now_act span,
+.project_now_act button {
   margin-left: 60rpx;
   flex: 1;
   display: inline-block;
@@ -231,10 +232,11 @@ swiper {
   color: #fff;
   font-size: 30rpx !important;
   border-radius: 10rpx !important;
-  padding: 20rpx 100rpx ;
+  padding: 20rpx 100rpx;
   text-align: center;
   font-weight: 600;
 }
+
 .project_now_act button {
   padding: 10rpx 0 !important;
 }
@@ -378,6 +380,7 @@ swiper {
   color: #333;
   font-weight: 600;
   margin-left: 30rpx;
+  width: calc(100% - 180rpx);
 }
 
 /* 项目回报列表 */
@@ -447,7 +450,7 @@ swiper {
   color: #999;
 }
 
-.project_list .seeAll span  {
+.project_list .seeAll span {
   background-color: #378fff;
   color: #fff;
   padding: 8rpx 20rpx;
@@ -472,7 +475,7 @@ swiper {
   border-radius: 50rpx;
   background-color: #378fff;
   color: #fff;
-  margin:30rpx 20rpx;
+  margin: 30rpx 20rpx;
   font-size: 26rpx;
   text-align: center;
   width: 50%;

pages/home/projectSuccess/projectSuccess.js

@@ -1,11 +1,10 @@
-
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    info:{},//产品基本信息
+    info: {}, //产品基本信息
   },
 
   /**
@@ -30,6 +29,9 @@ Page({
       title: '您的好友邀请你一起',
       path: '/pages/companyModule/projectDetail/projectDetail?id=6',
       imageUrl: this.data.info.pictures[0]
-  }
+    }
-  }
+  },
+   /**
+    * 跳转到个人
+    */
 })

pages/shortVideo/index.js

@@ -78,7 +78,8 @@ Page({
      */
     goCompany(e) {
         wx.navigateTo({
-            url: '/pages/home/index?id=' + e.currentTarget.dataset.id,
+            url: '/pages/home/index' ,
         })
+        wx.setStorageSync('company_id', e.currentTarget.dataset.id)
     }
 })

pages/user/companyMine/companyOrder.js

@@ -0,0 +1,29 @@
+// pages/companyOrder/companyOrder.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    type: 0, //全部0  待付款1 待发货2 待收货3 退款/售后4
+  },
+
+  onLoad() {
+
+  },
+
+  /**
+   * 点击按钮触发事件
+   */
+  menuSelect: function (e) {
+    console.log(e.currentTarget.dataset.id);
+    if (this.data.type != e.currentTarget.dataset.id) {
+      this.setData({
+        type: e.currentTarget.dataset.id
+      })
+      if (e.currentTarget.dataset.id == 3) {
+        this.selectComponent('#categoryTypeList').crowdfundcategory(this.data.company_id);
+      }
+    }
+  },
+})

pages/user/companyMine/companyOrder.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "项目预购",
+  "navigationBarTextStyle": "white",
+  "navigationBarBackgroundColor": "#378fff"
+}

pages/user/companyMine/companyOrder.wxml

@@ -0,0 +1,16 @@
+<!-- 滚动菜单 -->
+<view class="scroll_menu">
+  <scroll-view class="scroll-view_H" scroll-x="true" bindscroll="scroll" style="width: 100%">
+    <view id="menu1" catchtap="menuSelect" data-id='0'
+      class="scroll-view-item_H {{type==0?'scroll_view_select':''}}">全部</view>
+    <view id="menu2" catchtap="menuSelect" data-id='1'
+      class="scroll-view-item_H {{type==1?'scroll_view_select':''}}">待付款</view>
+    <view id="menu3" catchtap="menuSelect" data-id='2'
+      class="scroll-view-item_H {{type==2?'scroll_view_select':''}}">待发货</view>
+    <view id="menu4" catchtap="menuSelect" data-id='3'
+      class="scroll-view-item_H {{type==3?'scroll_view_select':''}}">待收货</view>
+    <view id="menu4" catchtap="menuSelect" data-id='4'
+      class="scroll-view-item_H {{type==4?'scroll_view_select':''}}">退款/售后</view>
+  </scroll-view>
+</view>
+<!-- 列表 -->

pages/user/companyMine/companyOrder.wxss

@@ -0,0 +1,33 @@
+/* 滚动菜单 */
+.scroll_menu {
+  background-color: #fff;
+  box-shadow: 0 0rpx 10px rgba(0, 0, 0, 0.1);
+  font-size: 28rpx;
+}
+
+.scroll-view_H {
+  white-space: nowrap;
+  color: #000;
+}
+
+.scroll-view-item {
+  height: 90rpx;
+  line-height: 90rpx;
+}
+
+.scroll-view-item_H {
+  display: inline-block;
+  width: 22%;
+  height: 90rpx;
+  line-height: 90rpx;
+  text-align: center;
+  border-bottom: solid 4rpx #fff;
+}
+
+.scroll_view_select {
+  border-bottom: solid 4rpx #378fff;
+  color: #378fff;
+  font-weight: 600;
+}
+
+/* 列表 */

pages/user/companyMine/myActives/activeDetail/activeDetail.js

@@ -0,0 +1,109 @@
+// pages/companyModule/companyMoreVideo/companyMoreVideo.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    acted: false, //已经报名true
+    showBeSureActed: false, //显示确认弹窗
+    indicatorDots: true,
+    vertical: false,
+    autoplay: false,
+    interval: 2000,
+    duration: 500,
+    active_id: '', //活动id
+    info: '', //详情信息
+    loaded:false,
+  },
+  onLoad(e) {
+    this.setData({
+      active_id: e.id
+    })
+  },
+  onShow() {
+    this.activesDetail(this.data.active_id);
+  },
+
+  /**
+   * 现在报名
+   */
+  nowActed: function (e) {
+    console.log()
+    if (!e.currentTarget.dataset.acted) {
+      this.setData({
+        showBeSureActed: true,
+      })
+    } else {
+      wx.showToast({
+        icon: 'none',
+        title: '已报名，等待活动开始',
+      })
+    }
+  },
+  /**
+   * 关闭弹窗
+   */
+  close() {
+    this.setData({
+      showBeSureActed: false
+    })
+  },
+  /**
+   * 确认报名
+   */
+  beSure() {
+    wx.login({
+      success:res=>{
+        wx.$api.companyModule.activesEnroll(res.code,this.data.active_id).then(res => {
+          if(Number(this.data.info.price)>0){
+            var resss=JSON.parse(res);
+            console.log('可支付')
+            wx.requestPayment({
+              timeStamp: resss.timeStamp,
+              nonceStr: resss.nonceStr,
+              package: resss.package,
+              signType: 'MD5',
+              paySign: resss.paySign,
+              success:res=>{
+                this.close();
+                wx.navigateTo({
+                  url: '/pages/companyModule/activeSuccess/activeSuccess?cover='+this.data.info.pictures[0],
+                })
+              },
+              fail(res) {
+                wx.showToast({
+                  title: '支付失败',
+                })
+              }
+            })
+    
+          }else{
+            console.log('不用支付')
+            this.close();
+            wx.navigateTo({
+              url: '/pages/companyModule/activeSuccess/activeSuccess?cover='+this.data.info.pictures[0],
+            })
+          }
+        })
+      }
+    })
+  },
+  /**
+   * 获取详情
+   */
+  activesDetail() {
+    wx.$api.companyModule.activesDetail(this.data.active_id).then(res => {
+      var nodes = res.content.replace('<img', '<img style="max-width:100%;height:auto""');
+      console.log(nodes);
+      this.setData({
+        info: res,
+        content:nodes,
+        loaded:true,
+      })
+    })
+  },
+  
+
+
+})

pages/user/companyMine/myActives/activeDetail/activeDetail.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "活动详情",
+  "navigationBarTextStyle": "white",
+  "navigationBarBackgroundColor": "#378fff"
+}

pages/user/companyMine/myActives/activeDetail/activeDetail.wxml

@@ -0,0 +1,58 @@
+<block wx:if='{{loaded}}'>
+  <view class="active_content" >
+    <!-- 轮播图 -->
+    <view class="active_cover">
+      <swiper indicator-dots="{{indicatorDots}}" autoplay="{{true}}" interval="{{interval}}" duration="{{duration}}">
+        <block wx:for="{{info.pictures}}" wx:key="*this">
+          <swiper-item>
+            <view class="swiper-item {{item}}">
+              <image class="active_cover_bg" src="{{item}}" mode="aspectFill"></image>
+            </view>
+          </swiper-item>
+        </block>
+      </swiper>
+    </view>
+    <!-- 文字介绍 -->
+    <view class="active_title">{{info.title}}</view>
+    <view class="active_des">{{info.description}}</view>
+    <view class="active_line"></view>
+    <view class="active_bottom">
+      <view class="left">{{info.price > 0? '￥' + info.price:'免费'}} </view>
+      <span>报名上限：{{info.limits}}人</span>
+    </view>
+  </view>
+  <!-- 地址报名信息 -->
+  <view class="active_detail">
+    <view class="active_time">截止时间：<span>{{info.deadlined_at}}</span></view>
+    <view class="active_time">活动时间：<span>{{info.started_at}}至{{info.ended_at}}</span></view>
+    <view class="active_time">活动地点：<span>{{info.address}}
+        <!-- <image mode="widthFix"
+        src="/static/images/location.png"></image>3.2KM  -->
+      </span>
+    </view>
+    <view class="active_time">联系人电话：<span>{{info.contact}}</span></view>
+  </view>
+  <!-- 活动详情 -->
+  <view class="active_detail_html">
+    <view class="active_nav">活动详情</view>
+    <rich-text nodes="{{content}}" style="width:100%;"></rich-text>
+  </view>
+
+  <!-- 底部按钮 -->
+  <view class="active_now_act {{!info.canEnroll?'acted':''}}" catchtap="{{info.canEnroll?'nowActed':''}}" data-acted='{{acted}}'>
+    <view class="left">{{info.price> 0 ? '￥' + info.price:'免费'}} </view>
+    <span>{{!info.canEnroll?'无法报名':'立即报名'}}</span>
+  </view>
+</block>
+
+<!-- 确认弹窗 -->
+<view class="active_be_sure" wx:if='{{showBeSureActed}}'>
+  <view class="bg" catchtap="close"></view>
+  <view class="content">
+    <image class="active_cover" src="{{info.pictures[0]?info.pictures[0]:'/static/images/company_bg4.png'}}" mode="aspectFill"></image>
+    <view class="txt1">是否对该活动进行报名</view>
+    <view class="txt2">活动名称：{{info.title}}</view>
+    <view class="txt3" catchtap="beSure">确认报名</view>
+    <view class="txt4" catchtap="close">我再想想</view>
+  </view>
+</view>

pages/user/companyMine/myActives/activeDetail/activeDetail.wxss

@@ -0,0 +1,245 @@
+.active_content {
+  background-color: #fff;
+  box-sizing: border-box;
+  padding-bottom: 10rpx;
+}
+
+.active_cover {
+  width: 100%;
+  height: 300rpx;
+  position: relative;
+  overflow: hidden;
+  padding-bottom: 0;
+}
+
+.active_cover_bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 0;
+}
+
+.active_type_icon {
+  position: absolute;
+  top: 0;
+  left: 0;
+  background-color: #ffcc00;
+  color: #4a1900;
+  padding: 4rpx 20rpx;
+  border-radius: 10rpx 0 20rpx 0;
+  font-size: 24rpx;
+  z-index: 1;
+}
+
+.active_title {
+  margin-top: 30rpx;
+  padding: 0 30rpx;
+  color: #333;
+  font-weight: 600;
+  font-size: 32rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+}
+
+.active_des {
+  margin-top: 14rpx;
+  padding: 0 30rpx;
+  color: #666;
+  font-size: 24rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+}
+
+.active_time {
+  margin-top: 14rpx;
+  /* padding: 0 10rpx; */
+  color: #666;
+  font-size: 26rpx;
+  /* overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2; */
+}
+
+.active_time image {
+  width: 30rpx;
+  position: relative;
+  bottom: -6rpx;
+  right: 0;
+  margin-left: 30rpx;
+  margin-right: 4rpx;
+}
+
+.active_line {
+  margin: 20rpx 20rpx 0 20rpx;
+  border-bottom: solid 1rpx #f7f7f7;
+}
+
+.active_bottom {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  box-sizing: border-box;
+  font-size: 40rpx;
+  font-weight: 600;
+  color: #333;
+  padding: 0 30rpx;
+  margin-top: 20rpx;
+}
+
+.active_bottom span {
+  color: #999;
+  font-size: 24rpx;
+  padding-left: 10rpx;
+  font-weight: normal;
+}
+
+
+.active_detail {
+  padding: 20rpx;
+  background-color: #fff;
+  margin-top: 20rpx;
+}
+
+.active_detail_html {
+  padding: 20rpx;
+  background-color: #fff;
+  margin-top: 20rpx;
+  width: 100%;
+  box-sizing: border-box;
+  overflow: hidden;
+  padding-bottom: 150rpx;
+}
+
+.active_detail_html img{
+  width: 100%;
+}
+
+.active_nav {
+  color: #333;
+  font-weight: 600;
+  font-size: 32rpx;
+  padding-bottom: 30rpx;
+}
+
+/* 立即报名 */
+.active_now_act {
+  margin-top: 20rpx;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  box-sizing: border-box;
+  font-size: 34rpx;
+  font-weight: 600;
+  color: #333;
+  background-color: #fff;
+  padding: 20rpx 30rpx;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  height: 120rpx;
+}
+
+.active_now_act span {
+  margin-left: 60rpx;
+  flex: 1;
+  display: inline-block;
+  background-color: #378fff;
+  color: #fff;
+  font-size: 30rpx;
+  border-radius: 50rpx;
+  padding: 20rpx 100rpx;
+  text-align: center;
+  font-weight: 600;
+}
+
+.acted span {
+  background-color: #999;
+}
+
+.active_be_sure {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  box-sizing: border-box;
+  z-index: 1;
+}
+
+.active_be_sure .bg {
+  background-color: rgba(0, 0, 0, 0.6);
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 2;
+}
+
+.active_be_sure .content {
+  width: 600rpx;
+  background-color: #fff;
+  position: relative;
+  z-index: 3;
+  border-radius: 20rpx;
+  text-align: center;
+  padding-bottom: 30rpx;
+}
+
+.active_be_sure .content .active_cover {
+  width: 100%;
+  height: 360rpx;
+  border-radius: 20rpx 20rpx 0 0;
+}
+
+.active_be_sure .content .txt1 {
+  font-size: 36rpx;
+  font-weight: 600;
+  color: #333;
+  padding-top: 40rpx;
+}
+
+.active_be_sure .content .txt2 {
+  padding-top: 20rpx;
+  font-size: 24rpx;
+  color: #999;
+}
+
+.active_be_sure .content .txt3 {
+  font-size: 32rpx;
+  color: #fff;
+  background-color: #378fff;
+  font-weight: 600;
+  width: 70%;
+  margin-left:15%;
+  box-sizing: border-box;
+  padding: 20rpx 30rpx;
+  border-radius: 50rpx;
+  margin-top: 30rpx;
+}
+
+.active_be_sure .content .txt4 {
+  font-size: 26rpx;
+  color: #999;
+  padding:20rpx 30rpx;
+}
+
+img{
+  max-width: 100%;
+}

pages/user/companyMine/myActives/myActives.js

@@ -0,0 +1,75 @@
+// pages/companyOrder/companyOrder.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    state: 'unstart', //未开始 unstart  进行中start 已结束end 
+    lists: [],
+    page: 1,
+    has_more: true,
+  },
+
+  onLoad() {
+    this.userActives();
+  },
+
+  /**
+   * 点击按钮触发事件
+   */
+  menuSelect: function (e) {
+    if (this.data.state != e.currentTarget.dataset.state) {
+      wx.showLoading({
+        title: '请求中...',
+        mask: true
+      })
+      this.setData({
+        state: e.currentTarget.dataset.state,
+        page: 1,
+        lists: [],
+        has_more: true
+      })
+    }
+    this.userActives();
+  },
+  // 获取活动列表
+  userActives() {
+    wx.$api.companyModule.userActives(this.data.state, this.data.page).then(res => {
+      setTimeout(() => {
+        wx.hideLoading({})
+      }, 1000);
+      var lists = this.data.lists.concat(res.data)
+      if (res.page.has_more) {
+        this.setData({
+          has_more: res.page.has_more,
+          page: page + 1,
+          lists: lists
+        })
+      } else {
+        this.setData({
+          has_more: res.page.has_more,
+          lists: lists
+        })
+      }
+    })
+  },
+  // 触底加载更多
+  onReachBottom() {
+    console.log('触底')
+    if (this.data.has_more) {
+      this.userActives();
+    } else {
+      wx.showToast({
+        icon: 'none',
+        title: '没有更多',
+      })
+    }
+  },
+  //跳转到详情页 
+  goUrl(e) {
+    wx.navigateTo({
+      url: '/pages/companyModule/activeDetail/activeDetail?id=' + e.currentTarget.dataset.id,
+    })
+  }
+})

pages/user/companyMine/myActives/myActives.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "活动参与",
+  "navigationBarTextStyle": "white",
+  "navigationBarBackgroundColor": "#378fff"
+}

pages/user/companyMine/myActives/myActives.wxml

@@ -0,0 +1,31 @@
+<!-- 滚动菜单 -->
+<view class="scroll_menu">
+  <scroll-view class="scroll-view_H" scroll-x="true" bindscroll="scroll" style="width: 100%">
+    <view id="menu1" catchtap="menuSelect" data-state='unstart'
+      class="scroll-view-item_H {{state=='unstart'?'scroll_view_select':''}}">
+      未开始</view>
+    <view id="menu2" catchtap="menuSelect" data-state='start'
+      class="scroll-view-item_H {{state=='start'?'scroll_view_select':''}}">
+      进行中</view>
+    <view id="menu3" catchtap="menuSelect" data-state='end'
+      class="scroll-view-item_H {{state=='end'?'scroll_view_select':''}}">
+      已结束</view>
+  </scroll-view>
+</view>
+<!-- 列表 -->
+<view class="list_content" wx:for="{{lists}}">
+  <view class="fixed">最新</view>
+  <image class="left" src="{{item.active.pictures[0]}}" mode="aspectFill"></image>
+  <view class="right">
+    <view class="title">{{item.active.title}}</view>
+    <view class="money">{{item.active.price> 0 ? '￥' + item.active.price:'免费'}} <span>{{item.active.started_at}}</span>
+    </view>
+    <view class="check" catchtap="goUrl" data-id='{{item.active.active_id}}'>查看活动</view>
+  </view>
+</view>
+
+
+<view class="has_more">
+  <image wx:if='{{lists.length==0}}' src="/static/images/no_list.png" style="width:200rpx;" mode="widthFix"></image>
+  <span>{{has_more?'~ 上拉加载更多 ~':'~ 暂无更多数据 ~'}}</span>
+</view>

pages/user/companyMine/myActives/myActives.wxss

@@ -0,0 +1,133 @@
+/* 滚动菜单 */
+.scroll_menu {
+  background-color: #fff;
+  box-shadow: 0 0rpx 10px rgba(0, 0, 0, 0.1);
+  font-size: 28rpx;
+}
+
+.scroll-view_H {
+  white-space: nowrap;
+  color: #000;
+}
+
+.scroll-view-item {
+  height: 90rpx;
+  line-height: 90rpx;
+}
+
+.scroll-view-item_H {
+  display: inline-block;
+  width: 22%;
+  height: 90rpx;
+  line-height: 90rpx;
+  text-align: center;
+  border-bottom: solid 4rpx #fff;
+}
+
+.scroll_view_select {
+  border-bottom: solid 4rpx #378fff;
+  color: #378fff;
+  font-weight: 600;
+}
+
+/* 列表 */
+
+.list_content {
+  margin: 20rpx;
+  border-radius: 10rpx;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  box-sizing: border-box;
+  justify-content: center;
+  padding: 20rpx;
+  background-color: #Fff;
+  box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.2);
+  position: relative;
+}
+
+.list_content .left {
+  width: 160rpx;
+  height: 160rpx;
+  border-radius: 3rpx;
+}
+
+.list_content .right {
+  width: calc(100% - 160rpx);
+  padding: 0 0 20rpx 20rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: space-between;
+  box-sizing: border-box;
+}
+
+.list_content .right .title {
+  margin-top: 10rpx;
+  width: 100%;
+  font-size: 30rpx;
+  color: #333;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.list_content .right .money {
+  margin-top: 30rpx;
+  width: 100%;
+  font-size: 34rpx;
+  color: #000;
+  font-weight: 600;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  vertical-align: middle;
+}
+
+.list_content .right .money span {
+  color: #666;
+  font-weight: normal;
+  font-size: 24rpx;
+  margin-left: 10rpx;
+}
+
+.list_content .right .check {
+  margin-top: 10rpx;
+  font-size: 22rpx;
+  color: #fff;
+  background-color: #378fff;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  display: inline-block;
+  padding: 4rpx 20rpx;
+  border-radius: 30rpx;
+}
+
+.has_more {
+  color: #999;
+  font-size: 26rpx;
+  text-align: center;
+  padding: 30rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  box-sizing: border-box;
+  padding-top: 30rpx;
+}
+
+.has_more image {
+  margin-bottom: 30rpx;
+}
+
+.fixed {
+  position: absolute;
+  top: 36rpx;
+  left: 20rpx;
+  background-color: #ffcc00;
+  color: #4a1900;
+  border-radius: 0 20rpx 20rpx 0;
+  font-size: 20rpx;
+  padding: 2rpx 12rpx;
+}

pages/user/index.wxml

@@ -59,12 +59,12 @@
         更多服务
     </view>
     <view class="userTool-list">
-        <view class="userTool-label">
+        <navigator hover-class="none" url="/pages/user/companyMine/myActives/myActives" class="userTool-label">
             <view class="userTool-label-img">
                 <image src="/static/user_iocn/userTool_00.png"></image>
             </view>
             <text>活动参与</text>
-        </view>
+        </navigator>
         <view class="userTool-label">
             <view class="userTool-label-img">
                 <image src="/static/user_iocn/userTool_01.png"></image>