Home Explore Help
Register Sign In
wutt
/
manHourHousekeeper
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/master'

yusm 2 months ago
parent
dbbb6a5036 c5f05782d6
commit
03543acec1
6 changed files with 23 additions and 5 deletions
Unified View Show Diff Stats
  1. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/index.html
  2. 7 0
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/my/index.vue
  3. 12 1
      fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/header/header.vue
  4. 1 1
      fhKeeper/formulahousekeeper/inva_4_tivo/appMarket.html
  5. 1 1
      fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/appMarket.html
  6. 1 1
      fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/templates/appMarket.html

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm-h5/index.html
View File 

@@ -7,7 +7,7 @@
 
     <title>客户管家</title>
 
     <title>客户管家</title>
 
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js" referrerpolicy="origin"></script>
 
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js" referrerpolicy="origin"></script>
 
     <script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js" referrerpolicy="origin"></script>
 
     <script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js" referrerpolicy="origin"></script>
 
-    <script src="https://s.url.cn/qqun/qun/qqweb/m/qun/confession/js/vconsole.min.js "></script>
 
+    <!-- <script src="https://s.url.cn/qqun/qun/qqweb/m/qun/confession/js/vconsole.min.js "></script> -->
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <div id="app"></div>
 
     <div id="app"></div>

+ 7 - 0
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/my/index.vue
View File 

@@ -12,6 +12,8 @@
 
           <div class="flex flex-col justify-center text-[#5D5D5D] leading-6">
 
           <div class="flex flex-col justify-center text-[#5D5D5D] leading-6">
 
             <div class="text-center">公司: {{ userInfo.userInfo?.company?.companyName }}</div>
 
             <div class="text-center">公司: {{ userInfo.userInfo?.company?.companyName }}</div>
 
             <div class="text-center">角色: {{ userInfo.userInfo?.roleName }}</div>
 
             <div class="text-center">角色: {{ userInfo.userInfo?.roleName }}</div>
 
+
 
+            <div class="text-center text-[#075985] mt-2" @click="applicationMarket()">应用市场</div>
 
           </div>
 
           </div>
 
         </div>
 
         </div>
 
         
         
@@ -54,6 +56,11 @@ function judgingTheEnvironment() {
 
   isCorpWX.value = currentEnvironment.indexOf("wxwork") > 0 ? true : false
 
   isCorpWX.value = currentEnvironment.indexOf("wxwork") > 0 ? true : false
 
 }
 
 }
 
 
 
+const applicationMarket = () => {
 
+  window.location.href = 'https://www.ttkuaiban.com/appMarket.html'
 
+  // window.open('https://www.ttkuaiban.com/appMarket.html', '_blank'); 
+}
 
+
 
 useLifecycle({
 
 useLifecycle({
 
   load: () => {
 
   load: () => {
 
     judgingTheEnvironment()
 
     judgingTheEnvironment()

+ 12 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/header/header.vue
View File 

@@ -47,6 +47,12 @@
 
     </div>
 
     </div>
 
   </div>
 
   </div>
 
   <div class="flex flex-row justify-start items-center text-white header-right">
 
   <div class="flex flex-row justify-start items-center text-white header-right">
 
+    <div class="cursor-pointer flex items-center">
 
+      <el-icon :size="24" @click="applicationMarket()">
 
+        <Menu />
 
+      </el-icon>
 
+      <div class="ml-2">应用市场</div>
 
+    </div>
 
     <el-badge :value="numberOfLogos" :max="99" class="ml-4 cursor-pointer h-[26px]" :show-zero="false">
 
     <el-badge :value="numberOfLogos" :max="99" class="ml-4 cursor-pointer h-[26px]" :show-zero="false">
 
       <el-icon :size="26" @click="newsDrawer = true">
 
       <el-icon :size="26" @click="newsDrawer = true">
 
         <Bell />
 
         <Bell />
 
@@ -197,6 +203,11 @@ const changePasswordRules = reactive<FormRules<RuleForm>>({
 
 const globalPopup = inject<GlobalPopup>('globalPopup')
 
 const globalPopup = inject<GlobalPopup>('globalPopup')
 
 const ruleFormRef = ref<FormInstance>()
 
 const ruleFormRef = ref<FormInstance>()
 
 
 
+const applicationMarket = () => {
 
+  window.location.href = 'https://www.ttkuaiban.com/appMarket.html'
 
+  // window.open('https://www.ttkuaiban.com/appMarket.html', '_blank'); 
+}
 
+
 
 const changePassword = (formEl: FormInstance | undefined) => {
 
 const changePassword = (formEl: FormInstance | undefined) => {
 
   if (!formEl) return
 
   if (!formEl) return
 
   if(!changePasswordForm.value.originPassword) {
 
   if(!changePasswordForm.value.originPassword) {
 
@@ -424,7 +435,7 @@ watchEffect(() => {
 
 }
 
 }
 
 
 
 .header-right {
 
 .header-right {
 
-  width: 135px;
 
+  width: 220px;
 
 }
 
 }
 
 
 
 .parentDiv {
 
 .parentDiv {

+ 1 - 1
fhKeeper/formulahousekeeper/inva_4_tivo/appMarket.html
View File 

@@ -16,7 +16,7 @@
 
         我们的服务
 
         我们的服务
 
       </div>
 
       </div>
 
       <div class="applicationEncyclopedia">
 
       <div class="applicationEncyclopedia">
 
-        我们的应用大全 大标题 限一行
 
+        权威认证--火石智能引擎，一站式攻克管理难题
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
     <div class="topicContent">
 
     <div class="topicContent">

+ 1 - 1
fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/appMarket.html
View File 

@@ -16,7 +16,7 @@
 
         我们的服务
 
         我们的服务
 
       </div>
 
       </div>
 
       <div class="applicationEncyclopedia">
 
       <div class="applicationEncyclopedia">
 
-        我们的应用大全 大标题 限一行
 
+        权威认证--火石智能引擎，一站式攻克管理难题
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
     <div class="topicContent">
 
     <div class="topicContent">

+ 1 - 1
fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/templates/appMarket.html
View File 

@@ -16,7 +16,7 @@
 
         我们的服务
 
         我们的服务
 
       </div>
 
       </div>
 
       <div class="applicationEncyclopedia">
 
       <div class="applicationEncyclopedia">
 
-        我们的应用大全 大标题 限一行
 
+        权威认证--火石智能引擎，一站式攻克管理难题
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
     <div class="topicContent">
 
     <div class="topicContent">