增加课程简介，修改是否登录跳转方式

app.js

@@ -5,6 +5,7 @@ App({
     colorUI,//挂载到app上
     colorUISdk,
     information:{},
+    phone:'13520051245',
     onLaunch() {
         //console.log(colorUISdk.isRandom.getRandom(6))
         //console.log(colorUISdk.version)

pages/document/coursedetails/coursedetails.js

+
+import Toast from '../../../vantPackage/toast/toast';
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+      course:{
+        name:'',
+        note:'',
+        price:''
+      }
+  },
+  onClickLeft(){
+    wx.navigateBack({
+      delta: 1,
+    })
+  },
+  toSign(){
+    wx.navigateTo({
+      url: `/pages/document/subsign/subsign?price=${this.data.course.price}&name=${this.data.course.name}`,
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+      const {name,note,price} = options;
+      this.setData({
+        ["course.name"]:name == 'null' ? '' : name,
+        ["course.note"]:note == 'null' ? '暂无介绍' : note,
+        ["course.price"]:price == 'null' ? '' : price
+      })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

pages/document/coursedetails/coursedetails.json

+{
+  "usingComponents": {}
+}
\ No newline at end of file

pages/document/coursedetails/coursedetails.wxml

+<!-- 课程详情 -->
+
+<ui-sys>
+    <ui-navbar isSlot>
+        <view style="width: 100%;height: 100%;">
+            <van-nav-bar
+  title="课程介绍"
+  left-text="返回"
+  left-arrow
+  border="{{false}}"
+  bind:click-left="onClickLeft"
+/>
+        </view>
+    </ui-navbar>
+    <view class="box">
+      <van-cell-group>
+  <van-cell title="课程名称" value="{{course.name}}" />
+  <van-cell title="课程简介" value="{{course.note}}" />
+  <van-cell title="课程价格">
+  <view><text>¥</text><text class="price">{{course.price}}</text></view>
+  </van-cell>
+</van-cell-group>
+    <view class="btn">
+<van-button type="primary" block color="#1989fa"  bind:click="toSign">立即报名</van-button>
+      
+    </view>
+    </view>
+    <van-toast id="van-toast" />
+</ui-sys>
+

pages/document/coursedetails/coursedetails.wxss

+.van-nav-bar{
+  padding-top: 0px !important;
+}
+.box{
+  width: 100%;
+  margin-top: 20rpx;
+  background-color: #ffffff;
+}
+.price{
+  color: brown;
+}
+.btn{
+  width: 96%;
+  margin: 30rpx auto 0;
+}
\ No newline at end of file

pages/document/subsign/subsign.js

@@ -169,25 +169,25 @@ Page({
           url: '/pages/uploadcard/uploadcard',
         })
     },
-    success(res){
-        const {cancel} = res.detail;
-        if(cancel){
-            wx.navigateBack({
-              delta: 1,
-            })
-        }else{
-            //判断是否登录，登录继续填报，未登录去登录
-            let token  = wx.getStorageSync('token');
-            if(token == ''){
-                Toast('您还未登录，请先去登录');
-                setTimeout(()=>{
-                    wx.switchTab({
-                      url: "/pages/my/home",
-                    })
-                },2000)
-            }
-        }
-    },
+    // success(res){
+    //     const {cancel} = res.detail;
+    //     if(cancel){
+    //         wx.navigateBack({
+    //           delta: 1,
+    //         })
+    //     }else{
+    //         //判断是否登录，登录继续填报，未登录去登录
+    //         let token  = wx.getStorageSync('token');
+    //         if(token == ''){
+    //             Toast('您还未登录，请先去登录');
+    //             setTimeout(()=>{
+    //                 wx.switchTab({
+    //                   url: "/pages/my/home",
+    //                 })
+    //             },2000)
+    //         }
+    //     }
+    // },
     /**
      * 生命周期函数--监听页面加载
      */
@@ -197,7 +197,9 @@ Page({
         //     price = 
         // }
         this.setData({
-            ["fromDate.price"]:options.price
+            ["fromDate.price"]:options.price,
+            phone:app.phone,
+            ["fromDate.phone"]:app.phone
         })
     },
 
@@ -205,7 +207,6 @@ Page({
      * 生命周期函数--监听页面初次渲染完成
      */
     onReady: function () {
-        
     },
 
     /**

pages/document/subsign/subsign.wxml

@@ -11,7 +11,7 @@
 />
         </view>
     </ui-navbar>
-    <ui-modal show="{{isSignupShow}}"  title="报名需知" bind:success='success'>
+    <ui-modal show="{{true}}"  showCancel="{{false}}"  title="报名需知" >
         <scroll-view scroll-y="true" style="height: 300rpx;" bindscrolltoupper="upper" bindscrolltolower="lower"  scroll-into-view="{{toView}}" scroll-top="{{scrollTop}}">
           <view id="demo1" class="scroll-view-item">
             <text>特种作业人员操作证办理办事指南

pages/home/home.wxml

@@ -19,7 +19,12 @@
 
 
     <view class="ui-container">
-
+        <van-notice-bar
+  left-icon="volume-o"
+  background="transparent"
+  color="#1989FA"
+  text="无论我们能活多久，我们能够享受的只有无法分割的此刻，此外别无其他。——shadowlover"
+/>
         <block >
             <ui-title title="企业介绍" depth="2" isIcon ui="ml-3"/>
             <view class="ui-grid ui-cols-2">
@@ -46,7 +51,7 @@
 
                 <block wx:for="{{courseData}}" wx:for-index="id" wx:key="course_index">
                     <view class="ui-item p-3" >
-                    <app-nav-li data="{{item}}"  navurl="/pages/document/subsign/subsign?price={{item.price}}&name={{item.name}}"/>
+                    <app-nav-li data="{{item}}"  navurl="/pages/document/coursedetails/coursedetails?price={{item.price}}&name={{item.name}}&note={{item.note}}"/>
                     </view> 
                 </block>
             </view>

pages/my/home.js

@@ -109,5 +109,11 @@ Page({
         })
     },
     onShow:function(){
+        let token = wx.getStorageSync('token');
+        if(token == ''){
+            this.setData({
+                show:true
+            })
+        }
     }
 })

pages/signup/signup.js

@@ -32,6 +32,7 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+     
         ///pages/document/subsign/subsign?name={{item.name}}&price={{item.price}}
         // if(options.type == '1'){
         //     this.setData({isperson:'个人报名'})
@@ -44,7 +45,18 @@ Page({
      * 生命周期函数--监听页面初次渲染完成
      */
     onReady: function () {
-      
+        let token = wx.getStorageSync('token');
+        if(token == ''){
+            wx.showToast({
+              title: '您还未登录，即将跳转登录',
+              icon: 'none'
+            })
+            setTimeout(()=>{
+                wx.switchTab({
+                  url: '/pages/my/home',
+                })
+            },2000)
+        }
     },
 
     /**