加入公司企业

pages/add-company/add-company.js

@@ -9,18 +9,30 @@ Page({
      * 页面的初始数据
      */
     data: {
-        img: '/static/img/login.png',
-        phoneNumber: app.globalData.phoneNumber,
-        openid: app.globalData.openid
+        img: '/static/img/qr_code.png',
+        interval: null,
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-        this.loadQrCodeData()
+        let that = this
+        that.loadQrCodeData()
+        let interval = setInterval(function () {
+            that.gettoken()
+        }, 30000)
+        that.setData({
+            interval
+        })
     },
 
+    /**
+   * 生命周期函数--监听页面卸载
+   */
+    onUnload() {
+        clearInterval(this.data.interval)
+    },
 
     /**
    * @desc : 获取二维码
@@ -29,7 +41,7 @@ Page({
    */
     loadQrCodeData() {
         let _this = this
-        let param = { 
+        let param = {
             openid: app.globalData.openid
         }
         api.request(Constants.SYS_OPENID_API + 'oauth/wx/qrcode', 'POST', param).then(res => {
@@ -39,4 +51,39 @@ Page({
             }
         })
     },
+
+    /**
+    * @desc : 获取微信派发的临时登录凭证
+    * @date : 2022/5/12 13:49
+    * @author : 姜永辉
+    */
+    getTokenPromise() {
+        return new Promise((resolve, reject) => {
+            api.request(Constants.SYS_OPENID_API + 'oauth/wx/token', 'POST',
+                { 'userWxid': app.globalData.openid }).then(res => {
+                    resolve(res)
+                })
+        })
+    },
+
+    /**
+    * @desc : 通过openid获取用户信息
+    * @date : 2022/5/12 13:49
+    * @author : 姜永辉
+    */
+    gettoken() {
+        //  调用接口
+        this.getTokenPromise().then(res => {
+            if (res.data.code === Constants.SUCESS_CODE) {
+                if (res.data.data.company != undefined
+                    && res.data.data.company.cpId != undefined) {
+                    clearInterval(this.data.interval)
+                    // 调转主页
+                    wx.reLaunch({
+                        url: '../../pages/welcome/welcome',
+                    })
+                }
+            }
+        })
+    },
 })

pages/add-company/add-company.wxml

@@ -4,7 +4,7 @@
 	<view class="card-view-sub-title-line"></view>
 	<view class="card-view-sub-title">使用微信扫码</view>
 	<view class="card-view-sub-title">
-		<image src="{{img}}" mode="" />
-
-	</view>
-</view>
+		<image src="{{img}}" mode="aspectFit" />
+	</view>	
+</view>
+<view class="card-view"  style="text-align: center;">等待加入企业中。。。</view>

pages/login/login.js

@@ -19,6 +19,8 @@ Page({
   data: {
     backgroud: '/static/img/login.png',
     flgCompany: null, //创建企业 加入企业
+    agreementPrivacy: false,
+    openType: '-',
   },
 
   /**
@@ -27,6 +29,43 @@ Page({
   onLoad: function (options) {
   },
 
+  /**
+  * @desc : 隐私
+  * @date : 2022/5/12 13:49
+  * @author : 姜永辉
+  */
+  onCheckboxChange(e) {
+    this.setData({
+      agreementPrivacy: e.detail
+    })
+    if (e.detail) {
+      this.setData({
+        openType: 'getPhoneNumber'
+      })
+    } else {
+      this.setData({
+        openType: '-'
+      })
+
+    }
+  },
+  /**
+  * @desc : 免费体验
+  * @date : 2022/5/12 13:49
+  * @author : 姜永辉
+  */
+  freeClick(e) {
+
+  },
+
+  /**
+* @desc : 了解产品
+* @date : 2022/5/12 13:49
+* @author : 姜永辉
+*/
+  productClick(e) {
+
+  },
 
   /**
   * @desc : 加入企业和创建企业
@@ -34,7 +73,12 @@ Page({
   * @author : 姜永辉
   */
   addCompany(e) {
-    console.log(e);
+    if (!this.data.agreementPrivacy) {
+      wx.showToast({
+        title: '请勾选用户协议和隐私条款',
+        duration: 1000
+      })
+    }
   },
 
   /**
@@ -112,7 +156,7 @@ Page({
         } else {
           // 创建公司
           wx.navigateTo({
-            url: 'package-basic-data/pages/register/company-register/company-register',
+            url: '/package-basic-data/pages/register/company-register/company-register',
           })
         }
       }
@@ -154,33 +198,13 @@ Page({
         let tel = res.data.data.phoneNumber
         app.globalData.phoneNumber = tel
         // // 电话 和 昵称
-        // let param = {
-        //   userPhone: tel,
-        //   userName: tel,
-        //   userWxid: app.globalData.openid
-        // }
-        // 注册微信用户
-        // _this.register(param)
-        // 调转选择公司 加入公司
-        if (this.data.flgCompany == "add") {
-          wx.navigateTo({
-            url: '../../pages/add-company/add-company',
-            events: {
-              // 回调后
-              bindData: function (data) {
-              }
-            },
-            success: function (res) {
-              res.eventChannel.emit('params',
-                {  openid: app.globalData.openid })
-            }
-          })
-        } else {
-          // 创建公司
-          wx.navigateTo({
-            url: 'package-basic-data/pages/register/company-register/company-register',
-          })
+        let param = {
+          userPhone: tel,
+          userName: tel,
+          userWxid: app.globalData.openid
         }
+        // 注册微信用户
+        _this.register(param)
       }
     })
 

pages/login/login.wxml

@@ -6,15 +6,19 @@
       泛家居建陶行业云服务
     </view>
     <view style="margin-top: 190rpx; display: flex;">
-      <van-button round size="small" color="#1B365D" custom-style="height:60rpx;width:180rpx; " type="info" bindtap="commit">免费体验</van-button>
-      <van-button size="small" custom-style="border-radius: 30rpx; margin-left:10rpx;height:60rpx;width:180rpx; " type="default" data-company='add'   open-type="getPhoneNumber" bindgetphonenumber="handleGetPhoneNumber">加入企业</van-button>
-      <van-button size="small" open-type="getPhoneNumber" data-company='create' bindgetphonenumber="handleGetPhoneNumber" custom-style="border-radius: 30rpx;margin-left:10rpx ;height:60rpx;width:180rpx; " type="default"  >创建企业</van-button>
+      <van-button custom-style="border-radius: 30rpx;  height:60rpx;width:180rpx; " size="small" color="#1B365D" type="default" bindtap="freeClick">免费体验</van-button>
+      <van-button custom-style="border-radius: 30rpx; margin-left:30rpx;height:60rpx;width:180rpx; " size="small" color="#1B365D" type="default" bindtap="productClick">了解产品</van-button>
+
     </view>
- 
-    <view class="foot-agreement-privacy">
-      <van-checkbox value="{{true}}" bind:change="onCheckboxChange" />
-      我已阅读并同意《用户协议》和《隐私条款》
+
+    <view style="margin-top: 60rpx; display: flex;">
+      <van-button size="small" custom-style="border-radius: 30rpx; margin-left:10rpx;height:60rpx;width:180rpx; " type="default" data-company='add' bind:click="addCompany" open-type="{{openType}}" bindgetphonenumber="handleGetPhoneNumber">加入企业</van-button>
+      <van-button size="small" open-type="{{openType}}" data-company='create' bind:click="addCompany" bindgetphonenumber="handleGetPhoneNumber" custom-style="border-radius: 30rpx;margin-left:30rpx ;height:60rpx;width:180rpx; " type="default">创建企业</van-button>
     </view>
 
+    <view class="foot-agreement-privacy">
+      <van-checkbox value="{{agreementPrivacy}}" bind:change="onCheckboxChange" />
+      <view style="padding-left: 10rpx;">我已阅读并同意《用户协议》和《隐私条款》</view>
+    </view>
   </view>
 </view>

pages/login/login.wxss

@@ -2,27 +2,19 @@ page {
 	overflow: hidden;
 }
 
-.button-login {
-	width: 100%;
-	position: absolute;
-	left: 0rpx;
-	bottom: 210rpx;
-}
-
-.pf-btn-auth { 
+.button-custom-class {
 	border-radius: 30rpx;
+	margin-left: 10rpx;
+	height: 60rpx;
 	width: 180rpx;
-	color: #2a5ba0; 
-	font-size: 12px;
-	height: 60rpx; 
 }
 
-.login-btn {
-	float: left;
-	width: 90% !important;
-	margin-left: 5%;
+.pf-btn-auth {
+	border-radius: 30rpx;
+	width: 180rpx;
 	color: #2a5ba0;
-
+	font-size: 12px;
+	height: 60rpx;
 }
 
 .base-absolute {

pages/welcome/welcome.js

@@ -24,7 +24,7 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-        let that = this
+        console.log("welcome",options); 
         // options 中的 scene 需要使用 decodeURIComponent 才能获取到生成二维码时传入的 scene
         if (options.scene) {
             var scene = decodeURIComponent(options.scene)
@@ -131,13 +131,13 @@ Page({
                     })
                 } else {
                     // 调转主页--注意有场景值的情况 
-                    wx.reLaunch({
-                        url: '../../pages/home-page/home-page?scene=' + this.data.scene,
-                    })
-                    // 调转选择公司
                     // wx.reLaunch({
-                    //     url: '../../pages/login/login',
+                    //     url: '../../pages/home-page/home-page?scene=' + this.data.scene,
                     // })
+                    // 调转选择公司
+                    wx.reLaunch({
+                        url: '../../pages/login/login',
+                    })
                 }
             }
             else if (res.data.code === 1015) {