Merge branch 'master' of http://git.censoft.com.cn/train/train_vue

pages/my/home.js

@@ -4,8 +4,7 @@ Page({
     data: {
         scrollTop: 0,
         show:false,
-        title:'登录,享受更多服务。',
-        phone:'',
+        title:'登录,享受更多服务。'
     },
     tapToUrl() {
         // wx.navigateTo({
@@ -30,14 +29,17 @@ Page({
         return str;
     },
     getPhoneNumber (e) {
-        console.log(e.detail);
-       // let random = Math.random().toString(36).substr(2);
-        let random =  this.randomWord(false, 43);
-        console.log(random);
         //如果返回成功手机号，就随机生成一串字符串存进去
         if(e.detail.code !== undefined){
+            // let random = Math.random().toString(36).substr(2);
+            let random =  this.randomWord(false, 43);
             try {
                 wx.setStorageSync('token', random);
+                Toast.success('登录成功');
+                this.setData({
+                    show:false,
+                    title:13520051245
+                })
               } catch (e) {
                 wx.showToast({
                     title: '数据存储失败！',
@@ -74,30 +76,28 @@ Page({
         });
     },
     mycenter(){
-        let token = wx.getStorageSync('token');
-        if(token == ''){
+        let token  = wx.getStorageSync('token'); //是否登录
+        if(token != ''){
+            wx.navigateTo({
+              url: '/pages/seeSignup/seeSignup',
+            })
+        }else{
             this.setData({
                 show:true
             })
-        }else{
+        }
+      },
+      seesign(){
+        let token  = wx.getStorageSync('token'); //是否登录
+        if(token != ''){
             wx.navigateTo({
               url: '/pages/seeSignup/seeSignup',
             })
+        }else{
+            this.setData({
+                show:true
+            })
         }
-        // url="/pages/seeSignup/seeSignup"
-      },
-      seesign(){
-        //url="/pages/seeSignup/seeSignup"
-            let token = wx.getStorageSync('token');
-            if(token == ''){
-                this.setData({
-                    show:true
-                })
-            }else{
-                wx.navigateTo({
-                  url: '/pages/seeSignup/seeSignup',
-                })
-            }
       },
     // 监听用户滑动页面事件。
     onPageScroll(e) {

pages/signup/signup.js

@@ -7,13 +7,32 @@ Page({
      */
     data: {
         isperson:'在线报名',
+        params:'',
         courseData:[]
     },
-
+    toSignup(e){
+        let token = wx.getStorageSync('token');
+        if(token == ''){
+            wx.showToast({
+                title: '您还未登录，请先去登录',
+                icon: 'none'
+            })
+            setTimeout(()=>{
+                wx.switchTab({
+                  url: '/pages/my/home',
+                })
+            },2000);
+        }else{
+            wx.navigateTo({
+              url: `/pages/document/subsign/subsign?name=${e.currentTarget.dataset.name}&price=${e.currentTarget.dataset.price}`,
+            })
+        }
+    },
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+        ///pages/document/subsign/subsign?name={{item.name}}&price={{item.price}}
         // if(options.type == '1'){
         //     this.setData({isperson:'个人报名'})
         // }else{
@@ -25,6 +44,13 @@ Page({
      * 生命周期函数--监听页面初次渲染完成
      */
     onReady: function () {
+      
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
         app.colorUISdk.request({
             url:'wxcourse/list',
             method: 'GET',
@@ -37,12 +63,6 @@ Page({
         }).catch(err=>{
             console.log(err)
         });
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
         app.information = {};
     },
 

pages/signup/signup.wxml

@@ -6,8 +6,9 @@
 <!-- <ui-menu ui="mt-5 radius border">
             <ui-menu-item  title="{{item.name}}" icon="cicon-tag text-orange" isAction  wx:for="{{courseData}}" wx:key="index">
         <view slot="action">
-            <navigator url="/pages/document/subsign/subsign?name={{item.name}}&price={{item.price}}" >
-            <ui-tag bg="bg-blue-thin" info="立即报名" ui="sm"/></navigator>
+            <!-- <navigator url="/pages/document/subsign/subsign?name={{item.name}}&price={{item.price}}" > -->
+            <ui-tag bg="bg-blue-thin" info="立即报名" ui="sm" data-name="{{item.name}}" data-price="{{item.price}}" bindtap="toSignup"/>
+            <!-- </navigator> -->
         </view>
     </ui-menu-item>
         </ui-menu> -->