fix:主页跳转路径

index.js

@@ -70,7 +70,7 @@ window.onload = function () {
             className: 'yinhuan',
             title: '隐患整改',
             remark: '',
-            navTo: 'yinhuanzhenggai',
+            navTo: 'yh-check',
           },
           {
             className: 'shangjia',
@@ -82,7 +82,7 @@ window.onload = function () {
             className: 'zicha',
             title: '安全自查',
             remark: '',
-            navTo: 'checkrecord',
+            navTo: 'check_info',
           },
         ],
         // 修改默认菜单结构为最小化配置
@@ -112,10 +112,13 @@ window.onload = function () {
             success: function (data) {
               // 获取到data为二维码的url路径，从这里取请求参数，商户id，在下面跳转本地系统路径
               // alert('扫码成功'+JSON.stringify(data))
-
               // location.href = 'shanghu_home.html'
-
-              gemhoUtil.navigatePage(`src/_checkrecord.html`)
+              // let param = {
+              //   accessType: 'saoma',
+              //   merId: data,
+              // }
+              // let url = gemhoUtil.setParameter(`_shanghu_home.html`, param)
+              // gemhoUtil.navigatePage(url, '跳转中...')
               //成功回调
             },
             fail: function (data) {
@@ -124,17 +127,22 @@ window.onload = function () {
             },
           })
         } else {
-          this.userInfo.userType === 'shop'
+          this.userInfo.userType === 'shop' && toData === 'checkrecord'
             ? (toData = 'checkrecord')
             : (toData = 'shanghu_list')
           let param = {
-            // id: itme.id,
-            // unitName: itme.unitName,
-            // smallPlaceTypeName: itme.smallPlaceTypeName,
-            // pageName: '_shanghu_list',
             accessType: this.accessType,
           }
-          let url = gemhoUtil.setParameter(`_${toData}.html`, param)
+          if (this.userInfo.userType === 'shop') {
+            param = {
+              accessType: 'shop',
+              merId: this.userInfo.userId,
+              unitName: this.userInfo.unitName,
+              smallPlaceTypeName: this.userInfo.smallPlaceTypeName,
+            }
+          }
+
+          let url = gemhoUtil.setParameter(`src/_${toData}.html`, param)
           gemhoUtil.navigatePage(url, '跳转中...')
           // gemhoUtil.navigatePage(`src/_${toData}.html`)
         }
@@ -218,7 +226,8 @@ window.onload = function () {
                     result.data.merchantInfoNumVo?.smallPlaceTypeName, //
                   unitName: result.data.merchantInfoNumVo?.unitName, //
                   role: 'dudao',
-                  roleName: result.data.roleDeptNameVo.roleName,
+                  roleName: result.data.roleDeptNameVo?.roleName,
+                  merId: result.data.merchantInfoNumVo?.merId, //
                 }
                 gemhoUtil.setCookie('userType', this.userInfo.userType)
                 // 生成最终菜单列表

sdk/axios_http.js

@@ -2,7 +2,7 @@
  * 请求拦截、相应拦截、错误统一处理
  */
 // 环境的切换
-axios.defaults.baseURL = 'http://192.168.2.37:8080'
+axios.defaults.baseURL = 'http://192.168.2.16:8080'
 axios.defaults.timeout = 50000
 // post请求头
 // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'

src/_checkrecord.js

@@ -26,7 +26,7 @@ window.addEventListener('load', function () {
     },
     created() {
       let urlParams = gemhoUtil.getUrlParams()
-      this.merId = urlParams.id
+      this.merId = urlParams.merId
       this.unitName = urlParams.unitName
       this.smallPlaceTypeName = urlParams.smallPlaceTypeName
       this.init()

src/_shanghu_list.js

@@ -26,7 +26,7 @@ window.addEventListener('load', function () {
       },
       viewDetail(itme) {
         let param = {
-          id: itme.id,
+          merId: itme.id,
           unitName: itme.unitName,
           smallPlaceTypeName: itme.smallPlaceTypeName,
           pageName: '_shanghu_list',