From e01af6d359c42b57550957d0108bb23d14088cd0 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 08 四月 2024 15:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

---
 wx/unpackage/dist/dev/mp-weixin/pages/details_dispatch_unit/details_dispatch_unit.js |   88 ++++++++++++++++++++++++-------------------
 1 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/wx/unpackage/dist/dev/mp-weixin/pages/details_dispatch_unit/details_dispatch_unit.js b/wx/unpackage/dist/dev/mp-weixin/pages/details_dispatch_unit/details_dispatch_unit.js
index b4f897b..449fc87 100644
--- a/wx/unpackage/dist/dev/mp-weixin/pages/details_dispatch_unit/details_dispatch_unit.js
+++ b/wx/unpackage/dist/dev/mp-weixin/pages/details_dispatch_unit/details_dispatch_unit.js
@@ -138,9 +138,12 @@
       _vm.show = true
     }
     _vm.e1 = function ($event) {
-      _vm.show2 = true
+      _vm.show = true
     }
     _vm.e2 = function ($event) {
+      _vm.show2 = true
+    }
+    _vm.e3 = function ($event) {
       _vm.show2 = true
     }
   }
@@ -194,9 +197,13 @@
   value: true
 });
 exports.default = void 0;
-var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
 var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
-var _methods;
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -366,7 +373,7 @@
   onReachBottom: function onReachBottom() {
     this.getList();
   },
-  methods: (_methods = {
+  methods: {
     // 绛剧讲
     confirm1: function confirm1() {
       var _this = this;
@@ -387,7 +394,7 @@
             }).then(function (url) {
               if (url.code === 200) {
                 uni.navigateTo({
-                  url: "/pages/webView/webView?url=".concat(url.data)
+                  url: "/pages/webView/webView?url=".concat(encodeURIComponent(url.data))
                 });
               }
             });
@@ -406,7 +413,7 @@
             _this.error = '';
             _this.show1 = false;
             uni.navigateTo({
-              url: "/pages/webView/webView?url=".concat(res.data)
+              url: "/pages/webView/webView?url=".concat(encodeURIComponent(res.data))
             });
           } else {
             _this.error = 2;
@@ -483,41 +490,44 @@
     },
     cancel: function cancel() {
       this.show = false;
-    }
-  }, (0, _defineProperty2.default)(_methods, "confirm1", function confirm1() {
-    this.show1 = false;
-  }), (0, _defineProperty2.default)(_methods, "cancel1", function cancel1() {
-    this.show1 = false;
-  }), (0, _defineProperty2.default)(_methods, "confirm2", function confirm2() {
-    var _this5 = this;
-    this.$u.api.applyChangeOpt({
-      applyId: this.info.id,
-      optType: 6
-    }).then(function (res) {
-      if (res.code === 200) {
-        _this5.show2 = false;
-        _this5.getDetail();
+    },
+    cancel1: function cancel1() {
+      this.show1 = false;
+    },
+    confirm2: function confirm2() {
+      var _this5 = this;
+      this.$u.api.applyChangeOpt({
+        applyId: this.info.id,
+        optType: 6
+      }).then(function (res) {
+        if (res.code === 200) {
+          _this5.show2 = false;
+          _this5.getDetail();
+        }
+      });
+    },
+    cancel2: function cancel2() {
+      this.show2 = false;
+    },
+    returnStyle: function returnStyle(type) {
+      if ([2].includes(type)) {
+        return 'linear-gradient(#97DDC5 0%, #F7F7F7 100%);';
+      } else if ([1, 0].includes(type)) {
+        return 'linear-gradient( 180deg, #FBC88C 0%, #F7F7F7 100%);';
+      } else if ([3, 4, 5, 8, 6].includes(type)) {
+        return '';
       }
-    });
-  }), (0, _defineProperty2.default)(_methods, "cancel2", function cancel2() {
-    this.show2 = false;
-  }), (0, _defineProperty2.default)(_methods, "returnStyle", function returnStyle(type) {
-    if ([2].includes(type)) {
-      return 'linear-gradient(#97DDC5 0%, #F7F7F7 100%);';
-    } else if ([1, 0].includes(type)) {
-      return 'linear-gradient( 180deg, #FBC88C 0%, #F7F7F7 100%);';
-    } else if ([3, 4, 5, 8, 6].includes(type)) {
-      return '';
+    },
+    returnStyle1: function returnStyle1(type) {
+      if ([2].includes(type)) {
+        return 'linear-gradient( 180deg, #E5F7F1 0%, rgba(255,255,255,0) 100%)';
+      } else if ([1, 0].includes(type)) {
+        return 'linear-gradient( 180deg, #FFF2E3 0%, rgba(255,255,255,0) 100%);';
+      } else if ([3, 4, 5, 8, 6].includes(type)) {
+        return '#ffffff';
+      }
     }
-  }), (0, _defineProperty2.default)(_methods, "returnStyle1", function returnStyle1(type) {
-    if ([2].includes(type)) {
-      return 'linear-gradient( 180deg, #E5F7F1 0%, rgba(255,255,255,0) 100%)';
-    } else if ([1, 0].includes(type)) {
-      return 'linear-gradient( 180deg, #FFF2E3 0%, rgba(255,255,255,0) 100%);';
-    } else if ([3, 4, 5, 8, 6].includes(type)) {
-      return '#ffffff';
-    }
-  }), _methods)
+  }
 };
 exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))

--
Gitblit v1.9.3