Merge remote-tracking branch 'origin/master'

App.vue

@@ -125,7 +125,7 @@
                 try {
                     // 发起请求获取用户信息
                     const [err, res] = await uni.request({
-                        url: BASE_URL + `/flowable-server/app/proxy?appid=wxa79f618dcaf992f7&secret=24f99f0d9ed67b9078cd545be50f9ccb&code=` + code,
+                        url: BASE_URL + `/flowable-server/app/proxy?appid=wxbcd608a92d6f9412&secret=69d382e18089367566df595b102fe756&code=` + code,
                         method: 'GET'
                     });
 
@@ -188,6 +188,27 @@
             if (flag) {
                 console.log('进来了');
             }
+
+            // 获取 URL 中的 'flow' 参数
+            const flowParam = this.$route.query.flow;
+            // 将 URL 编码的 'flow' 参数解析为 JSON 对象
+            const flowObject = JSON.parse(decodeURIComponent(flowParam));
+            console.log("flowObject.openId---> ", flowObject.openId)
+            if (flowObject.openId) {
+                const [err, res] = await uni.request({
+                    url: BASE_URL + `/auth-server/user/sys/wxLogin`,
+                    method: 'POST',
+                    data: { openId: flowObject.openId },
+                    header: {
+                        'domain': 'ydddl'
+                    }
+                });
+                if (res && res.statusCode === 200) {
+                    this.$store.commit('SET_TOKEN',res.data.token);
+                    await this.refreshUserInfo();
+                }
+            }
+
         },
         methods: {
             ...mapActions(['refreshUserInfo']),

manifest.json

@@ -92,7 +92,14 @@
         },
         "optimization" : {
             "treeShaking" : {
-                "enable" : true
+                "enable" : false
+            }
+        },
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : ""
+                }
             }
         },
         "sdkConfigs" : {

pages/apps/apps.vue

@@ -5,32 +5,32 @@
 		</cu-custom>
 		<scroll-view scroll-y class="page my-app">
 			<view class="grid col-2 padding-sm">
-<!--				<view class="padding-sm">-->
-<!--					<navigator hover-class="none" url="/pages/apps/notification/notification" >-->
-<!--						<view class="padding radius text-center shadow-blur bg-blue">-->
-<!--							<view class="cuIcon-notice text-white circle-button font-size-35"></view>-->
-<!--							<view class="margin-top-sm text-Abc">通告</view>-->
-<!--						</view>-->
-<!--					</navigator>-->
-<!--				</view>-->
-<!--				<view class="padding-sm">-->
-<!--					<navigator hover-class="none" url="/pages/apps/mail/mail" >-->
-<!--						<view class="padding radius text-center shadow-blur bg-blue">-->
-<!--							<view class="cuIcon-mail text-white circle-button font-size-35"></view>-->
-<!--							<view class="margin-top-sm text-Abc">站内信</view>-->
-<!--						</view>-->
-<!--					</navigator>-->
-<!--				</view>-->
-<!--			</view>-->
-<!--			<view class="grid col-3 padding-sm" style="margin-top: -7px;">-->
-<!--				<view class="padding-sm">-->
-<!--					<navigator hover-class="none" url="/pages/example/components" >-->
-<!--						<view class="padding radius text-center shadow-blur bg-white">-->
-<!--							<text class="lg font-size-35 text-blue cuIcon-form"></text>-->
-<!--							<view class="margin-top-sm text-Abc">元素</view>-->
-<!--						</view>-->
-<!--					</navigator>-->
-<!--				</view>-->
+				<!--<view class="padding-sm">
+					<navigator hover-class="none" url="/pages/apps/notification/notification" >
+						<view class="padding radius text-center shadow-blur bg-blue">
+							<view class="cuIcon-notice text-white circle-button font-size-35"></view>
+							<view class="margin-top-sm text-Abc">通告</view>
+						</view>
+					</navigator>
+				</view>
+				<view class="padding-sm">
+					<navigator hover-class="none" url="/pages/apps/mail/mail" >
+						<view class="padding radius text-center shadow-blur bg-blue">
+							<view class="cuIcon-mail text-white circle-button font-size-35"></view>
+							<view class="margin-top-sm text-Abc">站内信</view>
+						</view>
+					</navigator>
+				</view>-->
+			</view>
+			<view class="grid col-3 padding-sm" style="margin-top: -7px;">
+				<view class="padding-sm">
+					<navigator hover-class="none" url="/pages/example/components" >
+						<view class="padding radius text-center shadow-blur bg-white">
+							<text class="lg font-size-35 text-blue cuIcon-form"></text>
+							<view class="margin-top-sm text-Abc">元素</view>
+						</view>
+					</navigator>
+				</view>
 				<view class="padding-sm">
 					<navigator hover-class="none" url="/pages/example/components" >
 						<view class="padding radius text-center shadow-blur bg-white">
@@ -39,27 +39,27 @@
 						</view>
 					</navigator>
 				</view>
-<!--				<view class="padding-sm">-->
-<!--					<navigator hover-class="none" url="/pages/example/basics/icon" >-->
-<!--						<view class="padding radius text-center shadow-blur bg-white">-->
-<!--							<text class="lg font-size-35 text-blue cuIcon-similar"></text>-->
-<!--							<view class="margin-top-sm text-Abc">图标</view>-->
-<!--						</view>-->
-<!--					</navigator>-->
-<!--				</view>-->
-<!--				<view class="padding-sm">-->
-<!--					<navigator hover-class="none" url="/pages/example/ucharts/ucharts" >-->
-<!--						<view class="padding radius text-center shadow-blur bg-white">-->
-<!--							<text class="lg font-size-35 text-blue cuIcon-rank"></text>-->
-<!--							<view class="margin-top-sm text-Abc">图表</view>-->
-<!--						</view>-->
-<!--					</navigator>-->
-<!--				</view>-->
 				<view class="padding-sm">
-<!--					<view class="padding radius text-center shadow-blur bg-white">-->
-<!--						<text class="lg font-size-35 text-blue cuIcon-calendar"></text>-->
-<!--						<view class="margin-top-sm text-Abc">我的日程</view>-->
-<!--					</view>-->
+					<navigator hover-class="none" url="/pages/example/basics/icon" >
+						<view class="padding radius text-center shadow-blur bg-white">
+							<text class="lg font-size-35 text-blue cuIcon-similar"></text>
+							<view class="margin-top-sm text-Abc">图标</view>
+						</view>
+					</navigator>
+				</view>
+				<view class="padding-sm">
+					<navigator hover-class="none" url="/pages/example/ucharts/ucharts" >
+						<view class="padding radius text-center shadow-blur bg-white">
+							<text class="lg font-size-35 text-blue cuIcon-rank"></text>
+							<view class="margin-top-sm text-Abc">图表</view>
+						</view>
+					</navigator>
+				</view>
+				<view class="padding-sm">
+					<!--<view class="padding radius text-center shadow-blur bg-white">
+						<text class="lg font-size-35 text-blue cuIcon-calendar"></text>
+						<view class="margin-top-sm text-Abc">我的日程</view>
+					</view>-->
 					<navigator hover-class="none" url="/pages/calendar/MyCalendar" >
 						<view class="padding radius text-center shadow-blur bg-white">
 							<text class="lg font-size-35 text-blue cuIcon-calendar"></text>
@@ -99,32 +99,32 @@
 						</view>
 					</navigator>
 				</view>
-<!--				<view class="padding-sm">-->
-<!--					<view class="padding radius text-center shadow-blur bg-white">-->
-<!--						<text class="lg font-size-35 text-blue cuIcon-phone"></text>-->
-<!--						<view class="margin-top-sm text-Abc">电话</view>-->
-<!--					</view>-->
-<!--				</view>-->
-<!--				<view class="padding-sm">-->
-<!--					<view class="padding radius text-center shadow-blur bg-white">-->
-<!--						<text class="lg font-size-35 text-blue cuIcon-activity"></text>-->
-<!--						<view class="margin-top-sm text-Abc">工作</view>-->
-<!--					</view>-->
-<!--				</view>-->
-<!--				<view class="padding-sm">-->
-<!--					<view class="padding radius text-center shadow-blur bg-white">-->
-<!--						<text class="lg font-size-35 text-blue cuIcon-hot"></text>-->
-<!--						<view class="margin-top-sm text-Abc">热点</view>-->
-<!--					</view>-->
-<!--				</view>-->
-<!--				<view class="padding-sm">-->
-<!--					<navigator hover-class="none" url="/pages/test/mobile/TestMobileList" >-->
-<!--						<view class="padding radius text-center shadow-blur bg-white">-->
-<!--							<text class="lg font-size-35 text-blue cuIcon-safe"></text>-->
-<!--							<view class="margin-top-sm text-Abc">测试</view>-->
-<!--						</view>-->
-<!--					</navigator>-->
-<!--				</view>-->
+				<view class="padding-sm">
+					<view class="padding radius text-center shadow-blur bg-white">
+						<text class="lg font-size-35 text-blue cuIcon-phone"></text>
+						<view class="margin-top-sm text-Abc">电话</view>
+					</view>
+				</view>
+				<view class="padding-sm">
+					<view class="padding radius text-center shadow-blur bg-white">
+						<text class="lg font-size-35 text-blue cuIcon-activity"></text>
+						<view class="margin-top-sm text-Abc">工作</view>
+					</view>
+				</view>
+				<view class="padding-sm">
+					<view class="padding radius text-center shadow-blur bg-white">
+						<text class="lg font-size-35 text-blue cuIcon-hot"></text>
+						<view class="margin-top-sm text-Abc">热点</view>
+					</view>
+				</view>
+				<view class="padding-sm">
+					<navigator hover-class="none" url="/pages/test/mobile/TestMobileList" >
+						<view class="padding radius text-center shadow-blur bg-white">
+							<text class="lg font-size-35 text-blue cuIcon-safe"></text>
+							<view class="margin-top-sm text-Abc">测试</view>
+						</view>
+					</navigator>
+				</view>
 
 			</view>
 			<u-gap height="80" bgColor="#fff"></u-gap>
@@ -134,7 +134,7 @@
 </template>
 
 <script>
-
+	
 	export default {
 		name: "apps",
 		data() {

pages/cw/invoice/InvoiceFormTask.vue

@@ -312,7 +312,7 @@
             <u-form-item label="附件">
                 <el-upload
                         class="upload-demo"
-                        :action="`http://5hrd5v.natappfree.cc/api/public-modules-server/oss/file/webUpload/upload`"
+                        :action="`http://cpaoa.xgccpm.com/api/public-modules-server/oss/file/webUpload/upload`"
                         :on-remove="(file, fileList) => handleRemove(file, fileList)"
                         :file-list="inputForm.workAttachmentDtoList"
                         :on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList)"
@@ -641,7 +641,7 @@
                 <el-upload
                         :disabled="true"
                         class="upload-demo"
-                        :action="`http://5hrd5v.natappfree.cc/api/public-modules-server/oss/file/webUpload/upload`"
+                        :action="`http://cpaoa.xgccpm.com/api/public-modules-server/oss/file/webUpload/upload`"
                         :on-remove="(file, fileList) => handleRemove(file, fileList)"
                         :file-list="inputForm.workAttachmentDtoList"
                         :on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList)"

pages/cw/reimbursementApproval/info/ReimbursementForm.vue

@@ -372,7 +372,7 @@
             <u-form-item label="电子发票附件" v-if="inputForm.reimbursementType === '1'" :required="true">
                 <el-upload
                         class="upload-demo"
-                        :action="`http://pk2cs5.natappfree.cc/api/public-modules-server/oss/file/disposeXmlFileApp`"
+                        :action="`http://cpaoa.xgccpm.com/api/public-modules-server/oss/file/disposeXmlFileApp`"
                         :on-remove="(file, fileList) => handleRemove(file, fileList, '电子')"
                         :on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList, '电子')"
                         :file-list="inputForm.invoiceReimbursementFiles"
@@ -391,7 +391,7 @@
             <u-form-item label="附件">
                 <el-upload
                         class="upload-demo"
-                        :action="`http://pk2cs5.natappfree.cc/api/public-modules-server/oss/file/webUpload/upload`"
+                        :action="`http://cpaoa.xgccpm.com/api/public-modules-server/oss/file/webUpload/upload`"
                         :on-remove="(file, fileList) => handleRemove(file, fileList,'')"
                         :file-list="inputForm.files"
                         :on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList,'')"

pages/dailyOfficeWork/holiday/HolidayForm.vue

@@ -64,7 +64,7 @@
 			<u-form-item label="附件">
 				<el-upload
 						class="upload-demo"
-						:action="`http://sxkaf8.natappfree.cc/api/public-modules-server/oss/file/webUpload/upload`"
+						:action="`http://cpaoa.xgccpm.com/api/public-modules-server/oss/file/webUpload/upload`"
 						:on-remove="(file, fileList) => handleRemove(file, fileList, '','')"
 						:file-list="inputForm.files"
 						:on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList,'','')"
@@ -142,7 +142,7 @@
 				<el-upload
 						:disabled="true"
 						class="upload-demo"
-						:action="`http://sxkaf8.natappfree.cc/api/public-modules-server/oss/file/webUpload/upload`"
+						:action="`http://cpaoa.xgccpm.com/api/public-modules-server/oss/file/webUpload/upload`"
 						:on-remove="(file, fileList) => handleRemove(file, fileList, '','')"
 						:file-list="inputForm.files"
 						:on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList,'','')"

pages/generateForm/InvoiceModule.vue

@@ -178,7 +178,7 @@
             <u-form-item label="附件">
                 <el-upload
                         class="upload-demo"
-                        :action="`http://pk2cs5.natappfree.cc/api/public-modules-server/oss/file/webUpload/upload`"
+                        :action="`http://cpaoa.xgccpm.com/api/public-modules-server/oss/file/webUpload/upload`"
                         :on-remove="(file, fileList) => handleRemove(file, fileList,'')"
                         :file-list="inputForm.files"
                         :on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList,'')"

pages/generateForm/Test.vue

@@ -76,7 +76,7 @@
             <u-form-item label="附件">
                 <el-upload
                         class="upload-demo"
-                        :action="`http://pk2cs5.natappfree.cc/api/public-modules-server/oss/file/webUpload/upload`"
+                        :action="`http://cpaoa.xgccpm.com/api/public-modules-server/oss/file/webUpload/upload`"
                         :on-remove="(file, fileList) => handleRemove(file, fileList,'')"
                         :file-list="files"
                         :on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList,'')"

pages/materialManagement/purchase/PurchaseForm.vue

@@ -102,7 +102,7 @@
                     <u-form-item label="文件上传">
                         <el-upload
                                 class="upload-demo"
-                                :action="`http://pv4uct.natappfree.cc/api/public-modules-server/oss/file/webUpload/upload`"
+                                :action="`http://cpaoa.xgccpm.com/api/public-modules-server/oss/file/webUpload/upload`"
                                 :on-remove="(file, fileList) => handleRemove(file, fileList, index_experience,'detail')"
                                 :file-list="inputForm.detailInfos[index_experience].fileInfoLost"
                                 :on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList,index_experience,'detail')"
@@ -130,7 +130,7 @@
             <u-form-item label="附件">
                 <el-upload
                         class="upload-demo"
-                        :action="`http://pv4uct.natappfree.cc/api/public-modules-server/oss/file/webUpload/upload`"
+                        :action="`http://cpaoa.xgccpm.com/api/public-modules-server/oss/file/webUpload/upload`"
                         :on-remove="(file, fileList) => handleRemove(file, fileList, '','')"
                         :file-list="inputForm.files"
                         :on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList,'','')"
@@ -245,7 +245,7 @@
                         <el-upload
                                 :disabled="true"
                                 class="upload-demo"
-                                :action="`http://pv4uct.natappfree.cc/api/public-modules-server/oss/file/webUpload/upload`"
+                                :action="`http://cpaoa.xgccpm.com/api/public-modules-server/oss/file/webUpload/upload`"
                                 :on-remove="(file, fileList) => handleRemove(file, fileList, index_experience,'detail')"
                                 :file-list="inputForm.detailInfos[index_experience].fileInfoLost"
                                 :on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList,index_experience,'detail')"
@@ -274,7 +274,7 @@
                 <el-upload
                         :disabled="true"
                         class="upload-demo"
-                        :action="`http://pv4uct.natappfree.cc/api/public-modules-server/oss/file/webUpload/upload`"
+                        :action="`http://cpaoa.xgccpm.com/api/public-modules-server/oss/file/webUpload/upload`"
                         :on-remove="(file, fileList) => handleRemove(file, fileList, '','')"
                         :file-list="inputForm.files"
                         :on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList,'','')"

pages/test/local/LocationDemo.vue

@@ -130,7 +130,7 @@
 					console.log('res', res);
 
 					// 初始化参数
-					const appId = 'wx96885ba58675d910';
+					const appId = 'wxbcd608a92d6f9412';
 					const timestamp = res.timestamp;
 					const nonceStr = res.nonceStr;
 					const signature = res.signature;

pages/workbench/workbench.vue

@@ -149,7 +149,7 @@
 						// this.processMap.set('物资管理', [item])
 						leaveTest.push(item)
 					}
-					if (item.name === '离职申请') {
+					/*if (item.name === '离职申请') {
 						// console.log('item', item)
 						// this.processMap.set('物资管理', [item])
 						resignation.push(item)
@@ -158,7 +158,7 @@
 						// console.log('item', item)
 						// this.processMap.set('物资管理', [item])
 						resignation.push(item)
-					}
+					}*/
 					if (item.name === '会计-报销审批') {
 						// console.log('item', item)
 						// this.processMap.set('物资管理', [item])
@@ -171,8 +171,8 @@
 
 			})
 			this.processMap.set('物资管理', test)
-			this.processMap.set('日常办公', leaveTest)
-			this.processMap.set('人力资源管理', resignation)
+			/*this.processMap.set('日常办公', leaveTest)
+			this.processMap.set('人力资源管理', resignation)*/
 			this.processMap.set('会计', accounting)
 
 			// if (this.isAdmin) {