Signed-off-by: yukangzhe <382985154@qq.com>

.idea/workspace.xml

@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="cd8ac201-2758-4536-b3fd-5624eb2feade" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pages/piano/piano.js" afterPath="$PROJECT_DIR$/pages/piano/piano.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pages/makePiano/makePiano.json" afterPath="$PROJECT_DIR$/pages/makePiano/makePiano.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app.json" afterPath="$PROJECT_DIR$/app.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pages/piano/piano.wxml" afterPath="$PROJECT_DIR$/pages/piano/piano.wxml" />
-    </list>
+    <list default="true" id="cd8ac201-2758-4536-b3fd-5624eb2feade" name="Default" comment="" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -50,7 +45,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -65,8 +60,8 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
       <pane id="Scratches" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -487,11 +482,12 @@
       <updated>1613983229762</updated>
       <workItem from="1613983232628" duration="55000" />
       <workItem from="1615251834574" duration="703000" />
+      <workItem from="1615451033969" duration="31000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="758000" />
+    <option name="totallyTimeSpent" value="789000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="0" />
@@ -510,7 +506,7 @@
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25266525" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2553305" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />

pages/classOrder/classOrder.wxml

@@ -10,11 +10,11 @@
         <view class="order-nums" wx:if="{{item.orderType == 2}}">× {{item.nums}}(天)</view>
         <view class="order-addr">{{item.address}}</view>
         <view class="order-price">原价：￥ {{item.totalAmount}}</view>
-        <view class="order-teacher">老师：{{item.teacherName}}</view>
+        <view class="order-teacher"><text wx:if="{{item.teacherName}}">老师：</text>{{item.teacherName}}</view>
         <view class="order-payMoney">实付：<text>￥ {{item.classesActualAmount}}</text></view>
         <view class="order-title">订单号</view>
         <view class="order-orderNum">{{item.orderNum}} </view>
-        <view class="order-payTime">付款时间：{{item.payDate}}</view>
+        <view class="order-payTime" wx:if="{{item.payDate}}">付款时间：{{item.payDate}}</view>
         <view class="order-payTime" wx:if="{{item.refundStatus == 4}}">退款时间：{{item.refundDate}}</view>
       </view>
     </view>

pages/classOrder/classOrder.wxss

@@ -77,6 +77,10 @@ page{
     line-height: 60rpx;
     color: #999;
 }
+.order-payTime{
+  width: 500rpx;
+  text-align: right;
+}
 /* loading */
 .loading {
   height: 200rpx;

pages/index/index.js

@@ -170,7 +170,14 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    this.loadIndexData();
+    if(!wx.getStorageSync('openId')){
+      wx.redirectTo({
+        url: '/pages/login/login',
+      })
+      return
+    } else {
+      this.loadIndexData();
+    }
   },
 
   /**
@@ -283,7 +290,6 @@ Page({
           this.setData({
             'curStu': student
           })
-
           // 放入 strong中
           wx.setStorageSync('student', student);
         }

pages/leave/leave.js

@@ -196,6 +196,7 @@ Page({
       const curTemDate = temDate.getFullYear()+ "-" + (temDate.getMonth() + 1) + "-" + temDate.getDate() + ' 00:00:00';
       dateCheck = (curTemDate.replace(/-/g, '/') >= attenceTime.replace(/-/g, '/'));
     }
+    
     return (item.isAttend === 0 && item.leaveCount > 0 && timeCheck && dateCheck && (item.status === 0 || item.status === 4));
   },
 })

pages/login/login.js

@@ -7,7 +7,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    isPage: '',
+    isId: ''
   },
 
   /**
@@ -18,6 +19,12 @@ Page({
       title: '加载中',
       mask: true
     })
+    if(options.isPage){
+      this.setData({
+        isPage: options.isPage,
+        isId: options.isId
+      })
+    }
     this.getVersion()
   },
 
@@ -30,9 +37,6 @@ Page({
     ).then(res => {
       if (res.version != app.globalData.ver) {
         wx.setStorageSync('isShow', false)
-        wx.switchTab({
-          url: '/pages/index/index',
-        })
       } else {
         wx.setStorageSync('isShow', true)
         this.getOpenId()
@@ -115,12 +119,16 @@ Page({
         wx.showToast({
           title: '登录成功',
         })
+       if(this.data.isPage){
+        wx.redirectTo({
+          url: '/pages/'+this.data.isPage+"/"+this.data.isPage+"?proId="+this.data.isId,
+        })
+       } else {
         wx.switchTab({
           url: '/pages/index/index'
         })
-        // wx.navigateTo({
-        //   url: '/pages/doTask/doTask',
-        // })
+       }
+        
       } else {
         wx.showToast({
           title: rs.errMsg,

pages/payDone/payDone.js

@@ -0,0 +1,105 @@
+// pages/payDone/payDone.js
+const app = getApp()
+const util = require('../../utils/util')
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    childTitle:"支付完成",
+    otherList:[],
+    type:""
+  },
+  redirectTo:function(){
+    let pages = getCurrentPages();
+    let prevPage = pages[pages.length - 2];
+    prevPage.setData({
+          payDone: true,
+    })
+    wx.navigateBack({
+      delta: 1,
+    })
+  },
+
+  toIndex:function(){
+   wx.switchTab({
+     url: '/pages/index/index',
+   })
+    
+  },
+
+  toOrder:function(){
+    wx.redirectTo({
+      url:'/pages/cardList/cardList',
+    })
+  },
+
+  tapClass:function(event){
+    const id = event.currentTarget.id
+    wx.redirectTo({
+      url:'/pages/cardList/cardList',
+    })
+  },
+
+ 
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    const money = options.money
+    this.setData({
+      money:money,
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+    
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/payDone/payDone.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/payDone/payDone.wxml

@@ -0,0 +1,16 @@
+	<view>
+		<view class="page-body">
+			<navTop title="{{childTitle}}"></navTop>
+			<icon class="icon-box-img" type="success" size="72"></icon>
+			<view class="pay-type">
+				支付成功
+			</view>
+			<view class="pay-money">
+				￥{{money}}
+			</view>
+			<view class="btn-view">
+				<view bindtap="toIndex">返回首页</view>
+				<view bindtap="toOrder">查看订单</view>
+			</view>
+		</view>
+	</view>

pages/payDone/payDone.wxss

@@ -0,0 +1,40 @@
+/* pages/payDone/payDone.wxss */
+page{
+  background: #f2f2f2;
+}
+.page-body{
+  background: #FFF;
+  padding-bottom: 40rpx;
+}
+.icon-box-img{
+ margin: 0 auto;
+}
+view{
+  text-align: center;
+}
+.btn-view{
+  display: flex;
+  margin-top: 100rpx;
+}
+.btn-view view{
+  margin: 0 auto;
+  font-size: 30rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  width: 280rpx;
+  color: #cc6031;
+  border:1px solid #cc6031;
+  border-radius: 50rpx;
+}
+.btn-view view:last-child{
+    background: #cc6031;
+    color: #FFF;
+}
+.pay-type{
+  font-size: 26rpx;
+  margin: 20rpx 0;
+}
+.pay-money{
+  font-size: 48rpx;
+}
+

pages/pianoDetail/pianoDetail.js

@@ -15,7 +15,8 @@ Page({
     schoolList: [],
     moreFlag: 0,
     isBuy: true,
-    downLoadShow: false
+    downLoadShow: false,
+    params:{}
   },
 
   getMoreSchool: function () {
@@ -78,16 +79,64 @@ Page({
     }
   },
 
+  queryList: function (id) {
+    const urls = urlDef.urls;
+      let params = {id:id}
+      util.apiPost(urls.get_piano_card_list, params).then(rs => {
+        if( rs[0].schemeType == 1){
+          this.setData({
+            isBuy: false
+          })
+        }
+        this.setData({ item: rs[0], initMoney: rs[0].money })
+      })
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    let urls = urlDef.urls
-    let item = JSON.parse(options.data)
-    if (item.imgUrl == null || item.imgUrl == undefined) {
-      item.imgUrl = urls.oss_file + 'image/0e02f9fc-1d41-4551-a150-b1be8196b49d.jpg'
+    if(options.studentId){
+     const params = {
+        studentId: options.id,
+        id: options.id
+     }
+     this.setData({
+      params
+     })
+     this.queryList(options.id)
+    } else if(options.proId){
+      this.queryList(options.proId)
+    } else {
+      let urls = urlDef.urls
+      let item = JSON.parse(options.data)
+      if(item.schemeType == 1){
+        this.setData({
+          isBuy: false
+        })
+      }
+      if (item.imgUrl == null || item.imgUrl == undefined) {
+        item.imgUrl = urls.oss_file + 'image/0e02f9fc-1d41-4551-a150-b1be8196b49d.jpg'
+      }
+      this.setData({ item: item, initMoney: item.money })
     }
-    this.setData({ item: item, initMoney: item.money })
+  },
+
+  showDownLoad:function(){
+    // this.setData({
+    //   downLoadShow: true
+    // })
+    wx.navigateToMiniProgram({
+      appId: 'wx4efd688fa52ba3f7',
+      path: 'pages/welcome/welcome?isPage=buyCard&isId='+this.data.item.id,
+      extraData: {
+        foo: 'bar'
+      },
+      envVersion: 'trial',
+      success(res) {
+        // 打开成功
+      }
+    })
   },
 
   /**
@@ -139,10 +188,19 @@ Page({
 
   }, 
   tabBuy: function () {
-    let stu = wx.getStorageSync('student');
+    // let stu = wx.getStorageSync('student');
+    let stu = null
+    let id = null
+    if(this.data.params.studentId){
+      stu = this.data.params
+      id = this.data.params.id
+    } else {
+      stu = wx.getStorageSync('student');
+      id = this.data.item.id;
+    }
     util.doPost(
       'buyPianoCard',{
-        id: this.data.item.id,
+        id: id,
         studentId: stu.studentId
       }).then(res =>{
         if(res.success == 1){
@@ -177,9 +235,9 @@ Page({
           signType: payData.signType,
           paySign: payData.paySign,
           success: function (res) {
-            // wx.redirectTo({
-            //   url: '/pages/payDone/payDone?money=' + that.data.orderInfo.paidAmount + "&type=App",
-            // })
+            wx.redirectTo({
+              url: '/pages/payDone/payDone?money=' + that.data.initMoney,
+            })
             console.log('payment success ... ' + JSON.stringify(res));
           },
           fail: function (res) {

pages/pianoDetail/pianoDetail.wxml

@@ -102,7 +102,7 @@
     </view>
 
     <view class="buy-btn" bindtap="showDownLoad"  wx:if="{{!isBuy}}">
-      请前往App购买
+      前往艾克斯朗购买
     </view>
     <view class="downLoad-bg" bindtap="hideDownLoad" wx:if="{{downLoadShow}}"></view>
     <view class="downLoad-code" wx:if="{{downLoadShow}}">

pages/pianoDetailCode/pianoDetail.wxss

@@ -13,7 +13,7 @@ page {
   width: 650rpx;
   display: flex;
   background: #FFF;
-  margin-top: 20rpx;
+  margin: 20rpx 25rpx 0;
   padding: 20rpx 25rpx;
   border-bottom: 1px dashed #CCC;
 }
@@ -101,6 +101,7 @@ page {
   width: 700rpx;
   margin: 0 25rpx;
   box-shadow: 0 0 10rpx #eee;
+  padding-bottom: 10rpx;
 }
 
 .code-view image {
@@ -112,8 +113,8 @@ page {
 .other-view {
   width: 700rpx;
   background: #FFF;
-  margin: 0 25rpx;
-  padding-bottom: 20rpx;
+  margin: 20rpx 25rpx;
+  padding: 20rpx 0;
 }
 
 .other-view view {

pages/student/student.js

@@ -11,7 +11,7 @@ Page({
     height: 0,
     animation: {},
     left: 750,
-    shareImg: 'https://app.schoolwisdoms.com/static/app/student/imgs/share-bill.png',
+    shareImg: '/images/student-share.jpg',
     inviteConfig: {},
     count: 0,
     enroll: 0,
@@ -29,16 +29,16 @@ Page({
       images: [{
         x: 0,
         y: 0,
-        url: 'https://app.schoolwisdoms.com/static/app/student/imgs/share-bill.png',
+        url: '/images/student-share.jpg',
         width: 700,
         height: 900,
         zIndex:1,
       }, {
-        x: 250,
-        y: 640,
+        x: 460,
+        y: 670,
         url: '',
-        width: 200,
-        height: 200,
+        width: 150,
+        height: 150,
         zIndex: 2
       }],
     },
@@ -289,9 +289,15 @@ Page({
     }
   },
   codeInvite: function () {
+   if(!this.data.showCodeImg){
     this.setData({
       showCodeImg: true
     })
+   } else {
+    this.setData({
+      showCodeImg: false
+    })
+   }
   }
 
 })

pages/student/student.wxml

@@ -6,20 +6,29 @@
   <!-- 海报 -->
   <view class="shareImg-view" wx:if="{{showShareImg}}">
     <image src="{{shareImg}}"></image>
-    <image class="code-img" src="{{qrCodeImg}}"></image>
+    <image class="code-img" mode="widthFix" src="{{qrCodeImg}}"></image>
     <view class="shareImg-btn">
-      <!-- <button open-type='share' class="edit-view shareBtn">
+      <button open-type='share' class="edit-view shareBtn">
         <image src="https://app.schoolwisdoms.com/static/app/student/imgs/wechat.png"></image>
-        <view>分享好友</view>
-      </button> -->
+        <text>分享好友</text>
+      </button>
       <view class="downloadBtn edit-view">
         <view>
           <poster id="poster" config="{{posterConfig}}" bind:success="onPosterSuccess">
             <image src="https://app.schoolwisdoms.com/static/app/student/imgs/download-to-images.png"></image>
-            <view class="save-image">保存图片</view>
+            <text class="save-image">保存图片</text>
           </poster>
         </view>
       </view>
+
+      <view class="downloadBtn edit-view">
+        <view class="" bindtap="codeInvite">
+          <image class="icon-img" mode="heightFix"
+            src="/images/saoma.png"></image>
+          <text>面对面扫码</text>
+        </view>
+      </view>
+
     </view>
   </view>
   <!-- end -->
@@ -30,21 +39,21 @@
   </view>
   <!-- end -->
 
-  <image class="bgImg" mode="widthFix" src="https://app.schoolwisdoms.com/static/app/student/imgs/invitation_bg.png">
+  <image class="bgImg" mode="widthFix" src="/images/student-bg.jpg">
   </image>
-  <view class="btn-view">
-    <view class="left-radius"></view>
-    <view class="right-radius"></view>
-    <view class="btn-box">
-      <view class="share-btn" bindtap="billShare">海报分享邀请好友</view>
+  <!-- <view class="btn-view"> -->
+  <!-- <view class="left-radius"></view>
+    <view class="right-radius"></view> -->
+  <!-- <view class="btn-box"> -->
+  <!-- <view class="share-btn" bindtap="billShare">海报分享邀请好友</view>
       <view class="line"></view>
-      <view class="other-btn">
-        <!-- <view class="" bindtap="share">
+      <view class="other-btn"> -->
+  <!-- <view class="" bindtap="share">
           <image class="icon-img" mode="heightFix"
             src="https://app.schoolwisdoms.com/static/app/student/imgs/sm_link.png"></image>
           <text>链接邀请</text>
         </view> -->
-        <button open-type='share' class="edit-view shareBtn">
+  <!-- <button open-type='share' class="edit-view shareBtn">
           <image class="icon-img" mode="heightFix" src="https://app.schoolwisdoms.com/static/app/student/imgs/sm_link.png"></image>
           <view>链接邀请</view>
         </button>
@@ -53,11 +62,15 @@
             src="https://app.schoolwisdoms.com/static/app/student/imgs/sm_code.png"></image>
           <text>面对面扫码</text>
         </view>
-      </view>
-    </view>
+      </view> -->
+  <!-- </view> -->
+  <!-- </view> -->
+  <!-- <image class="bgImg step-one" mode="widthFix"
+    src="https://app.schoolwisdoms.com/static/app/student/imgs/invitation-c1.png"></image> -->
+ <view class="bottom-box">
+  <view class="share-btn-box" bindtap="billShare">
+    立即邀请
   </view>
-  <image class="bgImg step-one" mode="widthFix"
-    src="https://app.schoolwisdoms.com/static/app/student/imgs/invitation-c1.png"></image>
   <image class="bgImg step-two" mode="widthFix"
     src="https://app.schoolwisdoms.com/static/app/student/imgs/invitation-c2.png"></image>
   <view class="total-view">
@@ -74,11 +87,13 @@
       <text>获得奖励</text>
     </view>
   </view>
-  <image class="bgImg step-three" mode="widthFix"
-    src="https://app.schoolwisdoms.com/static/app/student/imgs/invitation-c3.png"></image>
+  <!-- <image class="bgImg step-three" mode="widthFix"
+    src="https://app.schoolwisdoms.com/static/app/student/imgs/invitation-c3.png"></image> -->
   <view class="total-view" wx:for="{{invitations}}" wx:key="index">
     <view>{{item.name}}</view>
     <view>{{item.subDate}}</view>
     <view>{{item.statusText}}</view>
   </view>
+
+ </view>
 </view>

pages/student/student.wxss

@@ -1,7 +1,10 @@
 /* pages/student/student.wxss */
+
 .bgImg{
   width: 100%;
-  background: #FA1E17;
+  position: relative;
+  z-index: 2;
+  /* background: #FA1E17; */
 }
 .icon-img{
   height: 48rpx;
@@ -67,6 +70,7 @@ image{
 .step-two,.step-three{
   background: none;
 }
+
 .step-three{
   border-top: 20rpx solid #eee;
   width: 58%;
@@ -153,7 +157,7 @@ image{
     height: 100%;
     background: #333;
     width: 750rpx;
-    z-index: 2;
+    z-index: 3;
     opacity: 0.4;
 }
 
@@ -171,12 +175,12 @@ image{
 }
 .code-img{
     background: #FFF;
-    width: 200rpx !important;
-    height: 200rpx !important;
+    width: 150rpx !important;
+    height: 150rpx !important;
     position: absolute;
-    bottom: 60rpx;
+    bottom: 110rpx;
     left: 50%;
-    margin-left: -100rpx;
+    margin-left: 100rpx;
 }
 .shareImg-btn{
   width: 700rpx;
@@ -186,12 +190,21 @@ image{
   position: fixed;
   z-index: 3;
   display: flex;
+  font-size: 28rpx !important;
+}
+.shareImg-btn button,.shareImg-btn>view{
+  width: 220rpx !important;
+  text-align: center;
+}
+.shareImg-btn text{
+  font-size: 28rpx;
 }
 .shareImg-btn image{
   width: 100rpx;
   height: 100rpx;
-  margin-left: 25rpx;
+  margin-left: 60rpx;
   margin-bottom: 10rpx;
+  margin-top: 0 !important;
 }
 .shareImg-btn>view{
   margin: 0 auto;
@@ -199,10 +212,9 @@ image{
 .edit-view{
   text-align: center;
   width: 150rpx;
-  font-size: 32rpx;
 }
 .downloadBtn{
-    width: 150rpx !important;
+    /* width: 150rpx !important; */
     background: #FFF;
     text-align: center;
     padding: 0;
@@ -210,14 +222,17 @@ image{
     font-size: 32rpx;
 }
 .shareBtn{
-  width: 270rpx !important;
+  /* width: 270rpx !important; */
   margin-left: 0 !important;
   text-align: center;
     padding: 0;
     font-weight: 400;
     font-size: 32rpx;
+    background: #FFF;
+}
+.shareBtn image{
+  margin-left: 60rpx;
 }
-
 .shareCodeImg-view{
   position: fixed;
     z-index: 3;
@@ -234,4 +249,25 @@ image{
   width: 400rpx;
     height: 400rpx;
     margin: 50rpx 150rpx;
+}
+
+.share-btn-box{
+  width: 680rpx;
+  margin: 0 35rpx;
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+  position: absolute;
+  top: 122rpx;
+  background: linear-gradient(183deg, #F99561 0%, #EB5E40 100%);
+  color: #FFF;
+  font-size: 32rpx;
+  border-radius: 10rpx;
+  z-index: 3;
+}
+
+.bottom-box{
+  position: relative;
+    margin-top: -110rpx;
+    z-index: 1;
 }

utils/urls.js

@@ -1,5 +1,6 @@
-const baseUrl = 'https://demo.schoolwisdoms.com';
+// const baseUrl = 'https://demo.schoolwisdoms.com';
 // const baseUrl = 'https://app.schoolwisdoms.com';
+const baseUrl = 'https://excl.schoolwisdoms.com';
 
 // const baseUrl = 'http://192.168.2.103';
 

utils/util.js

@@ -161,6 +161,10 @@ function setAccessHeader(accessKey, appId) {
 
 function apiPost(url, params, contentType) {
   return new Promise((resolve, reject) => {
+    wx.showLoading({
+      title: '加载中',
+      mask: true
+    })
     let headers = getHeaders();
     headers['Content-Type'] = 'application/x-www-form-urlencoded';
     if (contentType) {
@@ -194,6 +198,11 @@ function apiPost(url, params, contentType) {
             })
           },
         })
+      },
+      complete: res =>{
+        wx.hideLoading({
+          success: (res) => {},
+        })
       }
     })
   }).catch(err => {
@@ -203,6 +212,10 @@ function apiPost(url, params, contentType) {
 
 function doPost(url, params) {
   return new Promise((resolve, reject) => {
+    wx.showLoading({
+      title: '加载中',
+      mask: true
+    })
     let headers = getHeaders();
     headers['Content-Type'] = 'application/x-www-form-urlencoded';
     wx.request({
@@ -233,6 +246,11 @@ function doPost(url, params) {
             })
           },
         })
+      },
+      complete: res =>{
+        wx.hideLoading({
+          success: (res) => {},
+        })
       }
     })
   }).catch(err => {
@@ -242,6 +260,10 @@ function doPost(url, params) {
 
 function notWxPost(url, params) {
   return new Promise((resolve, reject) => {
+    wx.showLoading({
+      title: '加载中',
+      mask: true
+    })
     let headers = getHeaders();
     headers['Content-Type'] = 'application/x-www-form-urlencoded';
     wx.request({
@@ -272,6 +294,11 @@ function notWxPost(url, params) {
             })
           },
         })
+      },
+      complete: res =>{
+        wx.hideLoading({
+          success: (res) => {},
+        })
       }
     })
   }).catch(err => {