完善绑定工号

pages/bindUser/bindUser.vue

@@ -3,7 +3,7 @@
     <view class="scanFont">您的微信未绑定工号，请填写工号后进行使用</view>
     <view class="searchUser">
       <input class="searchUserIpt" v-model="account" type="text" placeholder="请输入工号" />
-      <button class="searchUserBtn" size="mini" @click="search(account)">检索</button>
+      <button class="searchUserBtn" @click="search(account)">检索</button>
     </view>
     <view class="accountName">
       检索到的用户：{{accountName}}
@@ -34,6 +34,7 @@
         models: {
           disjunctor: false,
         },
+        type: "", //登录来源类型
       }
     },
     methods: {
@@ -90,6 +91,7 @@
           account: this.bindAccount
         }).then((res) => {
           uni.hideLoading();
+          let _this = this;
           if (res.status == 200) {
             uni.showModal({
               title: '提示',
@@ -99,8 +101,13 @@
               confirmText: '进入系统',
               success: function(result) {
                 if (result.confirm) {
-                  console.log('用户点击确定');
-                  location.assign(location.origin + location.pathname);
+                  console.log('用户点击确定',_this.type);
+                  if (_this.type) {
+                    location.assign(location.origin + location.pathname + '#/pages/homePage/homePage?type=' +
+                      _this.type);
+                  } else {
+                    location.assign(location.origin + location.pathname + '#/pages/homePage/homePage');
+                  }
                 } else if (result.cancel) {
                   console.log('用户点击取消');
                 }
@@ -125,33 +132,8 @@
       },
     },
     onLoad(options) {
-      console.log(options, 'seimin')
-      this.options = options;
-      if (options.uniName == "replaceGo") { //替换
-        this.qrCode = options.qrCode
-        this.queryDept = {
-          dept: options.queryDept,
-          id: options.queryDeptId
-        };
-        this.msg = `此二维码绑定${options.targetDept}成功，${this.queryDept.dept}的二维码被清空`;
-        this.settings = [{
-          name: '替换',
-          uniName: 'replaceGo'
-        }, {
-          name: '保存',
-          uniName: 'replaceSave'
-        }];
-      } else if (options.uniName == "settingGo") { //设置
-        this.qrCode = options.qrCode;
-        this.msg = `将设置${options.targetDept}到此二维码上`;
-        this.settings = [{
-          name: '设置',
-          uniName: 'settingGo'
-        }, {
-          name: '保存',
-          uniName: 'settingSave'
-        }];
-      }
+      console.log(options, 'seimin');
+      this.type = options.type || "";
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif
@@ -204,6 +186,7 @@
       padding: 30rpx;
 
       .searchUserIpt {
+        padding: 24rpx;
         flex: 3;
         border: 1px solid #0003;
         margin-right: 30rpx;

pages/homePage/homePage.vue

@@ -633,9 +633,15 @@
               });
             } else if (this.state == "555") {
               // 如果需要绑定账号 并且 没有微信号
-              uni.navigateTo({
-                url: "../bindUser/bindUser"
-              })
+              if(this.type){
+                uni.redirectTo({
+                  url: `../bindUser/bindUser?type=${this.type}`
+                })
+              }else{
+                uni.redirectTo({
+                  url: `../bindUser/bindUser`
+                })
+              }
             } else {
               console.log(this.url, "url");
               // https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww2506abad3086cfab&redirect_uri=http://weixintest2.ngser.dashitech.com/app&response_type=code&scope=snsapi_base&agentid=1000013&state=STATE&connect_redirect=1#wechat_redirect
@@ -673,10 +679,17 @@
                 }
               });
             } else if (this.state == "555") {
+              this.type = uni.getStorageSync("type"); //刷新页面后获取type
               // 如果需要绑定账号 并且 没有微信号
-              uni.navigateTo({
-                url: "../bindUser/bindUser"
-              })
+              if(this.type){
+                uni.redirectTo({
+                  url: `../bindUser/bindUser?type=${this.type}`
+                })
+              }else{
+                uni.redirectTo({
+                  url: `../bindUser/bindUser`
+                })
+              }
             } else {
               uni.showToast({
                 icon: "none",
@@ -834,6 +847,7 @@
       // #endif
     },
     onShow() {
+      console.log('onShow');
       // let flag = true;
       if (uni.getStorageSync("userData")) {
         this.online = uni.getStorageSync("userData").user.online;

pages/mypage/mypage.vue

@@ -471,7 +471,9 @@
         });
       }
       //#endif
-      this.tab("day", "今日");
+      if (options.login != 1) {
+        this.tab("day", "今日");
+      }
 
       //图表
       this.cWidth = uni.upx2px(500);