diff --git a/pages/cityRadar/cityRadar.js b/pages/cityRadar/cityRadar.js
index a8cccc889121c5ab9bb7970f3f3eb282a5abbf0e..22c3d44fd68da07cb2850117852a7a4b8badc0ce 100644
--- a/pages/cityRadar/cityRadar.js
+++ b/pages/cityRadar/cityRadar.js
@@ -25,7 +25,7 @@ Page({
     this.mapCtx = wx.createMapContext('myMap');
     // this.mapCtx.moveToLocation();
     this.getPosition();
-    this.chartHot();
+   
   },
   //点击地图列表上移
   moveUp(e){
@@ -157,7 +157,7 @@ Page({
           height: 450,
           extra: {
             radar: {
-              max: 30
+              max: 300
             }
           }
         });
@@ -212,6 +212,7 @@ Page({
   //切换导航
   tabCurrent(e) {
     const current = e.currentTarget.dataset.index;
+    current == 2 && this.chartHot();
     const domMove = current == '1' ? 'move1' : (current == '2' ? 'move2' : 'move3');
     this.setData({
       current: current,
diff --git a/pages/cityRadar/cityRadar.wxml b/pages/cityRadar/cityRadar.wxml
index 393da46d5b069b58095f4b0e87609960d420e971..1d4bbf18cd74abae5d4980b2e9961672a150b75c 100644
--- a/pages/cityRadar/cityRadar.wxml
+++ b/pages/cityRadar/cityRadar.wxml
@@ -9,11 +9,10 @@
   </cover-view>
 
   <view class="tabInfo">
-
-    <!-- 城市中心 -->
-    <view class="box {{ current == '1'? 'on' : '' }}">
+    <!-- 城市中心 {{ current == '2'? 'on' : '' }} -->
+    <view class="box" wx:if="{{ current == 1 }}">
       <view class="mapContent">
-        <map id="myMap" subkey="42ZBZ-AYL64-DZBUG-XXTQY-W3O25-XIFOH" bindtap="moveUp" data-one="city" style="width: 100%; height: 1200rpx;" latitude="{{latitude}}" longitude="{{longitude}}" markers="{{cityMarkers}}" show-location></map>
+        <map id="myMap" subkey="42ZBZ-AYL64-DZBUG-XXTQY-W3O25-XIFOH" bindtap="moveUp" data-one="city" style="width: 100%; height: 1089rpx;" latitude="{{latitude}}" longitude="{{longitude}}" markers="{{cityMarkers}}" show-location></map>
         <cover-view class="upPopContent {{city?'city':''}}">
           <cover-view class="header">
             <!-- <cover-image class="img" src="/path/to/icon_pause" /> -->
@@ -38,16 +37,16 @@
     </view>
 
     <!-- 美容热点 -->
-    <view class="box {{ current == '2'? 'on' : '' }}">
+    <view class="box" wx:if="{{ current == 2 }}">
       <view class="canvasBox">
         <canvas canvas-id="radarCanvas" disable-scroll="true" class="canvas"></canvas>
       </view>
     </view>
 
     <!-- 激光设备 -->
-    <view class="box {{ current == '3'? 'on' : '' }}">
+    <view class="box" wx:if="{{ current == 3 }}">
       <view class="machine">
-           <map id="machine" subkey="42ZBZ-AYL64-DZBUG-XXTQY-W3O25-XIFOH" bindtap="moveUp" data-one="machine" style="width: 100%; height: 1200rpx;" latitude="{{latitude}}" longitude="{{longitude}}" markers="{{machineMarkers}}" show-location></map>
+           <map id="machine" subkey="42ZBZ-AYL64-DZBUG-XXTQY-W3O25-XIFOH" bindtap="moveUp" data-one="machine" style="width: 100%; height: 1089rpx;" latitude="{{latitude}}" longitude="{{longitude}}" markers="{{machineMarkers}}" show-location></map>
         <cover-view class="upPopContent {{machine?'machine':''}}">
           <cover-view class="header">
             <!-- <cover-image class="img" src="/path/to/icon_pause" /> -->
diff --git a/pages/cityRadar/cityRadar.wxss b/pages/cityRadar/cityRadar.wxss
index 7d3f675d0cc056db33aece4b8ff894a1c213c911..8bebec110a466d1ab424ac0c5e3c13aaba1f0f71 100644
--- a/pages/cityRadar/cityRadar.wxss
+++ b/pages/cityRadar/cityRadar.wxss
@@ -1,6 +1,4 @@
-page {
-  overflow: hidden;
-}
+
 
 .tabTitle {
   color: #525252;
@@ -30,7 +28,7 @@ page {
 
 .curLine {
   position: absolute;
-  top: -2rpx;
+  top: 90rpx;
   width: 76rpx;
   height: 6rpx;
   border-radius: 3rpx;
@@ -38,15 +36,12 @@ page {
   transition: all 0.4s ease 0s;
   z-index: 40;
 }
-
 .curLine.move1 {
   left: 88rpx;
 }
-
 .curLine.move2 {
   left: 336rpx;
 }
-
 .curLine.move3 {
   left: 586rpx;
 }
@@ -54,23 +49,20 @@ page {
 .tabInfo {
   position: relative;
   background-color: #fff;
+  width: 750rpx;
   height: 1089rpx;
+  padding-top: 90rpx;
 }
 
 .tabInfo .box {
   position: absolute;
-  top: 0;
+  top: 90rpx;
   left: 0;
   width: 100%;
   height: 1200rpx;
-  display: none;
   background-color: #fff;
 }
 
-.tabInfo view.on {
-  display: block;
-}
-
 .mapContent, .machine {
   width: 750rpx;
 }
diff --git a/pages/doctor-goods-add-2/doctor-goods-add-2.wxml b/pages/doctor-goods-add-2/doctor-goods-add-2.wxml
index 3d6721a6dbb8c8dea3091a936f96ce944796261a..69933c5232e5c2dd3c4a0bc5d800122b24778232 100644
--- a/pages/doctor-goods-add-2/doctor-goods-add-2.wxml
+++ b/pages/doctor-goods-add-2/doctor-goods-add-2.wxml
@@ -1,7 +1,7 @@
 <!--pages/doctor-goods-add-2/doctor-goods-add-2.wxml-->
 <import src="../../wxParse/wxParse.wxml" />
 <view class="goods-add-2-t">
-  <image mode="aspectFill" src="{{goodimage?imgUrl+goodimage:'https://tyc-bj.cn/yc/api/attach/servicegood/2018/11/thumbnail_58625215ea154e73b36aaaee8f117604.png'}}" bindtap='chooseImg'></image>
+  <image mode="aspectFill" src="{{goodimage?imgUrl+goodimage: 'https://tyc-bj.cn/yc/api/attach/images/service_goods_default.png'}}" bindtap='chooseImg'></image>
   <view class="goods-add-2-t-r">
     选择项目
     <view class="goods-add-2-t-tag">
diff --git a/pages/doctor-index/doctor-index.wxss b/pages/doctor-index/doctor-index.wxss
index a590eba6a5208654ffc6a3eb34d7be45b268ad4a..a90ad24d62819694bde7e88e4a9ce56ef2580d1c 100644
--- a/pages/doctor-index/doctor-index.wxss
+++ b/pages/doctor-index/doctor-index.wxss
@@ -1,6 +1,6 @@
 /* pages/doctor-index/doctor-index.wxss */
 .doctor-index-bg{width:100%; height:320rpx;}
-.doctor-index-main{width:100%; position:absolute; top:0; left:0; overflow:hidden; margin-bottom:150rpx;}
+.doctor-index-main{width:100%; position:absolute; top:0; left:0; overflow:hidden; margin-bottom:150rpx;padding-bottom:100rpx; }
 .doctor-index-t{height:455rpx; margin:140rpx 20rpx 0; position:relative; background:#fff; border-radius:10rpx; text-align:center;overflow: visible;}
 .doctor-index-t-img{width:150rpx; height:150rpx; border-radius:50%; position:absolute; top:-75rpx; left:50%; margin-left:-75rpx;}
 .doctor-index-t-1{font-size:32rpx; font-weight:600; padding:90rpx 0 20rpx;}
diff --git a/pages/doctor-login/doctor-login.js b/pages/doctor-login/doctor-login.js
index 41d8f76fb7b0af26bdc46f510997a6c94d855403..086a7ae8d167178e793310cd77b53b71634266ce 100644
--- a/pages/doctor-login/doctor-login.js
+++ b/pages/doctor-login/doctor-login.js
@@ -153,7 +153,7 @@ Page({
     // var roleType = wx.getStorageSync('roleType');
     var userInfo = wx.getStorageSync('userInfo');
     var openid = wx.getStorageSync('openid');
-    //var openid = '555555EMwzMt9jz66ku2ntjT3fqI'
+    // var openid = '555555EMwzMt9jz66ku2ntjT3fqI'
     console.log('openid:', openid);
     var loginjudge = wx.getStorageSync('loginjudge');
     console.log('loginjudge:', loginjudge);
diff --git a/pages/doctor-my-course/doctor-my-course.js b/pages/doctor-my-course/doctor-my-course.js
index c441280206acddf6afaaf515b7172e72d5a99aed..5521c00d28eff267349918281e865eb6ca6aa850 100644
--- a/pages/doctor-my-course/doctor-my-course.js
+++ b/pages/doctor-my-course/doctor-my-course.js
@@ -6,90 +6,55 @@ Page({
    * 页面的初始数据
    */
   data: {
-    doctorId: "",//医生id
-    pagesize: '',//显示多少行
-    page: '',//页数
+    doctorId: '',      // 医生id
+    pagesize: '',      // 显示多少行
+    page: '',          // 页数
     imgUrl: app.globalData.imgUrl, //请求接口图片路径
-    kecheng:"",
+    list: '',
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    var that = this;
-    // 个人信息
-    console.log('-----------------------------------');
-    console.log(that.data.imgUrl);
-    console.log('-----------------------------------');
-    wx.request({
-      url: app.globalData.baseUrl + '/doctor/doctor/getDoctorCourse',
-      data: {
-        doctorId: wx.getStorageSync('userid'),
-        pagesize: 5,
-        page: 0,
-      },
-      method: 'POST',
-      header: {
-        'sign': app.globalData.sign,
-        'token': app.globalData.token,
-        'content-type': 'application/x-www-form-urlencoded;charset=utf-8',
-      },
+    this.getCourseList();
+  
+  },
+
+  // 获取课程列表
+  getCourseList(){
+    const that = this;
+    const param = {
+      doctorId: wx.getStorageSync('userid'),
+      pagesize: 5,
+      page: 0
+    };
+    app.request({
+      url: "/doctor/doctor/getDoctorCourse",
+      data: param,
       success: function (res) {
-        console.log("课程详情", res.data.data);
         that.setData({
-          'kecheng': res.data.data
+          list: res.data
         });
+      },
+      fail: function (res) {
+        // app.requestFail(res);
       }
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
+    });
+  },
+
+  //进入详情
+  entryCourse(e){
+    const id = e.currentTarget.dataset.id;
+    const classify = e.currentTarget.dataset.classify;
+    const obj = {
+      id,
+      classify
+    }
+    wx.navigateTo({
+      url: "../doctor-train-details/doctor-train-details?obj=" + JSON.stringify(obj)
+    });
+    
   }
+
 })
\ No newline at end of file
diff --git a/pages/doctor-my-course/doctor-my-course.wxml b/pages/doctor-my-course/doctor-my-course.wxml
index 1d101c768f0d2d895e0938691026b61625ad2af9..e099bdaa8f9ff4dac54807841bd97b919d1ea846 100644
--- a/pages/doctor-my-course/doctor-my-course.wxml
+++ b/pages/doctor-my-course/doctor-my-course.wxml
@@ -1,17 +1,17 @@
 <!--pages/doctor-my-course/doctor-my-course.wxml-->
-<block wx:if="{{kecheng != ''}}">
+<block wx:if="{{ list != '' }}">
   <view class="shop-goods-list-2">
-    <view class="addys" wx:for="{{kecheng}}">
-      <image mode="widthFix" src="{{imgUrl}}{{item.imgPath}}"></image>
+    <view class="addys" wx:for="{{ list }}" data-id="{{ item.courseId }}" data-classify="courseId"  catchtap='entryCourse'>
+      <image mode="widthFix" src="{{ imgUrl+item.imgPath }}"></image>
       <view class="shop-goods-list-2-r">
-        <view class="shop-goods-list-2-r-t">{{item.courseName}}
+        <view class="shop-goods-list-2-r-t">{{ item.courseName }}
           <view>
-            <text>{{item.classNums}}课时</text>
+            <text>{{ item.classNums }}课时</text>
           </view>
         </view>
         <view class="shop-goods-list-2-r-d">
-          ￥{{item.price}}
-          <view>已售：{{item.sales}}</view>
+          ￥{{ item.price }}
+          <view>已售：{{ item.sales }}</view>
         </view>
       </view>
     </view>
diff --git a/pages/doctor-my-follow/doctor-my-follow.js b/pages/doctor-my-follow/doctor-my-follow.js
index c9f3e766f5cae7fb8eacbd90ec85bf77b42daf38..9b5ef1ebdbdb022cfdc296181348a5e3c25febbf 100644
--- a/pages/doctor-my-follow/doctor-my-follow.js
+++ b/pages/doctor-my-follow/doctor-my-follow.js
@@ -7,9 +7,9 @@ Page({
    */
   data: {
 
-    pagesize: 10,//显示多少行
-    page: 1,//页数
-    shoucang:"",//收藏列表
+    pagesize: 10,       // 显示多少行
+    page: 1,            // 页数
+    shoucang:"",        // 收藏列表
     imgUrl: "https://tyc-bj.cn/yc/api/attach/",
     shoucang:"",
   },
@@ -69,63 +69,26 @@ Page({
       success: function (res) {
         console.log("取消收藏", res.data);
         that.shoucang();
-       
       }
     })
   },
 
 
-//收藏详情跳转
-  // tiao: function(e){
-
-  // },
- 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function() {
-
+  // 收藏详情跳转
+  entery: function(e){
+    let classify;
+    const id = e.currentTarget.dataset.id;
+    const classifies = e.currentTarget.dataset.classify;
+    if (classifies == "学术活动") { classify = 'activityId';}
+    if (classifies == "品牌项目") { classify = 'itemId'; }
+    if (classifies == "学术频道") { classify = 'academicId'; }
+    const obj = {
+      id,
+      classify
+    }
+    wx.navigateTo({
+      url: "../doctor-train-details/doctor-train-details?obj=" + JSON.stringify(obj)
+    });
   }
+
 })
\ No newline at end of file
diff --git a/pages/doctor-my-follow/doctor-my-follow.wxml b/pages/doctor-my-follow/doctor-my-follow.wxml
index 49f4fefd518125b9a54e8af211396832ba2445d6..01af217a71efdefa64b576fe6130a401559bdba6 100644
--- a/pages/doctor-my-follow/doctor-my-follow.wxml
+++ b/pages/doctor-my-follow/doctor-my-follow.wxml
@@ -1,12 +1,12 @@
 <!--pages/doctor-my-follow/doctor-my-follow.wxml-->
 <block wx:if="{{shoucang != ''}}">
   <view class="shop-goods-list-2" wx:for="{{shoucang}}" wx:key="index">
-    <view class="addys">
+    <view class="addys" data-id="{{ item.id }}" data-classify="{{ item.collectTypeStr }}" catchtap='entery'>
       <image mode="widthFix" src="{{imgUrl}}{{item.imgPath}}"></image>
       <view class="shop-goods-list-2-r">
-        <view class="shop-goods-list-2-r-t">{{item.collectName}}</view>
+        <view class="shop-goods-list-2-r-t">{{ item.collectName }}</view>
         <view class="shop-goods-list-2-r-d">
-          {{item.collectTypeStr}}
+          {{ item.collectTypeStr }}
         </view>
       </view>
       <!-- <text bindtap='qxsc'>取消收藏</text> -->
diff --git a/pages/doctor-my-follow/doctor-my-follow.wxss b/pages/doctor-my-follow/doctor-my-follow.wxss
index c41daddd211fc9d7c6b27b9d897e5ae0fd4c45ce..890e619898875c94d398b9bf3575eaf8c82d28e3 100644
--- a/pages/doctor-my-follow/doctor-my-follow.wxss
+++ b/pages/doctor-my-follow/doctor-my-follow.wxss
@@ -3,7 +3,13 @@
 .shop-goods-list-2 .addys{overflow:hidden; border-bottom:1px solid #e6e6e6; padding:30rpx 0;}
 .shop-goods-list-2 .addys image{width:170rpx; height:170rpx; float:left;}
 .shop-goods-list-2-r{width:calc(100% - 190rpx); height:170rpx; float:right; position:relative;}
-.shop-goods-list-2-r-t{font-size:30rpx;}
+.shop-goods-list-2-r-t{
+  font-size:30rpx;
+  width: 420rpx;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
+}
 .shop-goods-list-2-r-d{width:100%; font-size:24rpx; color:#c089fb; position:absolute; bottom:10rpx; left:0; overflow:hidden;}
 .shop-goods-list-2-r-d view{float:right; color:#b8b8b8; font-size:24rpx; margin-top:8rpx;}
 
diff --git a/pages/doctor-train-details-video/doctor-train-details-video.js b/pages/doctor-train-details-video/doctor-train-details-video.js
index 181391e4311cb9431a6c78236503a0d996a5affd..f132f3e30843aef9c6e7a87d04f8488afc64e0db 100644
--- a/pages/doctor-train-details-video/doctor-train-details-video.js
+++ b/pages/doctor-train-details-video/doctor-train-details-video.js
@@ -5,14 +5,16 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    path:''
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    this.setData({
+      path: options.path
+    })
   },
 
   /**
diff --git a/pages/doctor-train-details-video/doctor-train-details-video.wxml b/pages/doctor-train-details-video/doctor-train-details-video.wxml
index 8b6e070c2fc5396463d0c792b0b800805bef2796..bdcbbfb7de2e85366e74ad6681530c6841ffbf56 100644
--- a/pages/doctor-train-details-video/doctor-train-details-video.wxml
+++ b/pages/doctor-train-details-video/doctor-train-details-video.wxml
@@ -1,2 +1,4 @@
 <!--pages/doctor-train-details-video/doctor-train-details-video.wxml-->
-<image mode="widthFix" style="width:100%;" src="https://tyc-bj.cn/yc/api/attach/images/my-movie.jpg"></image>
+<view class="container">
+  <video src="{{ path }}"></video>
+</view>
diff --git a/pages/doctor-train-details-video/doctor-train-details-video.wxss b/pages/doctor-train-details-video/doctor-train-details-video.wxss
index c8d7c2d80480674d4f8148569c06ed30899a9a53..e7a40e72d1cceed218658f18c69b076469427b7a 100644
--- a/pages/doctor-train-details-video/doctor-train-details-video.wxss
+++ b/pages/doctor-train-details-video/doctor-train-details-video.wxss
@@ -1 +1,14 @@
-/* pages/doctor-train-details-video/doctor-train-details-video.wxss */
\ No newline at end of file
+/* pages/doctor-train-details-video/doctor-train-details-video.wxss */
+page{
+  background-color: #000;
+}
+.container{
+  position: relative;
+  height:1200rpx;
+}
+video{
+  width: 100%;
+  position: absolute;
+  top:50%;
+  transform: translateY(-50%);
+}
\ No newline at end of file
diff --git a/pages/doctor-train-details/doctor-train-details.js b/pages/doctor-train-details/doctor-train-details.js
index 15be45a8d4efc108e6dbf2238af1542d795e7d3a..b6b61905480965b2c01e9ef0a74ca09d160ec57c 100644
--- a/pages/doctor-train-details/doctor-train-details.js
+++ b/pages/doctor-train-details/doctor-train-details.js
@@ -10,12 +10,12 @@ Page({
     datail: {},
     time: '',
     name: '',
-    current: 1,
-    courseList: [],
-    page: 1, // 当前页数
-    pagesize: 10, // 每页条数
-    id: ''
-
+    current: 1,       // 课程tab切换
+    courseList: [],   // 课程视频列表
+    page: 1,          // 当前页数
+    pagesize: 10,     // 每页条数
+    id: '',
+    status: '200'         // 200是201否收藏
   },
 
   /**
@@ -25,6 +25,7 @@ Page({
     app.showLoading();
     const that = this;
     const obj = JSON.parse(options.obj);
+    console.log(obj)
     const name = obj.classify;
     let param = {};
     param[name] = obj.id;
@@ -84,13 +85,16 @@ Page({
       url: "doctor/doctor/collectTrain",
       data: param,
       success: function(res) {
-        if (res.status_code == "200") {
-          wx.showToast({
-            title: '收藏成功',
-            icon: 'success',
-            duration: 2000
-          })
-        }
+        that.setData({
+          status: res.data
+        })
+        wx.showToast({
+          title: res.message,
+          icon: 'success',
+          duration: 2000
+        })
+      
+
       },
       fail: function(res) {
         // app.requestFail(res);
@@ -112,7 +116,6 @@ Page({
         let data = res.data
         for (let i = 0; i < data.length; i++) {
           data[i].createTime = app.timeData(data[i].createTime)
-
         }
         that.setData({
           courseList: data
@@ -150,10 +153,7 @@ Page({
       }
     });
   },
-  //收藏
-  shoucang: function(e) {
 
-  },
   //传订单id
   postOrderid(id) {
     let param = {
@@ -186,6 +186,20 @@ Page({
     });
   },
 
+
+  //听课
+  entryVideo(e){
+    if (this.data.detail.isBuy == 2 && this.data.detail.isFree == 1){
+      app.showModal("请您先购买此课程")
+      return
+    }
+
+    const path = e.currentTarget.dataset.path;
+    wx.navigateTo({
+      url: "../doctor-train-details-video/doctor-train-details-video?path=" + path 
+    });
+  },
+
   // 分享
   onShareAppMessage: function() {
     return {
@@ -211,5 +225,7 @@ Page({
         })
       }
     }
+
   }
+
 })
\ No newline at end of file
diff --git a/pages/doctor-train-details/doctor-train-details.wxml b/pages/doctor-train-details/doctor-train-details.wxml
index e2a362f15fce19682aed0ded0586fb8b70bf887e..a24cfdc6919134f38a6aa6d1eae59bf00249ec85 100644
--- a/pages/doctor-train-details/doctor-train-details.wxml
+++ b/pages/doctor-train-details/doctor-train-details.wxml
@@ -1,26 +1,31 @@
 <!-- 学术活动 -->
 <view class="content activity" wx:if="{{'activityId' == name}}">
   <view class="title">{{ detail.activityTheme }}</view>
-  <view class="collectTrain" catchtap='collectTrain' data-type='1' data-id="{{ detail.activityId }}">收藏</view>
-  <view class="takeMan">主讲人：{{ detail.activityHoster }}</view>
+  <view class="posBox">
+    <view class="takeMan">主讲人：{{ detail.activityHoster }}</view>
+    <view wx:if="{{ status == 201 }}" class="collectTrain" catchtap='collectTrain' data-type='1' data-id="{{ detail.activityId }}">收藏</view>
+    <view wx:else class="collectTrain" catchtap='collectTrain' data-type='1' data-id="{{ detail.activityId }}">已收藏</view>
+  </view>
   <view class="activityTime">活动日期：{{ time }} {{ detail.activityTime }}</view>
   <block wx:for="{{ detail.pics }}" wx:key="*this">
     <image mode="widthFix" src="{{ imgBase + item }}" style="width:100%;"></image>
   </block>
   <view class="article">{{ detail.contents }}</view>
-  <view class="text-right">活动主办单位：{{ detail.activityUnit }}</view>
-  <view class="text-right">报名人数：{{ detail.applicationNums||'--' }}</view>
-  <view class="adress text-right">{{ detail.activityAdress }}</view>
-  <view class="text-right">{{ detail.activityUnit||'--' }}</view>
+  <view class="text-right" wx:if="{{ detail.activityUnit }}">活动主办单位：{{ detail.activityUnit }}</view>
+  <view class="text-right" wx:if="{{ detail.applicationNums }}">报名人数：{{ detail.applicationNums }}</view>
+  <view class="adress text-right" wx:if="{{ detail.activityAdress }}">{{ detail.activityAdress}}</view>
+
 
 </view>
 
 <!-- 品牌项目 -->
 <view class="content item" wx:if="{{ 'itemId' == name}}">
   <view class="title">{{ detail.itemName }}</view>
-  <view class="collectTrain" catchtap='collectTrain' data-type='2' data-id="{{ detail.itemId}}">收藏</view>
-  <view class="title">{{ detail.brandName }}</view>
-  <view>浏览数量：{{ detail.scanNums||'--'}} </view>
+  <view class="posBox">
+    <view class="company">{{ detail.brandName }}</view>
+    <view class="collectTrain" catchtap='collectTrain' data-type='2' data-id="{{ detail.itemId}}">收藏</view>
+  </view>
+  <view wx:if="{{ detail.scanNums }}">浏览数量：{{ detail.scanNums}} </view>
   <view>{{ time }}</view>
   <block wx:for="{{ detail.pics }}" wx:key="*this">
     <image mode="widthFix" src="{{ imgBase + item }}" style="width:100%;"></image>
@@ -30,8 +35,8 @@
 
 <!-- 学院课程 -->
 <view class="content course" wx:if="{{ 'courseId' == name}}">
-  <!-- <image class="header_bg" mode="scaleToFill" src="{{ imgBase + item }}"></image> -->
-  <image class="header_bg" mode="scaleToFill" src="https://tyc-bj.cn/yc/api/attach/train/activity/2018/11/thumbnail_a22a5a71fc744fe08f42fc0273d0f62c.jpg"></image>
+  <image class="header_bg" mode="scaleToFill" src="{{ imgBase + detail.coursePhoto }}"></image>
+ 
   <view class="tabContent">
     <view class="tabNav">
       <view class="{{ current == '1'? 'cur' : '' }}" catchtap="tabCurrent" data-index="1">课程介绍</view>
@@ -47,9 +52,9 @@
               <view class="clr-8">{{ detail.classNums||'--' }}课时</view>
               <!-- <view class="clr-8">{{ detail.classNums||'--' }}课时 | 每节{{}}分钟</view> -->
             </view>
-            <view>时间：{{ time }}</view>
-            <view class="article">{{ detail.courseContent }}</view>
-            <view class="article">{{ detail.doctorContent }}</view>
+            <view class="courseTime">时间：{{ time }}</view>
+            <view wx:if="{{ detail.courseContent }}" class="article">{{ detail.courseContent }}</view>
+            <view wx:if="{{ detail.doctorContent }}" class="article">{{ detail.doctorContent }}</view>
             <block wx:for="{{ detail.doctorPics }}" wx:key="*this">
               <image mode="widthFix" src="{{ imgBase + item }}" style="width:100%;"></image>
             </block>
@@ -65,7 +70,7 @@
                 <view class="name">{{ item.videoName }}</view>
                 <view class="time">{{ item.createTime }}</view>
               </view>
-              <view class="sure" data-id="{{ item.videoId }}" catchtap="entryVideo">听课</view>
+              <view class="sure" data-path="{{ item.videoPath }}" catchtap="entryVideo" >听课</view>
             </view>
           </view>
           
@@ -74,14 +79,17 @@
     </view>
     
   </view>
-  
-  
-  <view class="bottom">
+
+  <view class="bottom" wx:if="{{ detail.isFree == 1 }}">
     <view class="price">全课程：
       <text class="newPrice">￥{{ detail.coursePrice }}</text>
       <text class="oldPrice">￥{{ detail.salePrice }}</text>
     </view>
-    <view class="btn" catchtap="pay">付费报名</view>
+    <view class="btn" wx:if="{{ detail.isBuy == 2 }}" catchtap="pay">付费报名</view>
+    <view class="btn" wx:if="{{ detail.isBuy == 1 }}" >已购买</view>
+  </view>
+  <view class="bottom"  wx:if="{{ detail.isFree == 2 }}">
+    <view class="purchased" >免费</view>
   </view>
 
 
@@ -90,8 +98,11 @@
 <!-- 学术频道 -->
 <view class="content academic" wx:if="{{'academicId' == name}}">
   <view class="title">{{ detail.academicName }}</view>
-  <view class="collectTrain" catchtap='collectTrain' data-type='3' data-id="{{ detail.academicId }}">收藏</view>
-  <view>作者：{{ detail.author }}</view>
+  <view class="posBox">
+    <view>作者：{{ detail.author }}</view>
+    <view class="collectTrain" catchtap='collectTrain' data-type='3' data-id="{{ detail.academicId }}">收藏</view>
+  </view>
+  
   <block wx:for="{{ detail.picPath }}" wx:key="*this">
     <image mode="widthFix" src="{{ imgBase + item }}" style="width:100%;"></image>
   </block>
diff --git a/pages/doctor-train-details/doctor-train-details.wxss b/pages/doctor-train-details/doctor-train-details.wxss
index e1712a0cb82cae475ba625538b2a26ad1b34ef92..e770a3a0189d45b400474b2ceb44a0557e8b442f 100644
--- a/pages/doctor-train-details/doctor-train-details.wxss
+++ b/pages/doctor-train-details/doctor-train-details.wxss
@@ -2,7 +2,7 @@
 page{
   background:#fff;
 }
-.content{
+.posBox{
   position: relative;
 }
 .activity,.item,.academic{
@@ -29,15 +29,24 @@ page{
   font-size: 32rpx;
   color:#333;
 }
+.company{
+  width: 500rpx;
+  font-size: 30rpx;
+  color:#333;
+}
 .time{
   text-align: right;
   margin-right: 20rpx;
 }
+.courseTime{
+  line-height: 50rpx;
+}
 .article{
    text-indent:2em;
    font-size: 28rpx;
    color:#666;
-   margin-bottom: 20rpx;
+   margin-bottom: 10rpx;
+   line-height: 50rpx;
 }
 #myVideo{
   width: 100%;
@@ -98,6 +107,7 @@ page{
 .scroll-view-item{
   padding: 0 30rpx;
   margin-top: 20rpx;
+  padding-bottom: 100rpx;
 }
 .course .item{
   height:157rpx;
@@ -111,24 +121,27 @@ page{
 .no{
   text-align: center;
   line-height: 44rpx;
-  width: 56rpx;
+  width: 40rpx;
   height:44rpx;
   background: url('https://tyc-bj.cn/yc/api/attach/images/num_icon.png') no-repeat;
   background-size: 40rpx 44rpx;
 }
 .indor{
-  width:100%;
+  width: 300rpx;
   display: flex;
   flex-direction: column;
-  height:82rpx;
   justify-content: space-between;
+  height:82rpx;
   border-left:1px solid #eee;
   padding-left: 30rpx;
-  margin-left: 30rpx;
 }
 .indor .name{
   font-size: 30rpx;
   color:#111;
+  width: 260rpx;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
 }
 .indor .time{
   text-align: left;
@@ -192,13 +205,22 @@ page{
   text-align: center;
   line-height: 98rpx;
 }
+.purchased{
+  width: 100%;
+  height:100%;
+  background-color: #9e46fa;
+  color:#fff;
+  font-size: 27rpx;
+  text-align: center;
+  line-height: 98rpx;
+}
 .academic image{
   margin-top: 40rpx;
 }
 .collectTrain{
   position: absolute;
-  top:124rpx;
-  right: 34rpx;
+  top:0;
+  right: 30rpx;
   width: 130rpx;
   height:54rpx;
   border:1px solid #9e46fa;
diff --git a/pages/doctor-train-list/doctor-train-list.wxml b/pages/doctor-train-list/doctor-train-list.wxml
index 405489ef92077d444e1d7b7565d24feb8d876dde..a551a5211fe832a2bf791f2a5cd24d54ba0ad7ce 100644
--- a/pages/doctor-train-list/doctor-train-list.wxml
+++ b/pages/doctor-train-list/doctor-train-list.wxml
@@ -8,8 +8,8 @@
             <view class="name">{{ item.activityTheme }}</view>
             <view class="infor">
               <text>浏览量：20</text>
-              <text class="bd-lf"></text>
-              <text>赞：20</text>
+              <!-- <text class="bd-lf"></text>
+              <text>赞：20</text> -->
             </view>
           </view>
         </view>
@@ -21,8 +21,8 @@
             <view class="name">{{ item.itemName }}</view>
             <view class="infor">
               <text>浏览量：20</text>
-              <text class="bd-lf"></text>
-              <text>赞：20</text>
+              <!-- <text class="bd-lf"></text>
+              <text>赞：20</text> -->
             </view>
           </view>
         </view>
@@ -33,9 +33,10 @@
           <view class="introduction">
             <view class="name">{{ item.courseName }}</view>
             <view class="infor">
-              <text>原价：{{ item.coursePrice }}</text>
-              <text class="bd-lf"></text>
-              <text>现价：{{ item.salePrice }}</text>
+              <text class="delLine">原价：{{ item.coursePrice }}</text>
+              <!-- <text class="bd-lf"></text>
+              <text>现价：{{ item.salePrice }}</text> -->
+              <text>现价：{{ item.coursePrice }}</text>
             </view>
           </view>
         </view>
@@ -47,8 +48,8 @@
             <view class="name">{{ item.academicName }}</view>
             <view class="infor">
               <text>浏览量：20</text>
-              <text class="bd-lf"></text>
-              <text>赞：20</text>
+              <!-- <text class="bd-lf"></text>
+              <text>赞：20</text> -->
             </view>
           </view>
         </view>
diff --git a/pages/doctor-train-list/doctor-train-list.wxss b/pages/doctor-train-list/doctor-train-list.wxss
index 082b8c84bcfd8af40fdbbabec887649e289b15cc..472367f9c54dc6e3528c34e88d2a10f217c8d447 100644
--- a/pages/doctor-train-list/doctor-train-list.wxss
+++ b/pages/doctor-train-list/doctor-train-list.wxss
@@ -42,3 +42,7 @@ page{
   height:26rpx;
   background-color:  #eaeaea;
 }
+.delLine{
+  text-decoration: line-through ;
+  margin-right: 16rpx;
+}
diff --git a/pages/doctor-train/doctor-train.js b/pages/doctor-train/doctor-train.js
index 8a0f2f8b4a5f6d5e5dc4a257124c3ee2b517b12f..38f484584aaa1d32c2b57da6caa7ac0de5ee6026 100644
--- a/pages/doctor-train/doctor-train.js
+++ b/pages/doctor-train/doctor-train.js
@@ -44,6 +44,23 @@ Page({
       }
     });
   },
+  //进入轮播详情
+  entryDetail(e){
+    let classify;
+    const type = e.currentTarget.dataset.type;
+    const id = e.currentTarget.dataset.id;
+    if (type == 3) { classify = 'academicId' }
+    if (type == 4) { classify = 'activityId' }
+    if (type == 5) { classify = 'itemId' }
+    if (type == 6) { classify = 'courseId' }
+    const obj = {
+      id,
+      classify
+    }
+    wx.navigateTo({
+      url: '/pages/doctor-train-details/doctor-train-details?obj=' + JSON.stringify(obj)
+    });
+  },
 
   //获取列表信息
   getListData() {
diff --git a/pages/doctor-train/doctor-train.wxml b/pages/doctor-train/doctor-train.wxml
index 4e59d0e3cb7e997f00ef3d05bc4c488bb701f28c..c47ce93cc3e5347ea965d315e1da9fcef0295009 100644
--- a/pages/doctor-train/doctor-train.wxml
+++ b/pages/doctor-train/doctor-train.wxml
@@ -1,6 +1,6 @@
 <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" circular="{{circular}}">
   <block wx:for="{{imgUrls}}" wx:key="*this">
-    <swiper-item>
+    <swiper-item data-type="{{ item.srcType }}" data-id="{{ item.srcId }}" catchtap="entryDetail">
       <image mode="scaleToFill" src="{{imgBase + item.imgPath}}" />
     </swiper-item>
   </block>
@@ -8,46 +8,43 @@
 
 <!-- icon导航 -->
 <view class="index-nav">
-  <view class="index-nav-item"  data-name="activities" catchtap="navLink">
+  <view class="index-nav-item" data-name="activities" catchtap="navLink">
     <image mode="widthFix" src="{{ localImg + 'doctor-train-nav-1.png' }}"></image>
     <text>学术活动</text>
   </view>
-  <view class="index-nav-item"  data-name="items" catchtap="navLink">
+  <view class="index-nav-item" data-name="items" catchtap="navLink">
     <image mode="widthFix" src="{{ localImg + 'doctor-train-nav-2.png' }}"></image>
     <text>品牌项目</text>
   </view>
-  <view class="index-nav-item"  data-name="courses" catchtap="navLink">
+  <view class="index-nav-item" data-name="courses" catchtap="navLink">
     <image mode="widthFix" src="{{ localImg + 'doctor-train-nav-3.png' }}"></image>
     <text>学院课程</text>
   </view>
-  <view class="index-nav-item"  data-name="academics" catchtap="navLink">
+  <view class="index-nav-item" data-name="academics" catchtap="navLink">
     <image mode="widthFix" src="{{ localImg + 'doctor-train-nav-4.png' }}"></image>
     <text>学术频道</text>
   </view>
 </view>
 
 <!-- 列表   学术活动activities -->
-<view class="content">
+<view class="content" wx:if="{{ activities.length > 0 }}">
   <view class="title">
     <view class="titName">学术活动</view>
-    <view class="more"  catchtap="navLink" data-name="activities">更多
-      <image mode="scaleToFill" src="{{ localImg + 'images/jt.png' }}"></image>
+    <view class="more" catchtap="navLink" data-name="activities">更多
+      <image mode="scaleToFill" src="{{ localImg + 'jt.png' }}"></image>
     </view>
   </view>
   <view class="list">
-    <block wx:for="{{activities}}" wx:key="*this"> 
-      <view class="item" data-type='1'data-academicId="{{item.academicId}}" data-id="{{ item.activityId }}" data-classify="activityId" catchtap="entry">
-        <image src="{{ imgBase + item.thumbnailPicPath }}"></image>
-        <view class="introduction">
-
-          <view class='introduction-title'>{{ item.activityTheme }}</view>
-
-          <!-- <view class="name">{{ item.activityTheme }}</view> -->
 
+    <block wx:for="{{activities}}" wx:key="index">
+      <view class="item" data-type='1' data-academicId="{{item.academicId}}" data-id="{{ item.activityId }}" data-classify="activityId" catchtap="entry">
+        <image mode="scaleToFill" src="{{ imgBase + item.thumbnailPicPath }}"></image>
+        <view class="introduction">
+          <view class="name">{{ item.activityTheme }}</view>
           <view class="infor">
-            <text>浏览量：20</text>
-            <text class="bd-lf"></text>
-            <text>赞：20</text>
+            <text>浏览量：{{ item.scanNums }}</text>
+            <!-- <text class="bd-lf"></text>
+            <text>赞：20</text> -->
           </view>
         </view>
       </view>
@@ -55,7 +52,7 @@
   </view>
 </view>
 <!-- 列表   品牌项目items -->
-<view class="content">
+<view class="content" wx:if="{{ items.length > 0 }}">
   <view class="title">
     <view class="titName">品牌项目</view>
     <view class="more" catchtap="navLink" data-name="items">更多
@@ -63,19 +60,15 @@
     </view>
   </view>
   <view class="list">
-    <block wx:for="{{items}}" wx:key="*this">
+    <block wx:for="{{items}}" wx:key="index">
       <view class="item" data-type='2' data-id="{{ item.itemId }}" data-classify="itemId" catchtap="entry">
         <image src="{{ imgBase + item.thumbnailPicPath }}"></image>
         <view class="introduction">
-
-          <view class='introduction-title'>{{ item.itemName }}</view>
-
-          <!-- <view class="name">{{ item.itemName }}</view> -->
-
+          <view class="name">{{ item.itemName }}</view>
           <view class="infor">
-            <text>浏览量：20</text>
-            <text class="bd-lf"></text>
-            <text>赞：20</text>
+            <text>浏览量：{{ item.scanNums }}</text>
+            <!-- <text class="bd-lf"></text>
+            <text>赞：20</text> -->
           </view>
         </view>
       </view>
@@ -83,7 +76,7 @@
   </view>
 </view>
 <!-- 列表   学院课程courses -->
-<view class="content">
+<view class="content" wx:if="{{ courses.length > 0 }}">
   <view class="title">
     <view class="titName">学院课程</view>
     <view class="more" catchtap="navLink" data-name="courses">更多
@@ -91,19 +84,16 @@
     </view>
   </view>
   <view class="list">
-    <block wx:for="{{courses}}" wx:key="*this">
+    <block wx:for="{{ courses }}" wx:key="index">
       <view class="item" data-type='3' data-id="{{ item.courseId }}" data-classify="courseId" catchtap="entry">
         <image src="{{ imgBase + item.thumbnailPicPath }}"></image>
         <view class="introduction">
-
-          <view class='introduction-title'>{{ item.courseName }}</view>
-
-          <!-- <view class="name">{{ item.courseName }}</view> -->
-
+          <view class="name">{{ item.courseName }}</view>
           <view class="infor">
             <text class="oldPrice">原价：{{ item.coursePrice }}</text>
             <text class="bd-lf"></text>
-            <text>现价：{{ item.salePrice }}</text>
+            <!-- <text>现价：{{ item.salePrice }}</text> -->
+            <text>现价：{{ item.coursePrice }}</text>
           </view>
         </view>
       </view>
@@ -111,7 +101,7 @@
   </view>
 </view>
 <!-- 列表   学术频道academics -->
-<view class="content">
+<view class="content" wx:if="{{ academics.length > 0 }}">
   <view class="title">
     <view class="titName">学术频道</view>
     <view class="more" catchtap="navLink" data-name="academics">更多
@@ -123,15 +113,11 @@
       <view class="item" data-type='4' data-id="{{ item.academicId }}" data-classify="academicId" catchtap="entry">
         <image src="{{ imgBase + item.thumbnailPicPath }}"></image>
         <view class="introduction">
-
-          <view class='introduction-title'>{{ item.academicName }}</view>
-
-          <!-- <view class="name">{{ item.academicName }}</view> -->
-
+          <view class="name">{{ item.academicName }}</view>
           <view class="infor">
-            <text>浏览量：20</text>
-            <text class="bd-lf"></text>
-            <text>赞：20</text>
+            <text>浏览量：{{ item.scanNums }}</text>
+            <!-- <text class="bd-lf"></text>
+            <text>赞：20</text> -->
           </view>
         </view>
       </view>
diff --git a/pages/doctor-train/doctor-train.wxss b/pages/doctor-train/doctor-train.wxss
index 8c219d9e226f099ff28a8865fd6bf146526d8d1f..725766e4215d7777d132e0c81ff388124dca4a57 100644
--- a/pages/doctor-train/doctor-train.wxss
+++ b/pages/doctor-train/doctor-train.wxss
@@ -52,6 +52,7 @@ swiper image{
 }
 .list .item{
   display: flex;
+  justify-content: flex-start;
   padding:34rpx 0;
   margin: 0 25rpx;
   border-bottom:1px solid #ebebeb;
@@ -63,7 +64,7 @@ swiper image{
   width: 180rpx;
   height: 140rpx;
   border-radius: 6px;
-  display:inline-block;
+ 
 }
 .introduction{
   width:100%;
@@ -71,17 +72,16 @@ swiper image{
   margin-left:25rpx;
   color:#111;
   font-size: 28rpx;
-  display:inline-block;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
 }
-
-.introduction-title{height:120rpx; overflow:hidden; text-overflow:hidden;}
-
-/* .introduction .name{
-  width: 500rpx;
+.introduction .name{
+  width: 480rpx;
   overflow: hidden;
   text-overflow:ellipsis;
   white-space: nowrap;
-} */
+} 
 
 .bd-lf{
   display: inline-block;
diff --git a/pages/user-my-movie-details/user-my-movie-details.wxml b/pages/user-my-movie-details/user-my-movie-details.wxml
index ccf9f16f6e7bd28575fef9c6973011f5131b8bac..68f806a2268de8ac7db9788f47d4241fb03f3053 100644
--- a/pages/user-my-movie-details/user-my-movie-details.wxml
+++ b/pages/user-my-movie-details/user-my-movie-details.wxml
@@ -1,5 +1,5 @@
 <!--pages/user-my-movie-details/user-my-movie-details.wxml-->
 <!-- <image mode="widthFix" style="width:100%;" src="https://tyc-bj.cn/yc/api/attach/images/my-movie.jpg"></image> -->
 <view class="video-wrapper">
-  <video id="myVideo" src="{{ videoUrl+changeVideo.videoPath }}" binderror="videoErrorCallback"></video>
+  <video id="myVideo" poster="{{ videoUrl+changeVideo.imgPath }}" src="{{ videoUrl+changeVideo.videoPath }}"  binderror="videoErrorCallback"></video>
 </view>
\ No newline at end of file
diff --git a/pages/user-my-movie/user-my-movie.wxml b/pages/user-my-movie/user-my-movie.wxml
index 4c76d99cfca6c710b47f84ed51ab9a165659191b..71d1e2d82f5d0877ed6ed7629a4982ebceffef70 100644
--- a/pages/user-my-movie/user-my-movie.wxml
+++ b/pages/user-my-movie/user-my-movie.wxml
@@ -3,7 +3,7 @@
   <block wx:for="{{sheetTypeList}}" wx:key="{{item.sheetId}}">
     <view class="my-movie-item">
       <navigator hover-class="none" url="../user-my-movie-add/user-my-movie-add?sheetId={{item.sheetId}}&sheetPrice={{item.sheetPrice}}" open-type="navigate">
-        <image mode="aspectFill" src="https://tyc-bj.cn/yc/api/attach/images/my-movie-img.png"></image>
+        <image mode="aspectFill" src="{{ imgUrl+item.sheetFile }}"></image>
         <view class="my-movie-item-s">
           {{item.sheetName}}
           <view>￥{{item.sheetPrice}}</view>
diff --git a/pages/user-my-recharge-record/user-my-recharge-record.wxml b/pages/user-my-recharge-record/user-my-recharge-record.wxml
index 43244b29f8901a67c46faee2886018f8295d2a90..080b917d34151b0097401930b783692768c23d20 100644
--- a/pages/user-my-recharge-record/user-my-recharge-record.wxml
+++ b/pages/user-my-recharge-record/user-my-recharge-record.wxml
@@ -26,4 +26,5 @@
 		<text>2018-04-02</text>
 		<view>微信支付</view>
 	</view> -->
+
 </view>
\ No newline at end of file
diff --git a/pages/user-my-recharge-record/user-my-recharge-record.wxss b/pages/user-my-recharge-record/user-my-recharge-record.wxss
index c594170e712444bf6ac4cd290de8d5091c427b4c..76f6f581cf6fbcf2af72cda626630d8e02332beb 100644
--- a/pages/user-my-recharge-record/user-my-recharge-record.wxss
+++ b/pages/user-my-recharge-record/user-my-recharge-record.wxss
@@ -1,6 +1,22 @@
 /* pages/user-my-recharge-record/user-my-recharge-record.wxss */
-.my-recharge-record{padding:0 30rpx; background:#fff; margin:20rpx 0;}
-.my-recharge-record-item{border-top:1rpx solid #e6e6e6; position:relative; padding:25rpx 0; font-size:30rpx; font-weight:650;}
-.my-recharge-record-item:nth-child(1){border:none;}
-.my-recharge-record-item text{display:block; font-size:24rpx; color:#b8b8b8; padding-top:10rpx; font-weight:500;}
-.my-recharge-record-item view{position:absolute; font-size:28rpx; color:#9d46fa; top:40rpx; right:0;}
\ No newline at end of file
+
+.my-recharge-record{
+  margin-top: 20rpx;
+  background-color: #fff;
+   padding: 0 30rpx;
+}
+.box{
+  border-bottom:1px solid #eee;
+  height:120rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+}
+.money{
+  font-size: 32rpx;
+  color:#333;
+}
+.time{
+  font-size: 26rpx;
+  color:#999;
+}
\ No newline at end of file
diff --git a/pages/user-my-task-volcano/user-my-task-volcano.wxml b/pages/user-my-task-volcano/user-my-task-volcano.wxml
index 840766240b30ebbe84908f3e7a9016c1f3f42ac9..8d74f0326423caf7f42eeed32d15c83fd0664485 100644
--- a/pages/user-my-task-volcano/user-my-task-volcano.wxml
+++ b/pages/user-my-task-volcano/user-my-task-volcano.wxml
@@ -14,25 +14,23 @@
 	<view class="my-task-volcano-d-t">
 		<view>名次</view>
 		<view>用户名</view>
-		<view>美丽值</view>
+		<view>美丽币</view>
 	</view>
 	<view class="my-task-volcano-list">
 		<view class="my-task-volcano-d" wx:for="{{ info }}" wx:key="index">
 			<view class="my-task-volcano-d-s">
        
         <view class="my-task-volcano-d-s-l"  wx:if="{{ index == 0 }}">
-				<image mode="widthFix" src="https://tyc-bj.cn/yc/api/attach/images/my-task-volcano-1.png"></image>
-       </view>
-       <view class="my-task-volcano-d-s-l"  wx:elif="{{ index == 1 }}">
-				<image mode="widthFix" src="https://tyc-bj.cn/yc/api/attach/images/my-task-volcano-2.png"></image>
-       </view>
-       <view class="my-task-volcano-d-s-l"  wx:elif="{{ index == 2 }}">
-				<image mode="widthFix" src="https://tyc-bj.cn/yc/api/attach/images/my-task-volcano-3.png"></image>
-       </view>
-       <view class="my-task-volcano-d-s-l" wx:else>
-				 {{ index + 1 }}
-       </view>
-				{{ item.userName }}
+				  <image mode="widthFix" src="https://tyc-bj.cn/yc/api/attach/images/my-task-volcano-1.png"></image>
+        </view>
+        <view class="my-task-volcano-d-s-l"  wx:elif="{{ index == 1 }}">
+				  <image mode="widthFix" src="https://tyc-bj.cn/yc/api/attach/images/my-task-volcano-2.png"></image>
+        </view>
+        <view class="my-task-volcano-d-s-l"  wx:elif="{{ index == 2 }}">
+				  <image mode="widthFix" src="https://tyc-bj.cn/yc/api/attach/images/my-task-volcano-3.png"></image>
+        </view>
+        <view class="my-task-volcano-d-s-l" wx:else>{{ index + 1 }}</view>
+				<view class="name">{{ item.userName }}</view>
 				<view class="my-task-volcano-d-s-r">{{ item.beautyCoin }}</view>
 			</view>
 		</view>
diff --git a/pages/user-my-task-volcano/user-my-task-volcano.wxss b/pages/user-my-task-volcano/user-my-task-volcano.wxss
index dd5ab1906d006f43bc508309352d47582d2efa51..852c95ebd3c5f7985e53a3f842714d42cfd02208 100644
--- a/pages/user-my-task-volcano/user-my-task-volcano.wxss
+++ b/pages/user-my-task-volcano/user-my-task-volcano.wxss
@@ -17,10 +17,38 @@
 
 .my-task-volcano-d{height:116rpx; padding:0 30rpx; background:#fff;}
 .my-task-volcano-d.active{background:#fbf1ff;}
-.my-task-volcano-d-s{height:116rpx; line-height:116rpx; overflow:hidden; font-size:32rpx; border-top:1rpx solid #e6e6e6;}
-.my-task-volcano-list .my-task-volcano-d:nth-child(1) .my-task-volcano-d-s{border:none;}
-.my-task-volcano-d-s-l{float:left; width:46rpx; height:54rpx; margin:0rpx 90rpx 0 0;text-align: center;}
-.my-task-volcano-d-s-l image{ width:46rpx; height:54rpx; margin-top:19px;}
-.my-task-volcano-d-s text{width:46rpx; margin:0 90rpx 0 0; float:left; display:block; font-size:32rpx; color:#888;}
-.my-task-volcano-d-s-r{float:right; font-size:30rpx; width:85rpx; text-align:right; margin-right: 20rpx;}
-.my-task-volcano-d.active .my-task-volcano-d-s view{color:#9813f4;}
\ No newline at end of file
+
+
+.my-task-volcano-d-s{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height:116rpx; 
+  font-size:32rpx; 
+  border-top:1px solid #e6e6e6;
+}
+.my-task-volcano-list .my-task-volcano-d:nth-child(1) .my-task-volcano-d-s{
+  border:none;
+}
+.my-task-volcano-d-s-l{
+  width:46rpx; 
+  height:54rpx; 
+}
+.my-task-volcano-d-s-l image{ 
+  width:46rpx; 
+  height:54rpx; 
+}
+.name{
+  width: 346rpx;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
+}
+.my-task-volcano-d-s-r{
+  font-size:30rpx; 
+  margin-right: 34rpx;
+}
+.my-task-volcano-d.active .my-task-volcano-d-s view{
+  color:#9813f4;
+}
+
diff --git a/pages/user-shop-goods/user-shop-goods.wxss b/pages/user-shop-goods/user-shop-goods.wxss
index 5c1915cc1fd927ad0c98a1a4585f56634769f80f..06a62aa21f92aa58f3eff464a7316c3061519915 100644
--- a/pages/user-shop-goods/user-shop-goods.wxss
+++ b/pages/user-shop-goods/user-shop-goods.wxss
@@ -13,7 +13,11 @@
 .menu-item.active .menu-item-d{display:inline-block;}
 
 
-.shop-goods-list-2{background:#fff; padding:0 30rpx 30rpx; margin-bottom:30rpx;}
+.shop-goods-list-2{
+  background:#fff; 
+  padding:0 30rpx 30rpx; 
+  margin-bottom:30rpx;
+}
 .shop-goods-list-2 navigator{overflow:hidden; border-bottom:1px solid #e6e6e6; padding:30rpx 0;}
 .shop-goods-list-2 navigator image{width:170rpx; height:170rpx; float:left;}
 .shop-goods-list-2-r{width:calc(100% - 190rpx); height:170rpx; float:right; position:relative;}
@@ -26,4 +30,12 @@
 .shop-goods-t-item{font-size:30rpx; text-align:center; position:relative; border-left:1px solid #e6e6e6; width:100%; color:#888;}
 .shop-goods-t-item:nth-child(1){border:none;}
 .shop-goods-t-item.active{color:#9813f4;}
-.shop-goods-t-item image{width:12rpx; position:absolute; top:10rpx; right:60rpx;}
\ No newline at end of file
+.shop-goods-t-item image{width:12rpx; position:absolute; top:10rpx; right:60rpx;}
+
+.searchResult{
+  position: fixed;
+  width: 100%;
+  top: 82rpx;
+  background-color: red;
+  z-index: 60;
+}
\ No newline at end of file