优化

app.json

@@ -25,7 +25,7 @@
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#61CA54",
-    "navigationBarTitleText": "小学语文朗读配音",
+    "navigationBarTitleText": "小学课文朗读配音",
     "navigationBarTextStyle": "white",
     "backgroundColor": "#61CA54",
     "onReachBottomDistance": 50,

app.wxss

@@ -2,12 +2,14 @@
 page {
   width: 100%;
   height: 100%;
+  color:#444;
 }
 
 .container {
   height: auto;
   box-sizing:border-box;
   padding-top: 70rpx;
+  color:#444;
  
 } 
 ::-webkit-scrollbar{

component/follow/follow.js

@@ -5,46 +5,10 @@ import {
 export const followInit = (that) => {
   that.setData({
     followData: []
-    //   title: '关注',
-    //   wareCards: [{
-    //       title: "铺满色巴掌的水泥道",
-    //       grade: "一年级 上学期",
-    //       img: "../../static/image/timg.jpg",
-    //       plays: "1",
-    //       likes: "2",
-    //       classId: "1",
-    //       avatar: '../../static/image/timg.jpg',
-    //       nickName: '萝莉小猫咪',
-    //       time: '11-01 14:14'
-    //     },
-    //     {
-    //       title: "铺满色巴掌的水泥道",
-    //       grade: "一年级 上学期",
-    //       img: "../../static/image/timg.jpg",
-    //       plays: "1",
-    //       likes: "2",
-    //       classId: "1",
-    //       avatar: '../../static/image/timg.jpg',
-    //       nickName: '萝莉小猫咪',
-    //       time: '11-01 14:14'
-    //     },
-    //     {
-    //       title: "铺满色巴掌的水泥道",
-    //       grade: "一年级 上学期",
-    //       img: "../../static/image/timg.jpg",
-    //       plays: "1",
-    //       likes: "2",
-    //       classId: "1",
-    //       avatar: '../../static/image/timg.jpg',
-    //       nickName: '萝莉小猫咪',
-    //       time: '11-01 14:14'
-    //     },
-    //   ]
-    // }
   })
   //请求数据封装
-  that.getWorks = (uid, pageNo, pageSize) => {
-    httpRequestApi.getFollowWorks(uid, pageNo, pageSize).success(res => {
+  that.getWorks = (pageNo, pageSize) => {
+    httpRequestApi.getFollowWorks(pageNo, pageSize).success(res => {
       console.log(res)
       const followData = res.data.data.list;
       // const followTemp = [];
@@ -70,5 +34,5 @@ export const followInit = (that) => {
       })
     });
   }
-  that.getWorks(that.uid, 1, 5);
+  that.getWorks(1, 5);
 }

component/follow/follow.wxml

@@ -27,4 +27,5 @@
       </view>
     </view>
   </view>
+  <myPlacerholder line1="您还没有关注过用户" line2="快去关注吧" wx:if="{{followData.length <= 0}}" />  
 </template>

component/group/group.wxss

@@ -58,6 +58,7 @@ scroll-view {
 
 .group-jion {
     width: 460rpx;
+    color:#444;
 }
 
 .group-jion .top-title {
@@ -134,6 +135,7 @@ scroll-view {
     padding: 0 18rpx;
     position: relative;
     box-sizing: border-box;
+    color:#444;
 }
 
 .title .left {
@@ -158,6 +160,7 @@ scroll-view {
     /* flex-direction: row; */
     align-items: center;
     font-size: 28rpx;
+    color:#444;
 }
 
 .title .right image {
@@ -205,7 +208,7 @@ scroll-view {
 
 .group-item #grade {
     margin-top: 20rpx;
-    color: #000;
+    color:#444;
     text-align: center;
     font-size: 28rpx;
 }

component/hot/hot.wxss

@@ -418,7 +418,7 @@ height:28rpx;
     height: 46rpx;
     display: block;
     /* text-align: left; */
-    color: #414141;
+    color: #444;
     font-size: 32rpx;
     letter-spacing: 4rpx;
     margin-left: 28rpx;

component/my/my.wxml

@@ -6,7 +6,7 @@
         <view class='set-msg'>
           <view class='avatar-box'>
             <image class='avatar-image' src='{{ myData.user.user.avatar }}'></image>
-            <view class='occupation-title'>{{ myData.user.user.profession }}</view>
+            <view class='occupation-title' wx:if="{{myData.user.user.profession}}">{{ myData.user.user.profession }}</view>
           </view>
           <view class='avatar-msg'>
             <view class='avatar-nickname'>

component/my/my.wxss

@@ -251,7 +251,7 @@ image {
   width: 716rpx;
   height: 88rpx;
   font-size: 34rpx;
-  color: #5E5E5E;
+  color: #444;
   background: #FFFFFF;
   border-radius: 14rpx;
 }
@@ -292,8 +292,8 @@ image {
   margin-top: 20rpx;
   width: 716rpx;
   height: 88rpx;
-  font-size: 34rpx;
-  color: #5E5E5E;
+  font-size: 32rpx;
+  color: #444;
   background: #FFFFFF;
   border-radius: 14rpx;
 }

component/myPlacerholder/myPlacerholder.js

@@ -0,0 +1,33 @@
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+      line1: {
+        type: "String",
+        value: ''
+      },
+      line2: {
+        type: "String",
+        value: ''
+      },
+      imageShow: {
+          type: "Boolean",
+          value: true
+      }
+    },
+  
+    /**
+     * 组件的初始数据
+     */
+    data: {
+    //   flag: true,
+    },
+  
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+      
+    }
+  })

component/myPlacerholder/myPlacerholder.json

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

component/myPlacerholder/myPlacerholder.wxml

@@ -0,0 +1,5 @@
+<view class="myPlacerholder">
+    <image class="placerholder-image" src="../../static/image/placerholder.png" wx:if="{{imageShow}}" />
+    <view class="line1">{{line1}}</view>
+    <view class="line2">{{line2}}</view>
+</view>

component/myPlacerholder/myPlacerholder.wxss

@@ -0,0 +1,25 @@
+.myPlacerholder {
+    width: 750rpx;
+    height: 100%;
+    position: absolute;
+    top: 0;
+}
+
+.placerholder-image {
+    width: 186rpx;
+    height: 196rpx;
+    margin:200rpx auto 50rpx;
+    display: block;
+}
+.line1{
+    width: 100%;
+    text-align: center;
+    font-size: 32rpx;
+    color: #9D9D9D;
+}
+.line2{
+    width: 100%;
+    text-align: center;
+    font-size: 32rpx;
+    color: #9D9D9D;
+}

component/myToast/myToast.js

@@ -21,7 +21,6 @@ Component({
      */
     methods: {
       close: function () {
-        console.log(1111111111111111111111111)
         this.triggerEvent('ShowAlert', {})
       },
     }

pages/groupPage/collage-details/collage-details.js

@@ -37,7 +37,7 @@ Page({
     read: false,
     organizerUid: '',
     colonelName: '',
-    rewardMoney:'',
+    rewardMoney: '',
   },
   //显示分享页 
   openShare: function () {
@@ -62,6 +62,20 @@ Page({
       this.shareDialog.share(data);
     }
   },
+  // 下拉刷新
+  onPullDownRefresh: function () {
+    this.setData({
+      surplusList: []
+    },()=>{
+      this.getInfo();
+    })
+    wx.showNavigationBarLoading() //在标题栏中显示加载
+    //模拟加载
+    setTimeout(function () {
+      wx.hideNavigationBarLoading() //完成停止加载
+      wx.stopPullDownRefresh() //停止下拉刷新
+    }, 1500);
+  },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -87,12 +101,16 @@ Page({
     // if (options.orderId) {
     //   return false;
     // }
-    
+
     console.log(orderId)
     this.setData({
       orderId
+    },()=>{
+      this.getInfo()
     })
-    httpRequestApi.getMygroupInfo(orderId).success(res => {
+  },
+  getInfo: function(){
+    httpRequestApi.getMygroupInfo(this.data.orderId).success(res => {
       console.log(res);
       const groupOrder = res.data.data.groupPurchaseOrder;
       const surplusNum = groupOrder.headcount - groupOrder.joinCount;
@@ -106,7 +124,7 @@ Page({
       //时间转换
       let timeList = [];
       const stillGoing = groupOrder.closeTime - Date.parse(new Date()) <= 0 ? false : true
-      if(stillGoing){
+      if (stillGoing) {
         timeList = util.formatTime(groupOrder.closeTime - Date.parse(new Date()));
       }
       // const timeList = util.formatTime(groupOrder.closeTime - Date.parse(new Date()));
@@ -133,11 +151,8 @@ Page({
           joinUserList: this.data.joinUserList,
         })
       }
-    }).fail(error => {
-      console.log('错误', error)
     })
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/groupPage/collage-details/collage-details.wxml

@@ -1,4 +1,4 @@
-<!--pages/groupPage/collage-details/collage-details.wxml-->
+<!-- pages/groupPage/collage-details/collage-details.wxml -->
 <view class="collage-details">
     <view class="step">
         <image src="../../../static/groupImg/step.png"></image>
@@ -13,19 +13,23 @@
             <block wx:for="{{joinUserList}}" wx:key="{{index}}">
                 <view class="headImg-item {{organizerUid == item.uid ? 'bg-boder' : ''}}">
                     <!-- <image wx:if="{{organizerUid == item.uid}}" class="tuanzhangIcon" src="../../../static/groupImg/tuanzhangIcon.png"></image> -->
-                    <view  wx:if="{{organizerUid == item.uid}}" class="organizerIcon">团长</view>
+                    <view wx:if="{{organizerUid == item.uid}}" class="organizerIcon">团长</view>
                     <image src="{{item.avatar}}"></image>
                 </view>
             </block>
             <block wx:for="{{surplusList}}" wx:key="{{index}}">
                 <view class="headImg-item">
                     <image src="../../../static/groupImg/no_head.png"></image>
-                </view>  
-            </block>                   
+                </view>
+            </block>
         </view>
         <view class="shengyu">
             <view class="shengyu-num" wx:if="{{colonelName}}">团长{{colonelName}}发起团购</view>
-            <view class="shengyu-num" hidden="{{surplusNum == '0' || !stillGoing}}">仅剩<text>{{surplusNum}}</text>个名额就拼团成功了</view>
+            <view class="shengyu-num" hidden="{{surplusNum == '0' || !stillGoing}}">
+                仅剩
+                <text>{{surplusNum}}</text>
+                个名额就拼团成功了
+            </view>
             <view class="shengyu-num" hidden="{{stillGoing}}">团购已超过时限</view>
             <view class="shengyu-num" hidden="{{surplusNum != '0'}}">拼团成功!快去朗读吧</view>
             <view class="shengyu-time" hidden="{{!stillGoing}}">
@@ -39,35 +43,28 @@
                         <text>{{item}}</text>
                     </view>
                 </block>
-                时             
+                时
                 <block wx:for="{{timeList[2]}}" wx:key="{{index}}">
                     <view class="time">
                         <text>{{item}}</text>
                     </view>
-                </block>                
-                分             
+                </block>
+                分
             </view>
         </view>
         <view class="invitation-btn" bindtap="openShare">
             <!-- <image src="../../../static/groupImg/Invitation.png"></image> -->
             <text>{{read ? '开始你的表演' : '邀请朋友参加'}}</text>
         </view>
-    </view>  
-    <view class="explain">
-        <text>拼团规则</text>
-        <view style="margin-top:30rpx;">转发给自己的朋友们，分享好课， 追随您一起学习进步 您的魅力不是吹的</view>
-        <view style="margin-top:20rpx;">在限定时间内成功拼团，您将得到{{rewardMoney}}元的奖励金</view>
-        <view>如果拼团失败 </view>
-        <view style="margin-top:20rpx;">您预付的课程费将在48小时内退回您的账户</view>
+        <view class="explain">
+            <text>拼团规则</text>
+            <view style="margin-top:30rpx;">转发给自己的朋友们，分享好课， 追随您一起学习进步 您的魅力不是吹的</view>
+            <view style="margin-top:20rpx;">在限定时间内成功拼团，您将得到{{rewardMoney}}元的奖励金</view>
+            <view>如果拼团失败</view>
+            <view style="margin-top:20rpx;">您预付的课程费将在48小时内退回您的账户</view>
+        </view>
     </view>
-</view> 
+</view>
 <canvas canvas-id="myCanvas" style="width:375px; height: 668px; position: absolute; left: -999rpx; top: -9999rpx;"></canvas>
-<shareDialog id="share-dialog" shareType='group' shareId="{{orderId}}"/>
-
-<popup
-    typeOf="sendSuccess"
-    title="报告团长"
-    headTextTwo='您发起的团购已经成立，订单号：{{orderId}}'
-    content="{{content}}"
-></popup>
-
+<shareDialog id="share-dialog" shareType='group' shareId="{{orderId}}" />
+<popup typeOf="sendSuccess" title="报告团长" headTextTwo='您发起的团购已经成立，订单号：{{orderId}}' content="{{content}}"></popup>

pages/groupPage/collage-details/collage-details.wxss

@@ -32,9 +32,11 @@
 
 .details-head {
     width: 100%;
-    height: 82%;
+    /* height: 82%; */
     margin-top: 12rpx;
     background: #fff;
+    min-height:84%;
+
 }
 
 .headImg {
@@ -128,12 +130,13 @@
 }
 
 .invitation-btn {
-    position: absolute;
+    /* position: absolute;
     left: 50%;
-    top: 55%;
-    transform: translate(-50%);
+    top: 55%; */
+    /* transform: translate(-50%); */
     width: 434rpx;
     height: 80rpx;
+    margin:80rpx auto;
 }
 
 .invitation-btn image {
@@ -145,7 +148,7 @@
 }
 
 .invitation-btn text {
-    position: absolute;
+    /* position: absolute; */
     width: 100%;
     height: 100%;
     display: inline-block;
@@ -185,10 +188,11 @@
 }
 
 .explain {
-    position: absolute;
+    /* position: absolute;
     top: 65%;
-    left: 0;
-    color: #000;
+    left: 0; */
+    margin-top: 50rpx;
+    color: #444;
     font-size: 32rpx;
     width: 100%;
     padding: 0 80rpx;

pages/groupPage/grade-details/grade-details.js

@@ -32,13 +32,24 @@ Page({
     share: false,
     isIPX: app.globalData.isIPX,
     isIOS: app.globalData.isIOS,
-    flag: true
+    flag: true,
+    knowFlag: true,
+    menuFlag: false
   },
   //tab切换
-  tabSwitch: function () {
-    this.setData({
-      flag: !this.data.flag
-    })
+  tabSwitch: function (e) {
+    if(e.currentTarget.dataset.flag === "know" && this.data.knowFlag === false){
+      this.setData({
+        knowFlag: true,
+        menuFlag: false
+      })
+    }
+    if(e.currentTarget.dataset.flag === "menu" && this.data.menuFlag === false){
+      this.setData({
+        knowFlag: false,
+        menuFlag: true
+      })
+    }
   },
   //获取团购信息并掉起支付
   pay: function ({
@@ -205,7 +216,7 @@ Page({
       const bookInfo = res.data.data.product;
       const lessonList = res.data.data.lessonList;
       wx.setNavigationBarTitle({
-        title: bookInfo.title
+        title: '语文 ' + bookInfo.subTitle
       })
       const data = app.towxml.toJson(
         bookInfo.description,

pages/groupPage/grade-details/grade-details.wxml

@@ -6,10 +6,10 @@
         </view>
         <view class="catalog">
             <image class="bg2" src="../../../static/groupImg/Rectangle_9.png"></image>
-            <text class="{{!flag ? '' : 'select'}}" bindtap="tabSwitch">您需要知道</text>
-            <text class="{{!flag ? 'select' : ''}}" bindtap="tabSwitch">课文目录</text>
+            <text class="{{knowFlag ? 'select' : ''}}" bindtap="tabSwitch" data-flag="know">您需要知道</text>
+            <text class="{{menuFlag ? 'select' : ''}}" bindtap="tabSwitch" data-flag="menu">课文目录</text>
         </view>
-        <view class="catalog-list" hidden="{{flag}}">
+        <view class="catalog-list" hidden="{{!menuFlag}}">
             <view class="catalog-item" wx:for="{{lessonList}}" wx:key="{{index}}" data-id="{{item.id}}" data-title="{{item.title}}" bindtap="goToClass">
                 <text class="left">{{item.title}}</text>
                 <view class="right">
@@ -20,7 +20,7 @@
             </view>
         </view>
         <!-- 你需要知道 -->
-        <view class="know" hidden="{{!flag}}">
+        <view class="know" hidden="{{!knowFlag}}">
             <import src="../../../towxml/entry.wxml" />
             <template is="entry" data="{{...article}}" />
         </view>
@@ -40,7 +40,7 @@
         <block wx:for="{{payList}}" wx:key="{{index}}">
             <view class="Price" bindtap="pay" data-id="{{item.id}}" wx:if="{{share ? (index != 0) : item.headcount === 1 ? false : true }}">
                 <text>{{item.price / 100}}元/{{item.headcount - 1}}人帮忙</text>
-                <text style="fontSize: 28rpx">免费开团</text>
+                <text style="fontSize: 24rpx">免费开团</text>
             </view>
         </block>
     </view>

pages/groupPage/grade-details/grade-details.wxss

@@ -48,7 +48,7 @@ scroll-view {
 .catalog image {
     position:absolute;
     left:374rpx;
-    top:16rpx;
+    top:26rpx;
     width:2rpx;
     height:60rpx;
 }
@@ -75,8 +75,10 @@ scroll-view {
 }
 
 .know {
-    padding: 18rpx;
+    padding: 18rpx 18rpx 120rpx 18rpx;
     box-sizing: border-box;
+    background: #fff;
+    margin-top: 12rpx;
 }
 
 .catalog-item {
@@ -136,11 +138,11 @@ scroll-view {
 }
 
 .group-btn .Price text:nth-child(1) {
-    font-size: 32rpx;
+    font-size: 28rpx;
 }
 
 .group-btn .Price text:nth-child(2) {
-    font-size: 36rpx;
+    font-size: 32rpx;
 }
 
 
@@ -159,6 +161,3 @@ scroll-view {
 .group-btn .bg2 {
     left: 68%;
 }
-.know {
-    margin-bottom: 105rpx;
-}

pages/groupPage/group-details/group-details.js

@@ -174,8 +174,6 @@ Page({
       if (this.data.article === '') {
         this.getBooksInfo(res.data.data.groupPurchaseOrder.productId)
       }
- 
-     
       this.setData({
         organizer: groupOrder.organizer,
       })
@@ -365,10 +363,21 @@ Page({
         goBackHome: true
       })
     }
-
-
-    //获取拼团信息
-
+  },
+  // 下拉刷新
+  onPullDownRefresh: function () {
+    //当前在团购页下拉加载
+    this.setData({
+      surplusList: []
+    },()=>{
+      this.jionSuccess(this.data.orderId);
+    })
+    wx.showNavigationBarLoading() //在标题栏中显示加载
+    //模拟加载
+    setTimeout(function(){
+      wx.hideNavigationBarLoading() //完成停止加载
+      wx.stopPullDownRefresh() //停止下拉刷新
+    },1500);
   },
   // 获取课本详情
   getBooksInfo: function (productId) {

pages/groupPage/my-group/my-group.js

@@ -19,7 +19,9 @@ Page({
     groupId: '',
     closeFlags: [],
     ind: 0,
-    timeList: []
+    timeList: [],
+    line1: '您还没有拼过团哦',
+    line2: '拼过团再来看看吧'
   },
     //跳转到团购详情页
   collageDetails: function ({currentTarget}) {

pages/groupPage/my-group/my-group.json

@@ -1,6 +1,7 @@
 {
     "component": true,
     "usingComponents": {
-        "popup": "/component/popup/popup"
+        "popup": "/component/popup/popup",
+        "myPlacerholder": "/component/myPlacerholder/myPlacerholder"
     }  
 }

pages/groupPage/my-group/my-group.wxml

@@ -30,6 +30,7 @@
            
         </view>
     </scroll-view>
+    <myPlacerholder line1="{{line1}}" line2="{{line2}}" wx:if="{{myGroupList.length <= 0}}" />  
 </view>
 <popup
     id="popup"

pages/index/index.js

@@ -59,7 +59,7 @@ Page({
     hotInput: '12345',
     mineSettingInfo: '528',
     hide: true,
-    isIOS:app.globalData.isIOS,
+    isIOS:app.globalData.isIOS
   },
   jurisdiction: function () {
     //隐藏弹框
@@ -198,9 +198,7 @@ Page({
     
     wx.showNavigationBarLoading() //在标题栏中显示加载
     //模拟加载
-    setTimeout(function()
-    {
-      // complete
+    setTimeout(function(){
       wx.hideNavigationBarLoading() //完成停止加载
       wx.stopPullDownRefresh() //停止下拉刷新
     },1500);

pages/index/index.json

@@ -1,7 +1,8 @@
 {
     "usingComponents": {
         "Dialog": "../../component/dialog/dialog",
-        "MyToast": "../../component/myToast/myToast"
+        "MyToast": "../../component/myToast/myToast",
+        "myPlacerholder": "/component/myPlacerholder/myPlacerholder"
     },
     "window": {
         "onReachBottomDistance": 50

pages/main/class/class.js

@@ -8,7 +8,7 @@ Page({
     fullScreenBtn: false,
     playBtn: true,
     gesture: true,
-    centerBtn: false,
+    centerBtn: true,
     controls: true,
     videoLoad: false,
     autoPlay: true,
@@ -23,15 +23,16 @@ Page({
     totalNo: 0,
     collectFlag: false,
     goBackHome: false,
-    lazyVideoUrl: ''
+    lazyVideoUrl: '',
+    isIOS: app.globalData.isIOS
   },
   onLoad: function (option) {
     console.log(option);
-    if(option.scene || option.shareCard){
+    if (option.scene || option.shareCard) {
       this.setData({
-          goBackHome: true
+        goBackHome: true
       })
-  }
+    }
     this.setData({
       // title: option.title,
       id: option.id
@@ -40,31 +41,31 @@ Page({
     this.uid = wx.getStorageSync('uid');;
 
 
-      httpRequestApi.getClassDetail(this.uid, option.id).success(res => {
-        console.log(res);
-        this.setData({
-          title: res.data.data.title,
-          videoUrl: res.data.data.playUrl,
-          iconImg: res.data.data.iconImg
-        })
-        wx.setNavigationBarTitle({
-          title: res.data.data.title //页面标题为路由参数
-        })
-        this.getReadInfo(1, 10);
-        this.checkLike();
+    httpRequestApi.getClassDetail(this.uid, option.id).success(res => {
+      console.log(res);
+      this.setData({
+        title: res.data.data.title,
+        videoUrl: res.data.data.playUrl,
+        iconImg: res.data.data.iconImg
+      })
+      wx.setNavigationBarTitle({
+        title: res.data.data.title //页面标题为路由参数
       })
+      this.getReadInfo(1, 10);
+      this.checkLike();
+    })
   },
-      // video组件在获得url时迅速退出页面会导致小程序闪退，官方还没修复（11/28），处理办法：懒加载思路，在用户点击时再获取videoUrl
+  // video组件在获得url时迅速退出页面会导致小程序闪退，官方还没修复（11/28），处理办法：懒加载思路，在用户点击时再获取videoUrl
   // setVideoUrl: function(){
   //   console.log('视频地址>>>>>>>>',this.data.lazyVideoUrl)
   //   this.setData({
   //     videoUrl: this.data.lazyVideoUrl,
   //   })
   // },
-  videoPlayHandler: function(){
+  videoPlayHandler: function () {
     this.setData({
       videoLoad: true
-    },()=>{
+    }, () => {
       this.videoCtx = wx.createVideoContext('classVideo', this);
       this.videoCtx.play();
     })
@@ -80,35 +81,39 @@ Page({
     })
   },
   goToReading: function () {
-    
+
     let classId = this.data.id;
-    httpRequestApi.checkLesson(classId).success(res=>{
+    httpRequestApi.checkLesson(classId).success(res => {
       const productId = res.data.data[0];
+      // wx.navigateTo({
+      //   url: `../../main/reading/reading?id=${classId}`
+      // })
+      // return;
       httpRequestApi.areYouSuper(res.data.data).success(res => {
-        if(res.data.success){
+        if (res.data.success) {
           wx.navigateTo({
             url: `../../main/reading/reading?id=${classId}`
           })
         } else {
-           // ios用户 并且没有购买过此书
-           if(app.globalData.isIOS){
-            wx.showModal({
-                title: '暂不支持',
-                content: '十分抱歉，由于相关规定，您暂时无法在这里朗读',
-                success(res) {
-                    if (res.confirm) {
-                        console.log('用户点击确定')
-                    } else if (res.cancel) {
-                        console.log('用户点击取消')
-                    }
-                }
-            })
-            return;
-        }
+          // ios用户 并且没有购买过此书
+          // if (app.globalData.isIOS) {
+          //   wx.showModal({
+          //     title: '暂不支持',
+          //     content: '十分抱歉，由于相关规定，您暂时无法在这里朗读',
+          //     success(res) {
+          //       if (res.confirm) {
+          //         console.log('用户点击确定')
+          //       } else if (res.cancel) {
+          //         console.log('用户点击取消')
+          //       }
+          //     }
+          //   })
+          //   return;
+          // }
           wx.showModal({
             title: '您未购买过本书，不能朗读',
             content: '超值团购进行中，快去看看',
-            success (res) {
+            success(res) {
               if (res.confirm) {
                 console.log('用户点击确定')
                 wx.navigateTo({
@@ -122,7 +127,7 @@ Page({
         }
       })
     });
-    
+
   },
   openShare: function (e) {
     // this.setData({
@@ -141,20 +146,20 @@ Page({
   },
   onShareAppMessage: function (res) {
     if (res.from === 'button') {
-        // 来自页面内转发按钮
-        console.log(res.target)
+      // 来自页面内转发按钮
+      console.log(res.target)
     }
     return {
-        title: '老师同学都在玩的配音show，你还在等什么？',
-        path: `pages/main/class/class?id=${this.data.id}&title=${this.data.title}&shareCard=true`,
-        imageUrl: '../../../static/share/class_icon.jpg'
+      title: '老师同学都在玩的配音show，你还在等什么？',
+      path: `pages/main/class/class?id=${this.data.id}&title=${this.data.title}&shareCard=true`,
+      imageUrl: '../../../static/share/class_icon.jpg'
     }
-},
+  },
   goToWorks: function (e) {
     console.log(this.data.works)
     // this.videoCtx = wx.createVideoContext('myVideo', this);
-    if(this.videoCtx){
-      this.videoCtx.stop(); 
+    if (this.videoCtx) {
+      this.videoCtx.stop();
     }
     console.log(e);
     let readId = e.currentTarget.dataset.id;
@@ -215,7 +220,7 @@ Page({
     }
   },
   onHide: function () {
-    let videoCtx = wx.createVideoContext('classVideo',this);
+    let videoCtx = wx.createVideoContext('classVideo', this);
     videoCtx.stop();
-},
+  },
 })

pages/main/class/class.json

@@ -3,6 +3,7 @@
         "onReachBottomDistance": 50
     },
     "component": true,
+    "enablePullDownRefresh": false,
     "usingComponents": {
         "shareDialog": "/component/share/share",
         "popup": "/component/popup/popup",

pages/main/class/class.wxml

@@ -1,10 +1,10 @@
 <view class="classPage">
-    <!-- <cover-image wx:if="{{!videoLoad}}" class="video-playBtn" bindtap="videoPlayHandler" src="../../../static/image/play-btn.png"></cover-image>
-    <view class="videoSection">
+    <view class="videoSection" wx:if="{{!isIOS}}">
+        <cover-image wx:if="{{!videoLoad}}" class="video-playBtn" bindtap="videoPlayHandler" src="../../../static/image/play-btn.png"></cover-image>
         <image wx:if="{{!videoLoad}}" class="videoIcon" src="{{iconImg}}" />
         <video wx:if="{{videoLoad}}" id="classVideo" class="videoSection" src="{{videoUrl}}" autoPlay="{{autoPlay}}" controls="{{controls}}" show-center-play-btn="{{centerBtn}}" show-fullscreen-btn="{{fullScreenBtn}}" show-play-btn="{{playBtn}}"></video>
-    </view> -->
-    <video id="classVideo" poster="{{iconImg}}" class="videoSection" src="{{videoUrl}}" autoPlay="{{autoPlay}}" controls="{{controls}}" show-center-play-btn="{{centerBtn}}" show-fullscreen-btn="{{fullScreenBtn}}" show-play-btn="{{playBtn}}"></video>
+    </view>
+    <video wx:if="{{isIOS}}" id="classVideo" class="videoSection" src="{{videoUrl}}" autoPlay="{{autoPlay}}" controls="{{controls}}" show-center-play-btn="{{centerBtn}}" show-fullscreen-btn="{{fullScreenBtn}}" show-play-btn="{{playBtn}}"></video>
     <view class="readWorksSection">
         <view class="peopleNum">
             <image class="peoplesIcon" src="../../../static/image/peoples.png" />

pages/main/class/class.wxss

@@ -1,9 +1,10 @@
 .videoSection {
     width: 750rpx;
-    height: 428rpx;
-    background: #000;
+    height: 421.9rpx;
+    background: #fff;
 }
-.video-playBtn{
+
+.video-playBtn {
     width: 120rpx;
     height: 120rpx;
     position: absolute;
@@ -11,13 +12,15 @@
     right: 0;
     margin: 0 auto;
     z-index: 99999;
-    top: 130rpx;
+    top: 136rpx;
 }
-.videoIcon{
-    width: 750rpx;
-    height: 428rpx;
+
+.videoIcon {
+    width: 825rpx;
+    height: 363rpx;
     position: absolute;
-    top: 0;
+    top: 20rpx;
+
 }
 .classPage {
     background: #e8e8e8;
@@ -176,7 +179,7 @@ height:106rpx;
 .workCard .nickName {
     /* width: 200rpx; */
     height: 44rpx;
-    color: #000;
+    color: #444;
     font-size: 32rpx;
 }
 
@@ -204,6 +207,6 @@ height:106rpx;
 }
 
 .likes .likeNum {
-    color: #686868;
+    color: #444;
     font-size: 32rpx;
 }

pages/main/reading/reading.js

@@ -7,7 +7,7 @@ Page({
         fullScreenBtn: false,
         playBtn: false,
         gesture: true,
-        muted: true,
+        muted: false,
         gesture: false,
         centerBtn: false,
         recordFlag: 0,
@@ -29,7 +29,7 @@ Page({
             let reg = /\\n/g
             this.setData({
                 title: res.data.data.title,
-                videoUrl: res.data.data.playUrl,
+                videoUrl: res.data.data.accompany || res.data.data.playUrl,
                 img: res.data.data.iconImg,
                 id: res.data.data.id,
                 // readingText: res.data.data.lessonText.replace(reg,'')

pages/main/reading/reading.json

@@ -1 +1,3 @@
-{}
+{
+    "enablePullDownRefresh": false
+}

pages/main/reading/reading.wxml

@@ -1,4 +1,7 @@
 <view >
+    <!-- <view class="videoSection" wx:if="{{!isIOS}}">
+        <image wx:if="{{!videoLoad}}" class="videoIcon" src="{{iconImg}}" />
+    </view> -->
   <video
   id="myVideo"
   class="videoSection"

pages/main/reading/reading.wxss

@@ -1,6 +1,6 @@
 .videoSection {
     width: 750rpx;
-    height: 428rpx;
+    height: 421.9rpx;
 }
 
 audio {
@@ -18,10 +18,10 @@ audio {
 .textSection .textContent{
     font-size: 32rpx;
     line-height: 56rpx;
-    width: 100%;
-    text-align: center;
+    /* text-align: center; */
     display: block;
-    margin: 0 auto;
+    margin: 0 50rpx;
+    color: #444;
 }
 ::-webkit-scrollbar{
     width: 0;

pages/main/searchResult/searchResult.wxml

@@ -1,9 +1,12 @@
 <view class="hotWares" style="flex-direction:row;">
-            <view wx:for="{{wareCards}}" wx:key="{{index}}" class="hotWareCard" bindtap="openClass" data-classId="{{item.classId}}" data-title="{{item.title}}">
-                <image class="wareCardImg" src="{{item.img}}" />
-                <text class="wareCardTitle">{{item.title}}</text>
-                <view class="bottomData">
+    <view wx:for="{{wareCards}}" wx:key="{{index}}" class="hotWareCard" bindtap="openClass" data-classId="{{item.classId}}" data-title="{{item.title}}">
+        <image class="wareCardImg" src="{{item.img}}" />
+        <view class="resultData">
+            <text class="wareCardTitle">{{item.title}}</text>
+            <text class="wareCardTip">{{item.grade}}</text>
+        </view>
+        <!-- <view class="bottomData">
                     <text class="wareCardTip">{{item.grade}}</text>
-                </view>
-            </view>
-        </view>
+                </view> -->
+    </view>
+</view>

pages/main/searchResult/searchResult.wxss

@@ -2,8 +2,8 @@
     position: relative;
     overflow: hidden;
     width: 704rpx;
-    height: 402rpx;
-    margin: 0 auto 20rpx;
+    height: 360rpx;
+    margin: 20rpx auto;
 }
 .hotWareCard .wareCardImg {
     width: 100%;
@@ -12,17 +12,24 @@
 }
 
 
-
+.resultData{
+    display: flex;
+    align-content: space-between;
+    align-items: center
+}
 .hotWareCard .wareCardTitle {
     /* margin: 0 auto; */
     width: 100%;
     height: 46rpx;
     display: block;
     /* text-align: left; */
-    color: #414141;
+    color: #444;
     font-size: 32rpx;
     letter-spacing: 4rpx;
     font-family: MicrosoftYaHei;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
 }
 .hotWareCard .bottomData {
     height: 34rpx;

pages/social/works/works.js

@@ -7,7 +7,7 @@ Page({
     data: {
         fullScreenBtn: false,
         playBtn: true,
-        gesture: true,
+        gesture: false,
         author: '',
         videoSrc: '',
         total: '',
@@ -116,6 +116,14 @@ Page({
             this.getReply();
         })
     },
+    videoPlayHandler: function () {
+        this.setData({
+          videoLoad: true
+        }, () => {
+          this.videoCtx = wx.createVideoContext('worksVideo', this);
+          this.videoCtx.play();
+        })
+      },
     likeWorks: function (e) {
         if (this.data.isLike) {
             wx.showToast({

pages/social/works/works.json

@@ -1,5 +1,6 @@
 {
     "component": true,
+    "enablePullDownRefresh": false,
     "usingComponents": {
         "shareDialog": "/component/share/share",
         "popup": "/component/popup/popup",

pages/social/works/works.wxml

@@ -1,5 +1,11 @@
 <view>
-    <video id="worksVideo" class="videoSection" poster="{{iconImg}}" src="{{videoSrc}}" bindplay="videoPlay" bindended="videoEnd" bindpause="videoPause" muted="true" controls="false" enable-progress-gesture="false" show-fullscreen-btn="{{fullScreenBtn}}" show-play-btn="{{playBtn}}"></video>
+    <view class="videoSection" wx:if="{{!isIOS}}">
+        <cover-image wx:if="{{!videoLoad}}" class="video-playBtn" bindtap="videoPlayHandler" src="../../../static/image/play-btn.png"></cover-image>
+        <image wx:if="{{!videoLoad}}" class="videoIcon" src="{{iconImg}}" />
+       <video wx:if="{{videoLoad}}" id="worksVideo" class="videoSection" src="{{videoSrc}}" bindplay="videoPlay" bindended="videoEnd" bindpause="videoPause" muted="false" controls="false" enable-progress-gesture="{{gesture}}" show-fullscreen-btn="{{fullScreenBtn}}" show-play-btn="{{playBtn}}"></video>
+    </view>
+    <!-- <video wx:if="{{isIOS}}" id="worksVideo" class="videoSection" src="{{videoUrl}}" autoPlay="{{autoPlay}}" controls="{{controls}}" show-center-play-btn="{{centerBtn}}" show-fullscreen-btn="{{fullScreenBtn}}" show-play-btn="{{playBtn}}"></video> -->
+    <video wx:if="{{isIOS}}" id="worksVideo" class="videoSection" src="{{videoSrc}}" bindplay="videoPlay" bindended="videoEnd" bindpause="videoPause" muted="false" controls="false" enable-progress-gesture="{{gesture}}" show-fullscreen-btn="{{fullScreenBtn}}" show-play-btn="{{playBtn}}"></video>
     <view class="readAuthorSection">
         <image class="avatar" src="{{authorAvatar}}" bindtap="goToUsers" data-uid="{{authorUid}}" />
         <view class="profession" wx:if="{{authorProfession}}">{{authorProfession}}</view>
@@ -45,16 +51,15 @@
                 </view>
             </view>
             <view class="btnWrapper">
-                <image class="commentBtn" src="../../../static/image/comment.png" bindtap="goToDetail" data-id="{{item.id}}" data-index="{{index}}" />
-                <text class="commentText" bindtap="goToDetail" data-id="{{item.id}}" data-index="{{index}}">
-                    回复
-                </text>
-                <!-- <image class="commentBtn" src="../../../static/image/comment.png" bindtap="goToDetail" data-count="{{item.replyCount}}" data-id="{{item.id}}" data-index="{{index}}" />
+            <!-- <image class="commentBtn" src="../../../static/image/comment.png" bindtap="goToDetail" data-count="{{item.replyCount}}" data-id="{{item.id}}" data-index="{{index}}" />
                 <text class="commentText" bindtap="goToDetail" data-id="{{item.id}}" data-count="{{item.replyCount}}" data-index="{{index}}">评论</text> -->
                 <image class="likeBtn" src="../../../static/image/like.png" data-index="{{index}}" data-likes="{{item.likes}}" data-id="{{item.id}}" bindtap="likeCommend" />
-                <text class="likeText" data-index="{{index}}" data-likes="{{item.likes}}" data-id="{{item.id}}" bindtap="likeCommend">
-                    {{item.likes}}
+                <text class="likeText" data-index="{{index}}" data-likes="{{item.likes}}" data-id="{{item.id}}" bindtap="likeCommend">{{item.likes}}
+                </text>
+                <image class="commentBtn" src="../../../static/image/comment.png" bindtap="goToDetail" data-id="{{item.id}}" data-index="{{index}}" />
+                <text class="commentText" bindtap="goToDetail" data-id="{{item.id}}" data-index="{{index}}">回复
                 </text>
+                
             </view>
         </view>
     </view>

pages/social/works/works.wxss

@@ -1,6 +1,26 @@
 .videoSection {
     width: 750rpx;
-    height: 428rpx;
+    height: 421.9rpx;
+    background: #fff;
+}
+
+.video-playBtn {
+    width: 120rpx;
+    height: 120rpx;
+    position: absolute;
+    left: 0;
+    right: 0;
+    margin: 0 auto;
+    z-index: 99999;
+    top: 136rpx;
+}
+
+.videoIcon {
+    width: 825rpx;
+    height: 363rpx;
+    position: absolute;
+    top: 20rpx;
+
 }
 
 .readAuthorSection {
@@ -10,7 +30,7 @@
     /* justify-items: center; */
     align-items: center;
     border-bottom: solid 2rpx #f0f1f5;
-    position:relative;
+    position: relative;
 
 }
 
@@ -44,8 +64,10 @@
     width: 250rpx;
     height: 46rpx;
     font-size: 32rpx;
-    color: #101010;
-
+    color: #444;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
 }
 
 .readAuthorSection .like {
@@ -138,12 +160,12 @@
     justify-items: center;
     width: 100rpx;
     height: 100rpx;
-    margin-left: 18rpx;
+    margin-left: 24rpx;
 }
 
 .avatarRow .userItem image {
-    width: 96rpx;
-    height: 96rpx;
+    width: 86rpx;
+    height: 86rpx;
     border-radius: 50%;
 }
 
@@ -158,6 +180,7 @@
     line-height: 44rpx;
     margin-left: 20rpx;
     margin-bottom: 10rpx;
+    color: #444;
 }
 
 .commentSection .commentInput {
@@ -284,6 +307,7 @@
     font-size: 28rpx;
     line-height: 40rpx;
     margin-left: 8rpx;
+    margin-right: 30rpx;
 }
 
 .btnWrapper .likeBtn {

pages/user/myEdit/myEdit.wxml

@@ -27,6 +27,9 @@
               <text>{{ date }}</text>
             </view>
         </picker>
+         <view class='edit-img'>
+          <image src='../../../static/image/edit.png' class='icon'></image>
+        </view>
       </view>
       <view class='occupation-box'>
         <text class='setting-title'>职业</text>

pages/user/myEdit/myEdit.wxss

@@ -128,6 +128,7 @@ radio .wx-radio-input.wx-radio-input-checked{
   background: #FFFFFF;
   padding: 22rpx 0 22rpx 26rpx;
   border-radius: 12rpx;
+  position: relative;
 }
 
 .occupation-box{

pages/user/mycollection/mycollection.js

@@ -5,10 +5,12 @@ Page({
    * 页面的初始数据
    */
   data: {
-    collection_data: []
+    collection_data: [],
+    line1: '您还没有收藏过哦',
+    line2: '快去收藏自己喜欢的吧'
   },
 
-  toClass: function(e) {
+  toClass: function (e) {
     let targetCode = e.currentTarget.dataset.targetcode;
     let title = e.currentTarget.dataset.title;
     wx.navigateTo({
@@ -19,7 +21,7 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function(option) {
+  onLoad: function (option) {
     console.log(option.title);
     if (option.title) {
       wx.setNavigationBarTitle({
@@ -32,7 +34,7 @@ Page({
     httpRequestApi.myFavorites().success(res => {
       this.setData({
         collection_data: res.data.data.list
-      },() => {
+      }, () => {
         console.log(this.data.collection_data);
       });
     });
@@ -41,49 +43,49 @@ Page({
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function() {
+  onReady: function () {
 
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function() {
+  onShow: function () {
 
   },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function() {
+  onHide: function () {
 
   },
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function() {
+  onUnload: function () {
 
   },
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function() {
+  onPullDownRefresh: function () {
 
   },
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function() {
+  onReachBottom: function () {
 
   },
 
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function() {
+  onShareAppMessage: function () {
 
   }
 })

pages/user/mycollection/mycollection.json

@@ -1 +1,5 @@
-{}
+{
+    "usingComponents": {
+        "myPlacerholder": "/component/myPlacerholder/myPlacerholder"
+    }
+}

pages/user/mycollection/mycollection.wxml

@@ -10,4 +10,5 @@
       <view class='left'>{{ item.summary }}</view>
     </view> 
   </view>
+   <myPlacerholder line1="{{line1}}" line2="{{line2}}" wx:if="{{collection_data.length <= 0}}" />  
 </view>

pages/user/mycollection/mycollection.wxss

@@ -1,6 +1,6 @@
 .my-collection{
   width: 750rpx;
-  background: #F0F1F5;
+  /* background: #F0F1F5; */
 }
 .collection-article{
   margin-bottom: 4rpx;

pages/user/myconcern/myconcern.js

@@ -7,7 +7,10 @@ Page({
       fullScreenBtn: false,
       playBtn: false,
       gesture: true,
-      fanList:[]
+      fanList:[],
+      imageShow: false,
+      line1: '您暂时没有关注过其他人哦',
+      line2: '快去关注其他人吧'
   },
   toUserDetails: function(e){
     let uid = e.currentTarget.dataset.uid;

pages/user/myconcern/myconcern.json

@@ -1 +1,5 @@
-{}
+{
+    "usingComponents": {
+        "myPlacerholder": "/component/myPlacerholder/myPlacerholder"
+    }
+}

pages/user/myconcern/myconcern.wxml

@@ -24,4 +24,5 @@
       </view>
     </view>
   </view>
+  <myPlacerholder imageShow="{{imageShow}}" line1="{{line1}}" line2="{{line2}}" wx:if="{{fanList.length <= 1}}" />        
 </view>

pages/user/mycourse/mycourse.js

@@ -6,32 +6,9 @@ Page({
    */
   data: {
     title: '',
-    bookList: [
-      // {
-      //   iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
-      //   title: '一年级语文下学期'
-      // },
-      // {
-      //   iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
-      //   title: '二年级语文下学期'
-      // },
-      // {
-      //   iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
-      //   title: '三年级语文下学期'
-      // },
-      // {
-      //   iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
-      //   title: '一年级语文下学期'
-      // },
-      // {
-      //   iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
-      //   title: '二年级语文下学期'
-      // },
-      // {
-      //   iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
-      //   title: '三年级语文下学期'
-      // }
-    ]
+    bookList: [],
+    line1: '您还没有课程哦',
+    line2: '拥有了课程再来看看吧'
   },
   // 进入课本
   toCourse: function(e) {

pages/user/mycourse/mycourse.json

@@ -1 +1,5 @@
-{}
+{
+    "usingComponents": {
+        "myPlacerholder": "/component/myPlacerholder/myPlacerholder"
+    }
+}

pages/user/mycourse/mycourse.wxml

@@ -6,5 +6,6 @@
       </view>
       <view class='item-title'>{{ item.groupTitle }}</view>
     </view>    
-  </block>             
+  </block> 
+  <myPlacerholder line1="{{line1}}" line2="{{line2}}" wx:if="{{bookList.length <= 0}}" />            
 </view>

pages/user/mycourse/mycourse.wxss

@@ -30,4 +30,5 @@
   text-overflow: ellipsis;
   overflow: hidden;
   white-space: nowrap;
+  text-align: center;
 }

pages/user/myread/myread.js

@@ -6,7 +6,9 @@ Page({
    */
   data: {
     wareCards: [],
-    user: {}
+    user: {},
+    line1: '您还没有朗读过哦',
+    line2: '快去朗读吧'
   },
 
   toWork: function (e) {

pages/user/myread/myread.json

@@ -1 +1,5 @@
-{}
+{
+    "usingComponents": {
+        "myPlacerholder": "/component/myPlacerholder/myPlacerholder"
+    }
+}

pages/user/myread/myread.wxml

@@ -34,4 +34,5 @@
       </view>
     </view> 
   </view>
+   <myPlacerholder line1="{{line1}}" line2="{{line2}}" wx:if="{{wareCards.length <= 0}}" />  
 </view>

pages/user/myread/myread.wxss

@@ -1,6 +1,6 @@
 .my-read{
   width: 750rpx;
-  background: #F0F1F5;
+  /* background: #F0F1F5; */
 }
 
 .user-info{
@@ -117,7 +117,7 @@
   height: 50rpx;
   font-size: 32rpx;
   font-weight: 500;
-  color: #414141;
+  color: #444;
 }
 
 .content-detail{
@@ -127,6 +127,7 @@
   justify-content: space-between;
   align-items: center;
   font-size: 24rpx;
+  color: #444;
 }
 
 .left{

pages/user/walletDetails/walletDetails.json

@@ -1 +1,5 @@
-{}
+{
+    "usingComponents": {
+        "myPlacerholder": "/component/myPlacerholder/myPlacerholder"
+    }
+}

pages/user/walletDetails/walletDetails.wxml

@@ -24,4 +24,5 @@
       </view>
     </view>
   </view>
+    <myPlacerholder wx:if="{{walletDatails.length <= 0}}" />  
 </view>

utils/APIClient.js

@@ -131,10 +131,10 @@ module.exports = {
     }).send();
   },
   // 获取关注用户的作品列表
-  getFollowWorks(uid, pageNo, pageSize) {
+  getFollowWorks(pageNo, pageSize) {
     let url = getBaseUrl(`wx/fans/interest`);
     return request.getInstance().header({
-      uid
+      uid: wx.getStorageSync('uid')
     }).url(url).data({
       pageNo: pageNo,
       pageSize: pageSize

utils/WXHttpRequest.js

@@ -1,8 +1,9 @@
 module.exports = {
 	getInstance: function() {
-		wx.showLoading({
+		wx.showToast({
 			title: '加载中...',
-			mast: true
+			icon: 'loading',
+			duration: 600
 		})
 		return {
 			_sucCallback: null,
@@ -28,16 +29,16 @@ module.exports = {
 			},
 			success: function(callback) {
 				this._sucCallback = callback;
-				setTimeout(function () {
-					wx.hideLoading()
-				  }, 200)
+				// setTimeout(function () {
+				// 	wx.hideLoading()
+				//   }, 200)
 				return this;
 			},
 			fail: function(callback) {
 				this._failCallback = callback;
-				setTimeout(function () {
-					wx.hideLoading()
-				  }, 200)
+				// setTimeout(function () {
+				// 	wx.hideLoading()
+				//   }, 200)
 				return this;
 			},
 			url: function(url) {

utils/const.js

@@ -2,10 +2,10 @@
 module.exports = {
 
 	// ----测试环境-----
-	// productApi: 'https://readerproduct.efunbox.cn/',
-	// baseApi: 'https://readerbase.efunbox.cn/'
+	productApi: 'https://readerproduct.efunbox.cn/',
+	baseApi: 'https://readerbase.efunbox.cn/'
 
 	// // ----正式环境-----
-	productApi: 'https://readerproduct.ai160.com/',
-	baseApi: 'https://readerbase.ai160.com/'
+	// productApi: 'https://readerproduct.ai160.com/',
+	// baseApi: 'https://readerbase.ai160.com/'
 }