fix

virgo.wzfrontend/workark_wx/pages/my/my.vue

@@ -59,11 +59,11 @@
 			async init() {
 				let userInfo = await getUserInfoById(this.user.userId);
 				if (userInfo.state) {
-					this.user = userInfo;
-					this.user['userName'] = userInfo.name;
-					this.user['userId'] = userInfo.id;
+					this.user = userInfo.data;
+					this.user['userName'] = userInfo.data.name;
+					this.user['userId'] = userInfo.data.id;
 					this.user.organizedName = userInfo.mgrOrganization && userInfo.mgrOrganization.name;
-					this.$store.dispatch('app/changeUser', userInfo);
+					this.$store.dispatch('app/changeUser', userInfo.data);
 				}
 			}
 		}

virgo.wzfrontend/workark_wx/subPages/myPage/myDetail/myDetail.vue

@@ -92,11 +92,11 @@
 			async init() {
 				let userInfo = await getUserInfoById(this.user.userId);
 				if (userInfo.state) {
-					this.user = userInfo;
-					this.user['userName'] = userInfo.name;
-					this.user['userId'] = userInfo.id;
+					this.user = userInfo.data;
+					this.user['userName'] = userInfo.data.name;
+					this.user['userId'] = userInfo.data.id;
 					this.user.organizedName = userInfo.mgrOrganization && userInfo.mgrOrganization.name;
-					this.$store.dispatch('app/changeUser', userInfo);
+					this.$store.dispatch('app/changeUser', userInfo.data);
 				}
 			},
 			logout() {

virgo.wzfrontend/workark_wx/subPages/workarkPage/components/sureOrder.vue

@@ -135,18 +135,18 @@
 						signType: wxConfig.data.signType,
 						paySign: wxConfig.data.paySign,
 						success: res => {
-							this.paymentCallback('success', orderData.data.id);
+							this.paymentCallback(orderData.data.id, '支付成功');
 						},
 						fail: err => {
-							this.paymentCallback('warning', orderData.data.id);
+							this.paymentCallback(orderData.data.id, '未支付');
 						}
 					});
 				}
 			},
-			paymentCallback(status, orderId) {
+			paymentCallback(orderId, status) {
 				this.$emit('closePopup');
 				uni.hideLoading();
-				this.$navigateTo(`/subPages/workarkPage/paymentStatus/paymentStatus?status=${status}&orderId=${orderId}`);
+				this.$navigateTo(`/subPages/workarkPage/paymentStatus/paymentStatus?orderId=${orderId}&status=${status}`);
 			}
 		},
 	}

virgo.wzfrontend/workark_wx/subPages/workarkPage/paymentStatus/paymentStatus.vue

@@ -27,13 +27,14 @@
 		},
 		onLoad(body) {
 			this.orderId = body.orderId;
-			if (this.orderId) this.init();
+			if (this.orderId) this.init(body.status);
 		},
 		methods: {
-			async init() {
+			async init(status) {
 				let orderData = await getOrderDetail(this.orderId);
 				if (!orderData.state) return;
 				this.orderData = orderData.data;
+				if (status) this.orderData.orderStatus = status;
 				this.details = [{
 					label: '订单编号',
 					value: orderData.data.orderNo

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/workarkPage/paymentStatus/paymentStatus.wxss

@@ -1 +1 @@
-.data-v-64a34b29 .uv-count-down .uv-count-down__text{color:#fff}.content.data-v-64a34b29{box-sizing:border-box}
+.data-v-4905a5ad .uv-count-down .uv-count-down__text{color:#fff}.content.data-v-4905a5ad{box-sizing:border-box}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uvEmpty: function () {
-      return Promise.all(/*! import() | uni_modules/uv-empty/components/uv-empty/uv-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-empty/components/uv-empty/uv-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-empty/components/uv-empty/uv-empty.vue */ 262))
+      return Promise.all(/*! import() | uni_modules/uv-empty/components/uv-empty/uv-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-empty/components/uv-empty/uv-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-empty/components/uv-empty/uv-empty.vue */ 265))
     },
     uvButton: function () {
-      return Promise.all(/*! import() | uni_modules/uv-button/components/uv-button/uv-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-button/components/uv-button/uv-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-button/components/uv-button/uv-button.vue */ 270))
+      return Promise.all(/*! import() | uni_modules/uv-button/components/uv-button/uv-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-button/components/uv-button/uv-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-button/components/uv-button/uv-button.vue */ 273))
     },
     uvIcon: function () {
-      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 278))
+      return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 281))
     },
   }
 } catch (e) {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/model/model.js

@@ -141,7 +141,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _config = _interopRequireDefault(__webpack_require__(/*! @/config */ 77));
-var _bim = __webpack_require__(/*! @/request/api/bim.js */ 598);
+var _bim = __webpack_require__(/*! @/request/api/bim.js */ 106);
 //
 //
 //

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/workark/workark.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uvImage: function () {
-      return Promise.all(/*! import() | uni_modules/uv-image/components/uv-image/uv-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-image/components/uv-image/uv-image")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-image/components/uv-image/uv-image.vue */ 243))
+      return Promise.all(/*! import() | uni_modules/uv-image/components/uv-image/uv-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-image/components/uv-image/uv-image")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-image/components/uv-image/uv-image.vue */ 246))
     },
     uvText: function () {
-      return Promise.all(/*! import() | uni_modules/uv-text/components/uv-text/uv-text */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-text/components/uv-text/uv-text")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-text/components/uv-text/uv-text.vue */ 251))
+      return Promise.all(/*! import() | uni_modules/uv-text/components/uv-text/uv-text */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-text/components/uv-text/uv-text")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-text/components/uv-text/uv-text.vue */ 254))
     },
   }
 } catch (e) {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/myPage/common/vendor.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["subPages/myPage/common/vendor"],{
 
-/***/ 220:
+/***/ 221:
 /*!********************************************************************************************!*\
   !*** /Users/whx/Documents/yuiProject/realty/virgo.wzfrontend/workark_wx/request/api/my.js ***!
   \********************************************************************************************/