Browse Source

提交代码

Lijy 4 months ago
parent
commit
92120f5527

+ 9 - 12
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/moduleList/moduleList.vue

@@ -176,16 +176,12 @@
                             <img src="/src/assets/image/noTopMounted.png" class="w-full h-full">
                           </div>
                         </template>
-                        <template v-permission="[queryParameters?.jurisdiction?.edit]">
-                          <div class="buttonCircle rounded-full" @click="edit(item)" >
-                            <img src="/src/assets/image/edit.png" class="w-full h-full">
-                          </div>
-                        </template>
-                        <template v-permission="[queryParameters?.jurisdiction?.delete]">
-                          <div class="buttonCircle rounded-full" @click="deleteRow(item)" >
-                            <img src="/src/assets/image/delete.png" class="w-full h-full">
-                          </div>
-                        </template>
+                        <div class="buttonCircle rounded-full" @click="edit(item)" v-permission="[queryParameters?.jurisdiction?.edit]">
+                          <img src="/src/assets/image/edit.png" class="w-full h-full">
+                        </div>
+                        <div class="buttonCircle rounded-full" @click="deleteRow(item)" v-permission="[queryParameters?.jurisdiction?.delete]">
+                          <img src="/src/assets/image/delete.png" class="w-full h-full">
+                        </div>
                       </div>
                     </template>
                   </van-swipe-cell>
@@ -359,14 +355,14 @@ function deleteRow(row) {
 
 // 顶置事件
 function topMounted(row) {
-  requests.post(queryParameters?.value.topMountedInterface, { ids: row.id }).then((res) => {
+  requests.post(queryParameters?.value.topMountedInterface, { id: row.id }).then((res) => {
     toastSuccess('顶置成功')
     onRefresh(true)
   })
 }
 
 function noTopMounted(row) {
-  requests.post(queryParameters?.value.cancelTheTopMountedInterface, { ids: row.id }).then((res) => {
+  requests.post(queryParameters?.value.cancelTheTopMountedInterface, { id: row.id }).then((res) => {
     toastSuccess('取消顶置成功')
     onRefresh(true)
   })
@@ -463,6 +459,7 @@ function reloadListData(data) {
   refreshing.value = false
   isLoading.value = false
   finished.value = false
+  searchVal.value = ''
   listData.value = { records: [], pageIndex: 0, pageSize: 20, total: 0, totalPage: 0 }
   popUpWindowArray.value = popUpWindowArray.value.filter(item => !item.removeModule.includes(queryParameters.value?.key))
   if (!fixedData.formJson[queryParameters.value.key]) {

+ 7 - 2
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/home/index.vue

@@ -61,6 +61,7 @@ import { routingInfos } from "@utility/generalVariables.js";
 import Footer from "@components/page/footer.vue";
 import Workbench from "./component/workbench.vue";
 import DataAnalysis from "./component/dataAnalysis.vue";
+import requests from "@common/requests"
 
 
 const userInfo = useInfoStore()
@@ -88,8 +89,11 @@ function returnImageAddress(rows) {
 
 function obtainEnterpriseWeChatParameters(data = {}) {
   const token = data.id
-  const curUrl = window.location.href.split('#')[0]
+  // const curUrl = window.location.href.split('home')[0]
+  const curUrl = window.location.href
   console.log(wx, '开始调用接口')
+  console.log(token, curUrl)
+  console.log(requests, '<==== requests')
   requests.post('/wxcorp/getCorpWXConfig', { url: curUrl, token }).then((res) => {
     console.log(res, '<====== 返回的参数 /wxcorp/getCorpWXConfig')
     wx.config({
@@ -136,7 +140,8 @@ function obtainEnterpriseWeChatParameters(data = {}) {
       // config信息验证失败会执行error函数,如签名过期导致验证失败,具体错误信息可以打开config的debug模式查看,也可以在返回的res参数中查看,对于SPA可以在这里更新签名。
       // alert('wxConfig发生异常:'+JSON.stringify(res));
       // 企业第一次授权安装进入后会报not in reliable domain的错误,刷新后正常
-      location.reload();
+      // location.reload();
+      console.log(res, '<===== 失败3')
     });
   }).catch(err => {
     alert(err);