微信、web断修改

BJYSYBZ_C/src/views/BjWlydManageView/components/Td1.vue

@@ -166,7 +166,7 @@ export default {
   },
   data() {
     return {
-      xcryModel: '',
+      xcryModel: [],
       options: [],
       srcList: [],
       carouselImgs: [],
@@ -251,7 +251,7 @@ export default {
         if (res.data) {
           let arr = [];
           for (let i = 0; i < res.data.length; i++) {
-            arr.push(res.data[i].id);
+            arr.push(res.data[i].xcry);
           }
           this.xcryModel = arr;
         }

YSGZYBZ_WXAPP/pages/login/index.vue

@@ -39,8 +39,8 @@ export default {
         };
         uni
           .request({
-            url: 'https://zlzd.zrzyt.zj.gov.cn/ysybz/api/app/xc/getXcryByMobile',
-            // url: 'http://10.10.9.71:7089/ysgzybz/app/xc/getXcryByMobile',
+            // url: 'https://zlzd.zrzyt.zj.gov.cn/ysybz/api/app/xc/getXcryByMobile',
+            url: 'http://10.10.9.71:7089/ysgzybz/app/xc/getXcryByMobile',
             method: 'GET',
             data: params,
           })

YSGZYBZ_WXAPP/pages/nocheckDetail/index.scss

@@ -134,6 +134,9 @@
               border-bottom: 0;
             }
           }
+          .itemAuto{
+            height: auto !important;
+          }
 
           .szfw {
             height: 80px;

YSGZYBZ_WXAPP/pages/nocheckDetail/index.vue

@@ -29,7 +29,7 @@
             <text class="title">联系人</text>
             <text class="val">{{ objs.lxr }}</text>
           </view>
-          <view class="item">
+          <view class="item itemAuto">
             <text class="title">联系电话</text>
             <text class="val">{{ objs.lxdh }}</text>
           </view>
@@ -191,9 +191,14 @@ export default {
               success: function (res) {
                 if (res.confirm) {
                   uni.navigateTo({
-                    url: '/pages/main/index?index=2',
+                    url: '/pages/main/index',
                   });
                 } else if (res.cancel) {
+                  uni.navigateTo({
+                    url: `/pages/receivedDetail/index?obj=${JSON.stringify(
+                      _that.objs,
+                    )}`,
+                  });
                 }
               },
             });

YSGZYBZ_WXAPP/pages/received/index.scss

@@ -129,7 +129,7 @@
 
           .btn {
             width: calc(50% - 20px);
-            height: 22px;
+            height: 33px;
             display: flex;
             align-items: center;
             justify-content: center;

YSGZYBZ_WXAPP/pages/received/index.vue

@@ -73,6 +73,7 @@ import SlideCard from '../../components/SlideCard/SlideCard.vue';
 
 import CustomMixins from '@/mixins/CustomMixins.js';
 import httpAjax from '@/utils/https.js';
+import config from '@/utils/config.js';
 
 export default {
   mixins: [CustomMixins],
@@ -103,8 +104,19 @@ export default {
     this.mapObj = uni.createMapContext('map');
   },
   methods: {
-    cardBoxClick(item,index) {
-      console.log(111);
+    cardBoxClick(item, index) {
+      let url = config.bjdkgl + '/0/query';
+      let params = {
+        where: item.dksyh,
+      };
+      //https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJ_DKGL/MapServer/0/query
+      httpAjax({
+        url: url,
+        method: 'POST',
+        data: params,
+      }).then((result) => {
+        console.log(result);
+      });
     },
     queryClick() {
       this.queryWarningPage();
@@ -160,7 +172,6 @@ export default {
         dkbh: this.dkbhModel,
         xcryId: uni.getStorageSync('userInfo').id,
         // xcryId: '11e77c7e53b2730407fd3e481b2d6558',
-        
       };
       httpAjax({
         url: 'app/xc/getXcryDkList',
@@ -171,12 +182,16 @@ export default {
           if (result.data) {
             this.listData = result.data;
             this.listData.forEach((item) => {
+              if (item.lxdh.indexOf('\n') > -1) {
+                item.lxdh = item.lxdh.replace('\n', '');
+              }
               for (let key in item) {
                 if (item[key] == null) {
                   item[key] = '';
                 }
               }
             });
+            console.log(this.listData);
           }
         })
         .catch((err) => {

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -3370,8 +3370,11 @@ function normalizeComponent (
 
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var config = {
-  // baseUrl: "http://10.10.9.71:7089/ysgzybz/",
-  baseUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/ybz-api/" };var _default =
+  //发布线上需要吧login里面地址跟这里替换掉
+  baseUrl: "http://10.10.9.71:7089/ysgzybz/",
+  // baseUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/ybz-api/",
+
+  bjdkgl: 'https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJ_DKGL/MapServer' };var _default =
 
 
 config;exports.default = _default;

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/nocheckDetail/index.js

@@ -346,9 +346,14 @@ var FormData = __webpack_require__(/*! @/utils/formData/formData.js */ 36);var _
             success: function success(res) {
               if (res.confirm) {
                 uni.navigateTo({
-                  url: '/pages/main/index?index=2' });
+                  url: '/pages/main/index' });
 
               } else if (res.cancel) {
+                uni.navigateTo({
+                  url: "/pages/receivedDetail/index?obj=".concat(JSON.stringify(
+                  _that.objs)) });
+
+
               }
             } });
 

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/nocheckDetail/index.wxss

@@ -143,6 +143,9 @@
   border: 1px solid #E8EBF0;
   border-bottom: 0;
 }
+.nocheckBox .container > view.warningBox .content .itemAuto {
+  height: auto !important;
+}
 .nocheckBox .container > view.warningBox .content .szfw {
   height: 80px;
 }

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/received/index.js

@@ -211,7 +211,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 var _CustomMixins = _interopRequireDefault(__webpack_require__(/*! @/mixins/CustomMixins.js */ 35));
-var _https = _interopRequireDefault(__webpack_require__(/*! @/utils/https.js */ 18));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}var SlideCard = function SlideCard() {__webpack_require__.e(/*! require.ensure | components/SlideCard/SlideCard */ "components/SlideCard/SlideCard").then((function () {return resolve(__webpack_require__(/*! ../../components/SlideCard/SlideCard.vue */ 90));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+var _https = _interopRequireDefault(__webpack_require__(/*! @/utils/https.js */ 18));
+var _config = _interopRequireDefault(__webpack_require__(/*! @/utils/config.js */ 133));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}var SlideCard = function SlideCard() {__webpack_require__.e(/*! require.ensure | components/SlideCard/SlideCard */ "components/SlideCard/SlideCard").then((function () {return resolve(__webpack_require__(/*! ../../components/SlideCard/SlideCard.vue */ 90));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 {
   mixins: [_CustomMixins.default],
@@ -243,7 +244,18 @@ var _https = _interopRequireDefault(__webpack_require__(/*! @/utils/https.js */
   },
   methods: {
     cardBoxClick: function cardBoxClick(item, index) {
-      console.log(111);
+      var url = _config.default.bjdkgl + '/0/query';
+      var params = {
+        where: item.dksyh };
+
+      //https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJ_DKGL/MapServer/0/query
+      (0, _https.default)({
+        url: url,
+        method: 'POST',
+        data: params }).
+      then(function (result) {
+        console.log(result);
+      });
     },
     queryClick: function queryClick() {
       this.queryWarningPage();
@@ -300,7 +312,6 @@ var _https = _interopRequireDefault(__webpack_require__(/*! @/utils/https.js */
         xcryId: uni.getStorageSync('userInfo').id
         // xcryId: '11e77c7e53b2730407fd3e481b2d6558',
       };
-
       (0, _https.default)({
         url: 'app/xc/getXcryDkList',
         method: 'GET',
@@ -310,12 +321,16 @@ var _https = _interopRequireDefault(__webpack_require__(/*! @/utils/https.js */
         if (result.data) {
           _this2.listData = result.data;
           _this2.listData.forEach(function (item) {
+            if (item.lxdh.indexOf('\n') > -1) {
+              item.lxdh = item.lxdh.replace('\n', '');
+            }
             for (var key in item) {
               if (item[key] == null) {
                 item[key] = '';
               }
             }
           });
+          console.log(_this2.listData);
         }
       }).
       catch(function (err) {

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/received/index.wxss

@@ -140,7 +140,7 @@
 }
 .receivedBox .container .scroll-view_H .cardBox .cardBoxBtns .btn {
   width: calc(50% - 20px);
-  height: 22px;
+  height: 33px;
   display: flex;
   align-items: center;
   justify-content: center;

YSGZYBZ_WXAPP/utils/config.js

@@ -1,6 +1,9 @@
 const config = {
-  // baseUrl: "http://10.10.9.71:7089/ysgzybz/",
-  baseUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/ybz-api/",
+  //发布线上需要吧login里面地址跟这里替换掉
+  baseUrl: "http://10.10.9.71:7089/ysgzybz/",
+  // baseUrl: "https://zlzd.zrzyt.zj.gov.cn/app215/ybz-api/",
+
+  bjdkgl: 'https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJ_DKGL/MapServer'
 }
 
 export default config