提交

api/stroke.js

@@ -46,8 +46,29 @@ function getStrokeList(params) {
     })
   });
 }
+// 获取议程详情
+function getStrokeDetail(params) {
+  return new Promise((resolve, reject)=>{
+    req({
+      url: `/conference/agenda/info/${params.strokeID}`,
+      success(res) {
+        if (res.code !== 0) {
+          wx.showToast({
+            title: res.message || "请稍后再试",
+            icon: "none"
+          })
+          reject(res)
+          return
+        }
+        params.success && params.success(res.data)
+        resolve(res.data)
+      }
+    })
+  });
+}
 
 export default {
   getStroke,
-  getStrokeList
+  getStrokeList,
+  getStrokeDetail
 }

pages/detail/guests.js

@@ -36,7 +36,6 @@ Page({
    */
   onLoad(options) {
     api.getGuestsDetail({id: options.id}).then(r=>{
-      console.log(r)
       this.setData({
         detail: r || {}
       })

pages/detail/guests.json

@@ -1,4 +1,5 @@
 {
+  "navigationBarTitleText": "嘉宾详情",
   "usingComponents": {
     "van-row": "@vant/weapp/row/index",
     "van-col": "@vant/weapp/col/index",

pages/detail/stroke.js

@@ -19,21 +19,18 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    console.log(options)
     const {
-      agendavideo,
-      cover,
       id
     } = options;
     this.id = id;
-    this.setData({
-      cover: decodeURIComponent(cover),
-      agendavideo: decodeURIComponent(agendavideo)
-    })
-    api.getStrokeList({
+    api.getStrokeDetail({
       strokeID: this.id
     }).then(r => {
       this.setData({
-        steps: (r || [])
+        steps: (r.details || []),
+        cover: r.agendaCover,
+        agendavideo: r.agendaVideo
       })
     })
   },

pages/guests/index.js

@@ -36,7 +36,7 @@ Page({
         }
       }
     } = e;
-    const rwidth = windowWidth * 0.5;
+    const rwidth = windowWidth * 0.3;
     const rheight = height / width * rwidth;
     const item = JSON.parse(JSON.stringify(this.data.guests_marster));
     item[index].width = rwidth;

pages/guests/index.wxss

@@ -29,10 +29,10 @@
 
 .m_phone_bg {
   display: inline-block;
-  margin: 10rpx 0 0 10rpx;
+  margin: 10rpx 0 0 20rpx;
   border-radius: 35rpx;
   line-height: 1.5em;
-  width: 350rpx;
+  width: 220rpx;
   overflow: hidden;
   background-color: var(--base-color);
   position: relative;

pages/home/home.wxss

@@ -13,7 +13,7 @@
 }
 
 .title {
-  font-size: 42rpx;
+  font-size: 52rpx;
   line-height: 52rpx;
   margin-bottom: 39rpx;
 }

pages/livePhone/index.js

@@ -16,7 +16,7 @@ Page({
       width: systemInfo.windowWidth
     },
     phone: {
-      width: (systemInfo.windowWidth - 20) / 3,
+      width: (systemInfo.windowWidth - 20) / 2,
       height: 0
     },
     tabs: [],

pages/livePhone/index.wxml

@@ -6,7 +6,7 @@
     <van-tab wx:for="{{tabs}}" wx:key="index" title="{{item.agendaName}}" name="{{item.id + ''}}"></van-tab>
   </van-tabs>
   <view style="margin-top: 1em;padding-right: 5px;">
-    <image wx:for="{{images}}" wx:key="index" bindtap="showImage" data-index="{{index}}" src="{{item.photo}}" style="{{'width:' + phone.width + 'px;height:160rpx;margin-left:5px'}}" mode="aspectFit" />  
+    <image wx:for="{{images}}" wx:key="index" bindtap="showImage" data-index="{{index}}" src="{{item.photo}}" bindload="imageLoad" data-image="phone" style="{{'width:' + phone.width + 'px;height:'+ phone.height +'px;margin-left:5px'}}" mode="aspectFit" />  
   </view>
   <van-empty wx:if="{{!images || !images.length}}" description="" />
 </view>

pages/seatNumber/index.js

@@ -29,7 +29,6 @@ Page({
    */
   onLoad(options) {
     api.getStroke().then(strokeList => {
-      console.log(strokeList)
       const sl = {}
       for (let i = 0; i < strokeList.length; i++) {
         const v = strokeList[i];

pages/service/index.js

@@ -20,7 +20,6 @@ Page({
    */
   onLoad(options) {
     api.getMeetInfo().then(r=>{
-      console.log(r)
       this.setData({
         info: r || []
       })

pages/signUp/index.js

@@ -80,7 +80,6 @@ Page({
         position
       }
     }).then(r => {
-      console.log(r)
       wx.showToast({
         title: '报名成功',
         icon: 'none'

pages/stroke/index.js

@@ -16,7 +16,8 @@ Page({
   tabChange(){},
   toPage(e) {
     const {agendavideo, cover, url, id} = e.currentTarget.dataset;
-    toNavigatePage(url +'?id=' + id + '&cover=' + cover + '&agendavideo=' + agendavideo)
+    console.log( encodeURI(cover),agendavideo)
+    toNavigatePage(url +'?id=' + id + '&agendavideo=' + agendavideo + '&cover=' + encodeURI(cover))
   },
 
   async getChannelsLive(finderUserName){

pages/stroke/index.wxml

@@ -3,13 +3,15 @@
   <van-tabs color="#ffffff" title-inactive-color="#cccccc" title-active-color="#ffffff" active="{{ active }}" bind:change="tabChange">
     <van-tab title="{{index}}" wx:for="{{meetingList}}" wx:key="index">
       <view class="meetingList">
-        <view class="van-hairline--bottom" style="padding-bottom: 15rpx;" bindtap="toPage" data-url="{{'/pages/detail/stroke'}}" data-cover="{{item.agendaCover}}" data-agendaVideo="{{item.agendaVideo}}" data-id="{{item.id}}" wx:for="{{item}}" wx:key="index">
-          <text style="margin-left: -0.5em;float: left;">· </text>
-          <view class="sh" wx:if="{{item.agendaName}}">
-            {{item.agendaName}}
+        <view class="van-hairline--bottom" style="padding-bottom: 15rpx;" wx:for="{{item}}" wx:key="index">
+          <view bindtap="toPage" data-url="{{'/pages/detail/stroke'}}" data-id="{{item.id}}">
+            <text style="margin-left: -0.5em;float: left;">· </text>
+            <view class="sh" wx:if="{{item.agendaName}}">
+              {{item.agendaName}}
+            </view>
+            <view wx:if="{{item.localTime}}">时间：{{item.localTime}}</view>
+            <view wx:if="{{item.agendaDesc}}" class="van-multi-ellipsis--l3">简介：{{item.agendaDesc}}</view>
           </view>
-          <view wx:if="{{item.localTime}}">时间：{{item.localTime}}</view>
-          <view wx:if="{{item.agendaDesc}}">简介：{{item.agendaDesc}}</view>
           <van-button wx:if="{{item.liveing}}" bingdtap="openChannels" data-channelsid="{{v.wxVideoUid}}" style="margin-top: 15rpx;" plain size="small">看直播</van-button>
           <!-- <image wx:if="{{item.agendaCover}}" style="width: 600rpx;height: 300rpx;margin-top: 15rpx;" mode="aspectFit" src="{{item.agendaCover}}" /> -->
         </view>

project.private.config.json

@@ -3,7 +3,7 @@
   "projectname": "miniprogram-1",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": true
+    "urlCheck": false
   },
   "condition": {}
 }