Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/login.vue

@@ -38,8 +38,10 @@ const { toastLoading, toastSuccess, toastFail } = useShowToast();
 
 const router = useRouterStore()
 const userInfo = useInfoStore()
-const username = ref("18122222222");
-const password = ref("000000");
+// const username = ref("18122222222");
+// const password = ref("000000");
+const username = ref("");
+const password = ref("");
 const rules = ref([{ required: true }]);
 
 const isCorpWX = ref(false)

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/my/index.vue

@@ -14,9 +14,18 @@
             <div class="text-center">角色: {{ userInfo.userInfo?.roleName }}</div>
 
             <div class="text-center text-[#075985] mt-2" @click="applicationMarket()">应用市场</div>
+
+            <div class="text-center text-[#075985] mt-8"
+              v-if="userInfo.userInfo.userNameNeedTranslate != '1' && (isCorpWX || isWX)" @click="bindWeiXin">
+              {{ `绑定${isCorpWX ? '企业' : ''}微信` }}
+              (
+              <span v-if="(isCorpWX && userInfo.corpwxUserid == null) || (isWX && userInfo.wxOpenid == null)">未绑定</span>
+              <span v-if="(isCorpWX && userInfo.corpwxUserid != null) || (isWX && userInfo.wxOpenid != null)">已绑定</span>
+              )
+            </div>
           </div>
         </div>
-        
+
         <div class="w-full mb-40 px-24" v-if="!isCorpWX">
           <van-button type="primary" @click="signOut" class="w-full">退出登录</van-button>
         </div>
@@ -40,6 +49,29 @@ import Footer from "@components/page/footer.vue";
 const router = useRouterStore()
 const userInfo = useInfoStore()
 const isCorpWX = ref(false)
+const isWX = ref(false)
+
+function bindWeiXin() {
+  //企业微信
+  if (isCorpWX.value && userInfo.userInfo.corpwxUserid != null) {
+    return;
+  }
+  //微信
+  else if (isWX.value && userInfo.userInfo.wxOpenid != null) {
+    return;
+  }
+
+  var appId = "wx749c84daac654e1e";//工时管家公众号
+  var url = "http://mobworktime.ttkuaiban.com/api/wechat/bindWeiXin2?userId=" + userInfo.userInfo.id;//工时管家公众号授权回调页面
+  if (isCorpWX.value) {
+    appId = "ww4e237fd6abb635af"; //企业微信第三方的SUIT ID
+    url = "http://worktime.ttkuaiban.com/api/wxcorp/bindCorpWeiXin?userId=" + userInfo.userInfo.id;//授权回调页面
+  }
+
+  var weixinUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + appId + "&redirect_uri=" + encodeURI(url) + "&response_type=code&scope=snsapi_base&state=0#wechat_redirect";
+  window.location.href = weixinUrl;
+}
+
 function signOut() {
   router.redirectTo({
     pathName: 'login',
@@ -54,6 +86,7 @@ function signOut() {
 function judgingTheEnvironment() {
   const currentEnvironment = navigator.userAgent.toLowerCase();
   isCorpWX.value = currentEnvironment.indexOf("wxwork") > 0 ? true : false
+  isWX.value = currentEnvironment.indexOf("micromessenger") > 0 ? true : false
 }
 
 const applicationMarket = () => {