From be0301e67768fb183df7e29f411a7e54dbf15c40 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 五月 2024 10:37:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
wx/unpackage/dist/dev/mp-weixin/pages/addition_subtraction_details/addition_subtraction_details.js | 221 +++++++++----------------------------------------------
1 files changed, 36 insertions(+), 185 deletions(-)
diff --git a/wx/unpackage/dist/dev/mp-weixin/pages/addition_subtraction_details/addition_subtraction_details.js b/wx/unpackage/dist/dev/mp-weixin/pages/addition_subtraction_details/addition_subtraction_details.js
index e73566c..ef114e6 100644
--- a/wx/unpackage/dist/dev/mp-weixin/pages/addition_subtraction_details/addition_subtraction_details.js
+++ b/wx/unpackage/dist/dev/mp-weixin/pages/addition_subtraction_details/addition_subtraction_details.js
@@ -210,167 +210,10 @@
});
exports.default = void 0;
var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
+var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
+var _vuex = __webpack_require__(/*! vuex */ 160);
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
var _default = {
data: function data() {
return {
@@ -395,7 +238,8 @@
code: '',
num: 0,
error: false,
- timer: null
+ timer: null,
+ loading: false
};
},
onLoad: function onLoad(options) {
@@ -403,6 +247,7 @@
this.getInfo();
this.getList();
},
+ computed: _objectSpread({}, (0, _vuex.mapState)(['userInfo'])),
onReachBottom: function onReachBottom() {
this.getList();
},
@@ -445,13 +290,14 @@
},
// 鎵撳紑鍙戦�侀獙璇佺爜寮圭獥
openmessage: function openmessage(type) {
- this.code = '';
- clearInterval(this.timer);
- this.error = '';
- this.timer = null;
- this.num = 0;
+ // this.code = ''
+ // clearInterval(this.timer)
+ // this.error = ''
+ // this.timer = null
+ // this.num = 0
this.type = type;
- this.show1 = true;
+ this.confirm1();
+ // this.show1 = true
},
IdCard: function IdCard(UUserCard) {
var idcard = UUserCard.toString();
@@ -522,10 +368,11 @@
// 绛剧讲
confirm1: function confirm1() {
var _this6 = this;
- if (!this.code) {
- this.error = 1;
- return;
- }
+ // if (!this.code) {
+ // this.error = 1
+ // return
+ // }
+ this.loading = true;
// 绛剧讲鎶曚繚鍗�
if (this.type === 1) {
console.log('绛剧讲鐢宠鍗�');
@@ -533,22 +380,24 @@
code: this.code
}).then(function (res) {
if (res.code === 200) {
- _this6.error = '';
- _this6.show1 = false;
+ // this.error = ''
+ // this.show1 = false
_this6.$u.api.getJiajianBaoSignLink({
id: _this6.info.id
}).then(function (url) {
if (url.code === 200) {
+ _this6.loading = false;
uni.navigateTo({
url: "/pages/webView/webView?url=".concat(encodeURIComponent(url.data))
});
}
});
- } else {
- _this6.error = 2;
}
+ // else {
+ // this.error = 2
+ // }
});
- this.show1 = false;
+ // this.show1 = false
// 鐢宠鍗�
} else if (this.type === 2) {
this.$u.api.getChangeMemberListOnlineSignLink({
@@ -556,14 +405,16 @@
code: this.code
}).then(function (res) {
if (res.code === 200) {
- _this6.error = '';
- _this6.show1 = false;
+ // this.error = ''
+ // this.show1 = false
+ _this6.loading = false;
uni.navigateTo({
url: "/pages/webView/webView?url=".concat(encodeURIComponent(res.data))
});
- } else {
- _this6.error = 2;
}
+ // else {
+ // this.error = 2
+ // }
});
}
},
@@ -587,18 +438,18 @@
this.show2 = false;
},
returnStyle: function returnStyle(type) {
- if ([2].includes(type)) {
+ if ([2, 9].includes(type)) {
return 'linear-gradient(#97DDC5 0%, #F7F7F7 100%);';
- } else if ([0, 1, 9, 7].includes(type)) {
+ } else if ([0, 1, 7].includes(type)) {
return 'linear-gradient( 180deg, #FBC88C 0%, #F7F7F7 100%);';
} else if ([3, 5, 6].includes(type)) {
return '';
}
},
returnStyle1: function returnStyle1(type) {
- if ([2].includes(type)) {
+ if ([2, 9].includes(type)) {
return 'linear-gradient( 180deg, #E5F7F1 0%, rgba(255,255,255,0) 100%)';
- } else if ([0, 1, 9, 7].includes(type)) {
+ } else if ([0, 1, 7].includes(type)) {
return 'linear-gradient( 180deg, #FFF2E3 0%, rgba(255,255,255,0) 100%);';
} else if ([3, 5, 6].includes(type)) {
return '#ffffff';
--
Gitblit v1.9.3