whx 3 周之前
父节点
当前提交
8d83833a74
共有 100 个文件被更改,包括 190 次插入31887 次删除
  1. 1 1
      virgo.wzfrontend/src/main/resources/static/workark/index.html
  2. 0 1
      virgo.wzfrontend/src/main/resources/static/workark/static/css/2184.00bd9c5b.css
  3. 1 0
      virgo.wzfrontend/src/main/resources/static/workark/static/css/95.610385ef.css
  4. 1 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/1031.bab1fdee.js
  5. 0 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/2184.9d756717.js
  6. 1 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/2890.de72d61b.js
  7. 1 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/437.eccebfa2.js
  8. 1 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/6191.9d6fbd9f.js
  9. 0 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/6191.cdc7d17d.js
  10. 1 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/6271.2a765fd5.js
  11. 1 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/7351.5023f616.js
  12. 0 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/8866.003fd2f8.js
  13. 1 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/95.c9860305.js
  14. 1 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/app.f8af605a.js
  15. 19 7
      virgo.wzfrontend/workark/src/layout/components/selectOrganization.vue
  16. 4 4
      virgo.wzfrontend/workark/src/layout/components/topNav.vue
  17. 8 3
      virgo.wzfrontend/workark_wx/pages/login/login.vue
  18. 19 8
      virgo.wzfrontend/workark_wx/request/api/workark.js
  19. 30 5
      virgo.wzfrontend/workark_wx/subPages/indexPage/orderDetail/orderDetail.vue
  20. 30 5
      virgo.wzfrontend/workark_wx/subPages/workarkPage/components/sureOrder.vue
  21. 2 3
      virgo.wzfrontend/workark_wx/subPages/workarkPage/paymentStatus/paymentStatus.vue
  22. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/common/vendor.js
  23. 2 2
      virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/components/common/upload.json
  24. 2 2
      virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/components/login/imageCode.json
  25. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/pages/login/login.js
  26. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/pages/login/login.wxml
  27. 5 5
      virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/pages/login/login.wxss
  28. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/indexPage/orderDetail/orderDetail.js
  29. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/indexPage/orderDetail/orderDetail.wxml
  30. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/workarkPage/components/sureOrder.js
  31. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/workarkPage/paymentStatus/paymentStatus.js
  32. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/workarkPage/paymentStatus/paymentStatus.wxml
  33. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/workarkPage/paymentStatus/paymentStatus.wxss
  34. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  35. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  36. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/components/login/imageCode.js.map
  37. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  38. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  39. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/message/message.js.map
  40. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map
  41. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/workark/workark.js.map
  42. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/chatPage/chat/chat.js.map
  43. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/indexPage/contractList/contractList.js.map
  44. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/indexPage/noPermission/noPermission.js.map
  45. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/indexPage/orderDetail/orderDetail.js.map
  46. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/myPage/changeOrganization/changeOrganization.js.map
  47. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/myPage/components/uni-mall-head/uni-mall-head.js.map
  48. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/myPage/components/uni-mall-list/uni-mall-list.js.map
  49. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/myPage/download/download.js.map
  50. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/myPage/myDetail/myDetail.js.map
  51. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/workarkPage/components/sureOrder.js.map
  52. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/workarkPage/coupon/coupon.js.map
  53. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/workarkPage/paymentStatus/paymentStatus.js.map
  54. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/workarkPage/workarkDetail/workarkDetail.js.map
  55. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/kevy-result-page/components/kevy-result-page/kevy-result-page.js.map
  56. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-badge/components/uv-badge/uv-badge.js.map
  57. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js.map
  58. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group.js.map
  59. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox.js.map
  60. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.js.map
  61. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-divider/components/uv-divider/uv-divider.js.map
  62. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-empty/components/uv-empty/uv-empty.js.map
  63. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-icon/components/uv-icon/uv-icon.js.map
  64. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-image/components/uv-image/uv-image.js.map
  65. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-line/components/uv-line/uv-line.js.map
  66. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-link/components/uv-link/uv-link.js.map
  67. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon.js.map
  68. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-modal/components/uv-modal/uv-modal.js.map
  69. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.js.map
  70. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-popup/components/uv-popup/uv-popup.js.map
  71. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.js.map
  72. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.js.map
  73. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-steps/components/uv-steps-item/uv-steps-item.js.map
  74. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-steps/components/uv-steps/uv-steps.js.map
  75. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-swiper/components/uv-swiper-indicator/uv-swiper-indicator.js.map
  76. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-swiper/components/uv-swiper/uv-swiper.js.map
  77. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-text/components/uv-text/uv-text.js.map
  78. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-upload/components/uv-preview-video/uv-preview-video.js.map
  79. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-upload/components/uv-upload/uv-upload.js.map
  80. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/z-paging/components/z-paging-empty-view/z-paging-empty-view.js.map
  81. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/z-paging/components/z-paging/components/z-paging-load-more.js.map
  82. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/z-paging/components/z-paging/components/z-paging-refresh.js.map
  83. 1 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/z-paging/components/z-paging/z-paging.js.map
  84. 0 4
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/app.js
  85. 0 91
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/app.json
  86. 0 3
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/app.wxss
  87. 0 183
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/common/main.js
  88. 0 475
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/common/main.wxss
  89. 0 234
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/common/runtime.js
  90. 0 29791
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/common/vendor.js
  91. 0 372
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/common/upload.js
  92. 0 6
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/common/upload.json
  93. 0 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/common/upload.wxml
  94. 0 224
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/login/imageCode.js
  95. 0 4
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/login/imageCode.json
  96. 0 1
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/login/imageCode.wxml
  97. 0 61
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/login/imageCode.wxss
  98. 0 316
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/index/index.js
  99. 0 8
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/index/index.json
  100. 0 0
      virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/index/index.wxml

文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/workark/index.html


文件差异内容过多而无法显示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/css/2184.00bd9c5b.css


文件差异内容过多而无法显示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/workark/static/css/95.610385ef.css


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/1031.bab1fdee.js


文件差异内容过多而无法显示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/2184.9d756717.js


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/2890.de72d61b.js


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/437.eccebfa2.js


文件差异内容过多而无法显示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/workark/static/js/6191.9d6fbd9f.js


文件差异内容过多而无法显示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/6191.cdc7d17d.js


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/6271.2a765fd5.js


文件差异内容过多而无法显示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/workark/static/js/7351.5023f616.js


文件差异内容过多而无法显示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/8866.003fd2f8.js


文件差异内容过多而无法显示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/workark/static/js/95.c9860305.js


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/app.f8af605a.js


+ 19 - 7
virgo.wzfrontend/workark/src/layout/components/selectOrganization.vue

@@ -33,7 +33,8 @@
 	import {
 		selectWorkarkOrangaized,
 		getWorkarkOrangaized,
-		getUserInfo
+		getUserInfo,
+		refresh
 	} from '@/api/loginRegister'
 	import {
 		setComment
@@ -51,10 +52,16 @@
 		methods: {
 			init() {
 				this.loading = true;
-				getWorkarkOrangaized().then(res => {
-					this.loading = false;
+				refresh().then(res => {
 					if (res.state) {
-						this.tableData = res.data;
+						getWorkarkOrangaized().then(res => {
+							this.loading = false;
+							if (res.state) {
+								this.tableData = res.data;
+							}
+						})
+					} else {
+						this.loading = false;
 					}
 				})
 			},
@@ -74,12 +81,17 @@
 										[]);
 									setComment(user.workarkMenu ? user.workarkMenu : JSON
 										.stringify([]));
-									this.$router.go(0);
+									this.$emit('callback');
+									this.$router.push({
+										path: '/work',
+										replace: true
+									})
+									this.$message.success('切换成功');
 								}
 								this.$loading.close();
 							})
-						}else{
-							this.$loading.close();
+						} else {
+							this.$loading.close();
 						}
 					})
 				});

+ 4 - 4
virgo.wzfrontend/workark/src/layout/components/topNav.vue

@@ -61,8 +61,8 @@
 		</el-drawer>
 		<el-dialog :close-on-click-modal="false" :title="logTitle" :visible.sync="visible" width="900px"
 			:append-to-body="true">
-			<select-organization v-if="visible && logTitle === '切换组织'"></select-organization>
-			<change-password v-if="visible && logTitle === '修改密码'"></change-password>
+			<select-organization v-if="visible && logTitle === '切换组织'" @callback="visible = false"></select-organization>
+			<change-password v-if="visible && logTitle === '修改密码'"></change-password>
 			<share v-if="visible && logTitle === '分享邀请'"></share>
 		</el-dialog>
 	</div>
@@ -80,7 +80,7 @@
 	} from 'vuex';
 	const userDetail = () => import('./userDetail');
 	const changePassword = () => import('./changePassword');
-	const selectOrganization = () => import('./selectOrganization');
+	const selectOrganization = () => import('./selectOrganization');
 	const share = () => import('./share');
 	export default {
 		data() {
@@ -170,7 +170,7 @@
 		components: {
 			userDetail,
 			changePassword,
-			selectOrganization,
+			selectOrganization,
 			share
 		}
 	}

+ 8 - 3
virgo.wzfrontend/workark_wx/pages/login/login.vue

@@ -136,8 +136,14 @@
 			},
 			async wxPhoneLogin(e) { //微信手机号一键登录
 				if (!e.detail.code) return;
-				this.loginFunction({
-					pCode: e.detail.code
+				uni.login({
+					provider: 'weixin',
+					success: loginRes => {
+						this.loginFunction({
+							pCode: e.detail.code,
+							code: loginRes.code
+						})
+					}
 				})
 			},
 			loginSubmit() {
@@ -158,7 +164,6 @@
 				uni.login({
 					provider: 'weixin',
 					success: loginRes => {
-						if (postData.pCode) postData['code'] = loginRes.code;
 						this.login(postData, loginRes.code);
 					}
 				})

+ 19 - 8
virgo.wzfrontend/workark_wx/request/api/workark.js

@@ -90,7 +90,7 @@ export function getWxPay(orderNo, openId) {
 		url: `/api/workarkWxPay/jsapi/${orderNo}/${openId}`,
 		method: 'post'
 	})
-}
+}
 /* 
  * 分页查看订单
  * 
@@ -102,7 +102,7 @@ export function getOrderListByQueryAndSize(currPage, pageSize, data) {
 		method: 'post',
 		data: data
 	})
-}
+}
 /* 
  * 订单详情
  * 
@@ -113,7 +113,7 @@ export function getOrderDetail(id) {
 		url: `/api/workarkOrderInfo/${id}`,
 		method: 'get'
 	})
-}
+}
 /* 
  * 通过订单编号获取订单详情
  * 
@@ -124,7 +124,7 @@ export function getOrderDetailByOrderNo(orderNo) {
 		url: `/api/workarkOrderInfo/orderNo/${orderNo}`,
 		method: 'get'
 	})
-}
+}
 /* 
  * 获取绑定企业合同详情
  * 
@@ -135,7 +135,7 @@ export function getBindContract(contractId) {
 		url: `/file/workarkContract/pdf/get/${contractId}`,
 		method: 'get'
 	})
-}
+}
 /* 
  * 获取过程设置数据
  * 
@@ -146,7 +146,7 @@ export function getProcessData(orderId) {
 		url: `/api/workarkProce/list/${orderId}`,
 		method: 'get'
 	})
-}
+}
 /* 
  * 获取签订合同列表
  * 
@@ -158,7 +158,7 @@ export function getContractListByQueryAndPage(currPage, pageSize, data) {
 		method: 'post',
 		data: data
 	})
-}
+}
 /* 
  * 通过条件分页获取发票列表
  * 
@@ -170,7 +170,7 @@ export function getInvoiceListByQueryAndPage(currPage, pageSize, data) {
 		method: 'post',
 		data: data
 	})
-}
+}
 /* 
  * 通过ID获取发票详情
  * 
@@ -181,4 +181,15 @@ export function getInvoiceDetailById(id) {
 		url: `/api/workarkInvoice/details/${id}`,
 		method: 'get'
 	})
+}
+/* 
+ * 查询订单支付状态
+ * 
+ * 
+ */
+export function getOrderPayState(orderNo) {
+	return request({
+		url: `/api/workarkWxPay/query/${orderNo}`,
+		method: 'get'
+	})
 }

+ 30 - 5
virgo.wzfrontend/workark_wx/subPages/indexPage/orderDetail/orderDetail.vue

@@ -87,7 +87,8 @@
 		getBindContract,
 		getProcessData,
 		getOrderDetailByOrderNo,
-		getWxPay
+		getWxPay,
+		getOrderPayState
 	} from '@/request/api/workark.js'
 	import processItem from '@/subPages/indexPage/components/processItem.vue';
 	import config from '@/config';
@@ -141,9 +142,30 @@
 				if (!contractProcess.state) return;
 				this.contractProcessList = contractProcess.data;
 				this.updateParentStatus(this.contractProcessList);
+			},
+			logout() {
+				this.$chat.disConnect();
+				uni.removeStorageSync('token');
+				uni.removeStorageSync('chatToken');
+				uni.removeStorageSync('vuex_state');
+				this.$store.dispatch('app/changeOrganization', {});
+				this.$store.dispatch('app/changeUser', {});
+				uni.removeTabBarBadge({
+					index: 3
+				})
 			},
 			async operation(item) {
-				if (item.id === 4) {
+				if (item.id === 4) {
+					if (!uni.getStorageSync('openId')) {
+						this.$toast('未获取到OpenId,请重新登录');
+						this.logout();
+						setTimeout(() => {
+							uni.navigateTo({
+								url: '/pages/login/login'
+							});
+						}, 400)
+						return;
+					}
 					uni.showLoading({
 						title: '订单支付中...'
 					})
@@ -155,9 +177,12 @@
 						package: wxConfig.data.prepayId,
 						signType: wxConfig.data.signType,
 						paySign: wxConfig.data.paySign,
-						success: res => {
-							this.init();
-							uni.hideLoading();
+						success: async (res) => {
+							let payStatus = await getOrderPayState(this.orderData.orderNo);
+							if (payStatus.state) {
+								this.init();
+								uni.hideLoading();
+							}
 						},
 						fail: err => {
 							uni.hideLoading();

+ 30 - 5
virgo.wzfrontend/workark_wx/subPages/workarkPage/components/sureOrder.vue

@@ -54,7 +54,8 @@
 		getServeById,
 		countPriceAPI,
 		createOrder,
-		getWxPay
+		getWxPay,
+		getOrderPayState
 	} from '@/request/api/workark.js'
 	export default {
 		props: {
@@ -119,7 +120,29 @@
 				this.couponChecked = data;
 				this.countPrice();
 			},
+			logout() {
+				this.$chat.disConnect();
+				uni.removeStorageSync('token');
+				uni.removeStorageSync('chatToken');
+				uni.removeStorageSync('vuex_state');
+				this.$store.dispatch('app/changeOrganization', {});
+				this.$store.dispatch('app/changeUser', {});
+				uni.removeTabBarBadge({
+					index: 3
+				})
+			},
 			async payment() {
+				if (!uni.getStorageSync('openId')) {
+					this.$toast('未获取到OpenId,请重新登录');
+					this.logout();
+					this.$emit('closePopup');
+					setTimeout(() => {
+						uni.navigateTo({
+							url: '/pages/login/login'
+						});
+					}, 400)
+					return;
+				}
 				uni.showLoading({
 					title: '订单确认中...'
 				})
@@ -127,6 +150,7 @@
 				let orderData = await createOrder(this.orderData.id, this.$store.getters.organization.id, couponIds);
 				if (orderData.state) {
 					let wxConfig = await getWxPay(orderData.data.orderNo, uni.getStorageSync('openId'));
+					if (!wxConfig.state) return this.$emit('closePopup');
 					uni.requestPayment({
 						provider: 'wxpay',
 						timeStamp: wxConfig.data.timeStamp,
@@ -134,11 +158,12 @@
 						package: wxConfig.data.prepayId,
 						signType: wxConfig.data.signType,
 						paySign: wxConfig.data.paySign,
-						success: res => {
-							this.paymentCallback(orderData.data.id, '支付成功');
+						success: async (res) => {
+							let payStatus = await getOrderPayState(orderData.data.orderNo);
+							if (payStatus.state) this.paymentCallback(orderData.data.id);
 						},
 						fail: err => {
-							this.paymentCallback(orderData.data.id, '未支付');
+							this.paymentCallback(orderData.data.id);
 						}
 					});
 				}
@@ -146,7 +171,7 @@
 			paymentCallback(orderId, status) {
 				this.$emit('closePopup');
 				uni.hideLoading();
-				this.$navigateTo(`/subPages/workarkPage/paymentStatus/paymentStatus?orderId=${orderId}&status=${status}`);
+				this.$navigateTo(`/subPages/workarkPage/paymentStatus/paymentStatus?orderId=${orderId}`);
 			}
 		},
 	}

+ 2 - 3
virgo.wzfrontend/workark_wx/subPages/workarkPage/paymentStatus/paymentStatus.vue

@@ -27,14 +27,13 @@
 		},
 		onLoad(body) {
 			this.orderId = body.orderId;
-			if (this.orderId) this.init(body.status);
+			if (this.orderId) this.init();
 		},
 		methods: {
-			async init(status) {
+			async init() {
 				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

文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/common/vendor.js


+ 2 - 2
virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/components/common/upload.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "uv-upload": "/uni_modules/uv-upload/components/uv-upload/uv-upload"
-  }
+  },
+  "component": true
 }

+ 2 - 2
virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/components/login/imageCode.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/pages/login/login.js


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/pages/login/login.wxml


文件差异内容过多而无法显示
+ 5 - 5
virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/pages/login/login.wxss


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/indexPage/orderDetail/orderDetail.js


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/indexPage/orderDetail/orderDetail.wxml


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/workarkPage/components/sureOrder.js


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/workarkPage/paymentStatus/paymentStatus.js


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/workarkPage/paymentStatus/paymentStatus.wxml


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

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

文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/components/login/imageCode.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/message/message.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/workark/workark.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/chatPage/chat/chat.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/indexPage/contractList/contractList.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/indexPage/noPermission/noPermission.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/indexPage/orderDetail/orderDetail.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/myPage/changeOrganization/changeOrganization.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/myPage/components/uni-mall-head/uni-mall-head.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/myPage/components/uni-mall-list/uni-mall-list.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/myPage/download/download.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/myPage/myDetail/myDetail.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/workarkPage/components/sureOrder.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/workarkPage/coupon/coupon.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/workarkPage/paymentStatus/paymentStatus.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/subPages/workarkPage/workarkDetail/workarkDetail.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/kevy-result-page/components/kevy-result-page/kevy-result-page.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-badge/components/uv-badge/uv-badge.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-divider/components/uv-divider/uv-divider.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-empty/components/uv-empty/uv-empty.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-icon/components/uv-icon/uv-icon.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-image/components/uv-image/uv-image.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-line/components/uv-line/uv-line.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-link/components/uv-link/uv-link.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-modal/components/uv-modal/uv-modal.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-popup/components/uv-popup/uv-popup.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-steps/components/uv-steps-item/uv-steps-item.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-steps/components/uv-steps/uv-steps.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-swiper/components/uv-swiper-indicator/uv-swiper-indicator.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-swiper/components/uv-swiper/uv-swiper.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-text/components/uv-text/uv-text.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-upload/components/uv-preview-video/uv-preview-video.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-upload/components/uv-upload/uv-upload.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/z-paging/components/z-paging-empty-view/z-paging-empty-view.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/z-paging/components/z-paging/components/z-paging-load-more.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/z-paging/components/z-paging/components/z-paging-refresh.js.map


文件差异内容过多而无法显示
+ 1 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/z-paging/components/z-paging/z-paging.js.map


+ 0 - 4
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/app.js

@@ -1,4 +0,0 @@
-
-require('./common/runtime.js')
-require('./common/vendor.js')
-require('./common/main.js')

+ 0 - 91
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/app.json

@@ -1,91 +0,0 @@
-{
-  "pages": [
-    "pages/workark/workark",
-    "pages/index/index",
-    "pages/model/model",
-    "pages/shopping/shopping",
-    "pages/my/my",
-    "pages/login/login",
-    "pages/message/message",
-    "pages/pdf/pdf"
-  ],
-  "subPackages": [
-    {
-      "root": "subPages/workarkPage",
-      "pages": [
-        "workarkDetail/workarkDetail",
-        "coupon/coupon",
-        "paymentStatus/paymentStatus"
-      ]
-    },
-    {
-      "root": "subPages/chatPage",
-      "pages": [
-        "chat/chat"
-      ]
-    },
-    {
-      "root": "subPages/indexPage",
-      "pages": [
-        "orderList/orderList",
-        "orderDetail/orderDetail",
-        "contractList/contractList",
-        "invoiceList/invoiceList",
-        "invoiceDetail/invoiceDetail",
-        "noPermission/noPermission"
-      ]
-    },
-    {
-      "root": "subPages/myPage",
-      "pages": [
-        "myDetail/myDetail",
-        "organization/organization",
-        "download/download",
-        "changeOrganization/changeOrganization"
-      ]
-    }
-  ],
-  "window": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "workark",
-    "navigationBarBackgroundColor": "#fff"
-  },
-  "tabBar": {
-    "color": "#7d7380",
-    "selectedColor": "#3c9cff",
-    "list": [
-      {
-        "pagePath": "pages/index/index",
-        "iconPath": "static/images/tabbar/home.png",
-        "selectedIconPath": "static/images/tabbar/home-active.png",
-        "text": "工单"
-      },
-      {
-        "pagePath": "pages/model/model",
-        "iconPath": "/static/images/tabbar/shop.png",
-        "selectedIconPath": "/static/images/tabbar/shop-active.png",
-        "text": "环境"
-      },
-      {
-        "pagePath": "pages/workark/workark",
-        "iconPath": "/static/images/tabbar/workark.png",
-        "selectedIconPath": "/static/images/tabbar/workark-active.png",
-        "text": "workark"
-      },
-      {
-        "pagePath": "pages/message/message",
-        "iconPath": "static/images/tabbar/chat.png",
-        "selectedIconPath": "static/images/tabbar/chat-active.png",
-        "text": "消息"
-      },
-      {
-        "pagePath": "pages/my/my",
-        "iconPath": "static/images/tabbar/my.png",
-        "selectedIconPath": "static/images/tabbar/my-active.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "lazyCodeLoading": "requiredComponents",
-  "usingComponents": {}
-}

+ 0 - 3
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/app.wxss

@@ -1,3 +0,0 @@
-@import './common/main.wxss';
-
-[data-custom-hidden="true"],[bind-data-custom-hidden="true"]{display: none !important;}

文件差异内容过多而无法显示
+ 0 - 183
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/common/main.js


文件差异内容过多而无法显示
+ 0 - 475
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/common/main.wxss


+ 0 - 234
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -1,234 +0,0 @@
-
-  !function(){try{var a=Function("return this")();a&&!a.Math&&(Object.assign(a,{isFinite:isFinite,Array:Array,Date:Date,Error:Error,Function:Function,Math:Math,Object:Object,RegExp:RegExp,String:String,TypeError:TypeError,setTimeout:setTimeout,clearTimeout:clearTimeout,setInterval:setInterval,clearInterval:clearInterval}),"undefined"!=typeof Reflect&&(a.Reflect=Reflect))}catch(a){}}();
-  /******/ (function(modules) { // webpackBootstrap
-/******/ 	// install a JSONP callback for chunk loading
-/******/ 	function webpackJsonpCallback(data) {
-/******/ 		var chunkIds = data[0];
-/******/ 		var moreModules = data[1];
-/******/ 		var executeModules = data[2];
-/******/
-/******/ 		// add "moreModules" to the modules object,
-/******/ 		// then flag all "chunkIds" as loaded and fire callback
-/******/ 		var moduleId, chunkId, i = 0, resolves = [];
-/******/ 		for(;i < chunkIds.length; i++) {
-/******/ 			chunkId = chunkIds[i];
-/******/ 			if(Object.prototype.hasOwnProperty.call(installedChunks, chunkId) && installedChunks[chunkId]) {
-/******/ 				resolves.push(installedChunks[chunkId][0]);
-/******/ 			}
-/******/ 			installedChunks[chunkId] = 0;
-/******/ 		}
-/******/ 		for(moduleId in moreModules) {
-/******/ 			if(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {
-/******/ 				modules[moduleId] = moreModules[moduleId];
-/******/ 			}
-/******/ 		}
-/******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
-/******/
-/******/ 		while(resolves.length) {
-/******/ 			resolves.shift()();
-/******/ 		}
-/******/
-/******/ 		// add entry modules from loaded chunk to deferred list
-/******/ 		deferredModules.push.apply(deferredModules, executeModules || []);
-/******/
-/******/ 		// run deferred modules when all chunks ready
-/******/ 		return checkDeferredModules();
-/******/ 	};
-/******/ 	function checkDeferredModules() {
-/******/ 		var result;
-/******/ 		for(var i = 0; i < deferredModules.length; i++) {
-/******/ 			var deferredModule = deferredModules[i];
-/******/ 			var fulfilled = true;
-/******/ 			for(var j = 1; j < deferredModule.length; j++) {
-/******/ 				var depId = deferredModule[j];
-/******/ 				if(installedChunks[depId] !== 0) fulfilled = false;
-/******/ 			}
-/******/ 			if(fulfilled) {
-/******/ 				deferredModules.splice(i--, 1);
-/******/ 				result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
-/******/ 			}
-/******/ 		}
-/******/
-/******/ 		return result;
-/******/ 	}
-/******/
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// object to store loaded CSS chunks
-/******/ 	var installedCssChunks = {
-/******/ 		"common/runtime": 0
-/******/ 	}
-/******/
-/******/ 	// object to store loaded and loading chunks
-/******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
-/******/ 	// Promise = chunk loading, 0 = chunk loaded
-/******/ 	var installedChunks = {
-/******/ 		"common/runtime": 0
-/******/ 	};
-/******/
-/******/ 	var deferredModules = [];
-/******/
-/******/ 	// script path function
-/******/ 	function jsonpScriptSrc(chunkId) {
-/******/ 		return __webpack_require__.p + "" + chunkId + ".js"
-/******/ 	}
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/ 	// This file contains only the entry chunk.
-/******/ 	// The chunk loading function for additional chunks
-/******/ 	__webpack_require__.e = function requireEnsure(chunkId) {
-/******/ 		var promises = [];
-/******/
-/******/
-/******/
-/******/
-/******/ 		// JSONP chunk loading for javascript
-/******/
-/******/ 		var installedChunkData = installedChunks[chunkId];
-/******/ 		if(installedChunkData !== 0) { // 0 means "already installed".
-/******/
-/******/ 			// a Promise means "currently loading".
-/******/ 			if(installedChunkData) {
-/******/ 				promises.push(installedChunkData[2]);
-/******/ 			} else {
-/******/ 				// setup Promise in chunk cache
-/******/ 				var promise = new Promise(function(resolve, reject) {
-/******/ 					installedChunkData = installedChunks[chunkId] = [resolve, reject];
-/******/ 				});
-/******/ 				promises.push(installedChunkData[2] = promise);
-/******/
-/******/ 				// start chunk loading
-/******/ 				var script = document.createElement('script');
-/******/ 				var onScriptComplete;
-/******/
-/******/ 				script.charset = 'utf-8';
-/******/ 				script.timeout = 120;
-/******/ 				if (__webpack_require__.nc) {
-/******/ 					script.setAttribute("nonce", __webpack_require__.nc);
-/******/ 				}
-/******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/
-/******/ 				// create error before stack unwound to get useful stacktrace later
-/******/ 				var error = new Error();
-/******/ 				onScriptComplete = function (event) {
-/******/ 					// avoid mem leaks in IE.
-/******/ 					script.onerror = script.onload = null;
-/******/ 					clearTimeout(timeout);
-/******/ 					var chunk = installedChunks[chunkId];
-/******/ 					if(chunk !== 0) {
-/******/ 						if(chunk) {
-/******/ 							var errorType = event && (event.type === 'load' ? 'missing' : event.type);
-/******/ 							var realSrc = event && event.target && event.target.src;
-/******/ 							error.message = 'Loading chunk ' + chunkId + ' failed.\n(' + errorType + ': ' + realSrc + ')';
-/******/ 							error.name = 'ChunkLoadError';
-/******/ 							error.type = errorType;
-/******/ 							error.request = realSrc;
-/******/ 							chunk[1](error);
-/******/ 						}
-/******/ 						installedChunks[chunkId] = undefined;
-/******/ 					}
-/******/ 				};
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				document.head.appendChild(script);
-/******/ 			}
-/******/ 		}
-/******/ 		return Promise.all(promises);
-/******/ 	};
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "/";
-/******/
-/******/ 	// on error function for async loading
-/******/ 	__webpack_require__.oe = function(err) { console.error(err); throw err; };
-/******/
-/******/ 	var jsonpArray = global["webpackJsonp"] = global["webpackJsonp"] || [];
-/******/ 	var oldJsonpFunction = jsonpArray.push.bind(jsonpArray);
-/******/ 	jsonpArray.push = webpackJsonpCallback;
-/******/ 	jsonpArray = jsonpArray.slice();
-/******/ 	for(var i = 0; i < jsonpArray.length; i++) webpackJsonpCallback(jsonpArray[i]);
-/******/ 	var parentJsonpFunction = oldJsonpFunction;
-/******/
-/******/
-/******/ 	// run deferred modules from other chunks
-/******/ 	checkDeferredModules();
-/******/ })
-/************************************************************************/
-/******/ ([]);
-//# sourceMappingURL=../../.sourcemap/mp-weixin/common/runtime.js.map
-  

文件差异内容过多而无法显示
+ 0 - 29791
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/common/vendor.js


文件差异内容过多而无法显示
+ 0 - 372
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/common/upload.js


+ 0 - 6
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/common/upload.json

@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "uv-upload": "/uni_modules/uv-upload/components/uv-upload/uv-upload"
-  }
-}

+ 0 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/common/upload.wxml

@@ -1 +0,0 @@
-<view class="upload-index"><uv-upload class="vue-ref" vue-id="00863568-1" accept="{{accept}}" fileList="{{fileList}}" name="1" multiple="{{true}}" maxCount="{{type==='insert'?5:$root.g0}}" deletable="{{type==='insert'}}" width="160" height="160" data-ref="update" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]],['^clickPreview',[['clickFile']]]]}}" bind:afterRead="__e" bind:delete="__e" bind:clickPreview="__e" bind:__l="__l"></uv-upload></view>

文件差异内容过多而无法显示
+ 0 - 224
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/login/imageCode.js


+ 0 - 4
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/login/imageCode.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

文件差异内容过多而无法显示
+ 0 - 1
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/login/imageCode.wxml


+ 0 - 61
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/components/login/imageCode.wxss

@@ -1,61 +0,0 @@
-.model-container.data-v-5f5ac552 {
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: -1;
-  display: none;
-}
-.model-container.show.data-v-5f5ac552 {
-  z-index: 900;
-  display: block;
-}
-.model.data-v-5f5ac552 {
-  position: absolute;
-  width: 622rpx;
-  background-color: #fff;
-  top: 50%;
-  left: 50%;
-  -webkit-transform: translate3d(-50%, -50%, 0);
-          transform: translate3d(-50%, -50%, 0);
-  margin-top: -100rpx;
-  border-radius: 30rpx;
-  z-index: 902;
-}
-.model .model-content.data-v-5f5ac552 {
-  padding: 40rpx 30rpx;
-}
-.model .model-title.data-v-5f5ac552 {
-  text-align: center;
-}
-.model .model-bottom.data-v-5f5ac552 {
-  display: flex;
-}
-.model .model-bottom .model-bottom-item.data-v-5f5ac552 {
-  flex: 1;
-}
-.model .model-bottom .model-bottom-item:last-of-type .model-bottom-btn.data-v-5f5ac552 {
-  border-left: 1px solid #dadbde;
-  border-bottom-left-radius: 0;
-}
-.model .model-bottom .model-bottom-btn.data-v-5f5ac552 {
-  border: 0;
-  border-top: 1px solid #dadbde;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-  font-size: 32rpx;
-}
-.model .model-bottom .model-bottom-btn.active.data-v-5f5ac552 {
-  opacity: 0.6;
-}
-.model .model-bottom .confirm-btn.data-v-5f5ac552 {
-  color: #3c9cff;
-}
-.model-mask.data-v-5f5ac552 {
-  background-color: rgba(0, 0, 0, 0.4);
-  z-index: 901;
-  width: 100%;
-  height: 100%;
-  position: fixed;
-}

文件差异内容过多而无法显示
+ 0 - 316
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/index/index.js


+ 0 - 8
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -1,8 +0,0 @@
-{
-  "navigationBarTitleText": "工单",
-  "usingComponents": {
-    "uv-empty": "/uni_modules/uv-empty/components/uv-empty/uv-empty",
-    "uv-button": "/uni_modules/uv-button/components/uv-button/uv-button",
-    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
-  }
-}

+ 0 - 0
virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/index/index.wxml


部分文件因为文件数量过多而无法显示