Procházet zdrojové kódy

接口联调初版

zhengkaixin před 1 rokem
rodič
revize
08e918b571

+ 49 - 3
components/ApproveInfo.vue

@@ -41,13 +41,20 @@
 								</template>
 		
 								<template v-if="item.type.indexOf('radio')>-1">
-		
+								
 									<u-radio-group v-model="formData[item.key]">
 										<u-radio v-for="(item, index) in item.list?item.list:radioListDefault"
 											:key="index" :name="item.value">
 											{{item.name}}
 										</u-radio>
 									</u-radio-group>
+									<!-- {{radioListDefault.length}}
+									<u-radio-group >
+										<u-radio v-for="(radItem, radIndex) in radioListDefault"
+											:key="radIndex+'_'+item.key" :name="radItem.value">
+											{{radItem.name}}
+										</u-radio>
+									</u-radio-group> -->
 		
 								</template>
 		
@@ -94,8 +101,15 @@
 							</view>
 						</template>
 						<template v-if="item.type.indexOf('texteditor')>-1">
-							<view v-html="formData[item.key]">
+							 
+							<view  class="ql-containerMain">
 								
+								<editor id="editor" class="ql-container"
+								 
+								 show-img-size
+									show-img-toolbar show-img-resize 
+									:read-only="true" @ready="onEditorReady(formData[item.key])">
+								</editor>
 							</view>
 						</template>
 		
@@ -116,6 +130,7 @@
 			personInfo: {},
 			createTime: "",
 			createTime2: "",
+		
 			fileList:{
 				type: Array,
 				default () {
@@ -144,13 +159,41 @@
 		},
 		data() {
 			return {
+				radioListDefault: [{
+					name: '是',
+					value: '1'
+				}, {
+					name: '否',
+					value: '0'
+				}, ],
 				fieldList: [],
 			};
 		},
 		created() {
-			//this.init()
+			
 		},
 		methods:{
+			onEditorReady(html) {
+				// #ifdef MP-BAIDU
+				this.editorCtx = requireDynamicLib('editorLib').createEditorContext('editor');
+				// #endif
+			
+				// #ifdef APP-PLUS || MP-WEIXIN || H5
+				uni.createSelectorQuery().select('#editor').context((res) => {
+					this.editorCtx = res.context
+				
+					if(this.editorCtx){
+						var _this=this
+						console.log(html)
+						this.editorCtx.setContents({
+							html:html
+						})
+					}
+					
+				}).exec()
+				// #endif
+			},
+			
 			init() {
 			// 	this.personInfo = this.carhelp.getPersonInfo()
 			// 	this.createTime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
@@ -337,4 +380,7 @@
 			font-size: 36rpx;
 	}
 	//@import "../data/editor-icon.css";
+	.ql-containerMain{
+		border: 1px solid;
+	}
 </style>

+ 34 - 10
components/ApproveView.vue

@@ -23,9 +23,9 @@
 								
 								viewc3:item.status==1
 								}" >
-									{{item.activityName}}
+									{{item.activityName}}<span class="approveItem_a1_text1or" v-if="item.operation=='or'&&item.wfProcinstActUserList.length>1">或签</span>
 								</view>
-								<view class="approveItem_a1_text2">
+								<view class="approveItem_a1_text2" v-if="0">
 									{{item.remark}}
 								</view>
 								<view class="approveItem_a1_text3">
@@ -33,15 +33,17 @@
 										:key="i+'_'+j" :style="initStart&&it.type==1&&(item.action!=0||item.status==1)?'width: 100%;':''">
 		
 										<view  class="approveItem_a1_text3Img_item1" >
-											<view>
-												<u-avatar size="56" :src="it.headImg" class="img"></u-avatar>
+											<view  class="approveItem_a1_text3Img_item1_1">
+												<u-avatar size="66" :src="it.headImg" class="img"></u-avatar>
 												<u-badge size="mini" count="x" type="info" :absolute="false" v-if="0">
 												
 												</u-badge>
 											</view>
-											<view>
-												<view style="color:#3a7cf7 ;"> {{it.departmentName}}</view>
-												<view><span v-if="it.type==2" class="viewc">抄</span>{{it.personName}}</view>
+											<view class="approveItem_a1_text3Img_item1_2">
+												<view class="approveItem_a1_text3Img_item1_2a"
+												> {{it.departmentName}}</view>
+												<view class="approveItem_a1_text3Img_item1_2b"
+												><span v-if="it.type==2" class="viewc">抄送</span>{{it.personName}}</view>
 											</view>
 										</view>
 										<view v-if="initStart&&it.type==1&&it.action!=0"  class="approveItem_a1_text3Img_item2" >
@@ -116,7 +118,8 @@
 		    background-color: #4CAF50;
 		    color: #fff;
 		    padding: 0px 2px;
-		    border-radius: 4px;
+		    border-radius: 8rpx;
+			font-size: 20rpx;
 	}
 	
 	.approveMain {
@@ -134,7 +137,14 @@
 	
 				.approveItem_a1_text1 {
 					color: rgba(16, 16, 16, 1);
-					font-size: 32rpx;
+					font-size: 32rpx;
+					.approveItem_a1_text1or{
+						background-color: #FF5722;
+						color: #fff;
+						padding: 0px 2px;
+						border-radius: 8rpx;
+						font-size: 20rpx;
+					}
 				}
 	
 				.approveItem_a1_text2 {
@@ -156,7 +166,21 @@
 						 margin-bottom: 10rpx;
 						    display: flex;
 							.approveItem_a1_text3Img_item1{
-								display: flex;
+								display: flex;
+								min-width:100px;
+								max-width: 100px;
+								
+								.approveItem_a1_text3Img_item1_2{
+									margin-left: 4px;
+									.approveItem_a1_text3Img_item1_2a{
+										color:#3a7cf7 ;
+										font-size: 28rpx;
+										
+									}
+									.approveItem_a1_text3Img_item1_2b{
+										font-size: 24rpx;
+									}
+								}
 							}
 							.approveItem_a1_text3Img_item2{
 								    background: #e0dada;

+ 3 - 3
config/.env.dev.js

@@ -4,7 +4,7 @@ const UNI_APP = {
 	//BASE_URL: 'http://192.168.33.220:8086/',
 	IMG_URL:"http://www.jsrailway.com.cn/",
 	
-	//BASE_URL:'http://192.168.77.162:8086/railroad-server/',
+	BASE_URL:'http://192.168.77.162:8086/railroad-server/',
 	//BASE_URL:'http://192.168.77.222:8086/railroad-server/',
 
 	
@@ -13,11 +13,11 @@ const UNI_APP = {
 
 	//openId:"oK9Wr57rAcNzihDN2PEdptprT0As", 
 	// openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
-	openId:"oBEnI6GDWCRQqn_xlyPlCYFY8Amg",//zkx
+	//openId:"oBEnI6GDWCRQqn_xlyPlCYFY8Amg",//zkx
 	openId:"oBEnI6FVaHBZOgnxVa70ePPIBd68",//sz
 	//
 	//openId:"oBEnI6DtjgbX65mL4_nUFtVgo-8Y",
-	//openId:"oBEnI6PiaBMNUMTnjT0ffT1R2JOk",//杨所
+	openId:"oBEnI6PiaBMNUMTnjT0ffT1R2JOk",//杨所
 	//openId:"oBEnI6N9gRq3xOVlw34JfYjhtB9k",//  伊明
 	
 	

+ 3 - 3
pages/mine/mine.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<!-- 个人信息 -->
-		<view class="person-infos" :class="isCard ? '': 'isCard-padd'">
+		<view class="person-infos-data" :class="isCard ? '': 'isCard-padd'">
 			<view class="main">
 				<view class="photo">
 					<img v-if="userInfo.headImg" :src="userInfo.headImg" alt="">
@@ -342,10 +342,10 @@
 	}
 	
 	// 个人信息
-	.person-infos {
+	.person-infos-data {
 		background: linear-gradient(45.45deg, rgba(6, 50, 130, 1) -0.45%, rgba(0, 88, 209, 1) 23.41%, rgba(0, 53, 153, 1) 52.12%, rgba(0, 66, 178, 1) 77.4%, rgba(0, 20, 130, 1) 100.65%);
 		color: rgba(255, 255, 255, 1);
-		padding: 40rpx 32rpx 260rpx 32rpx;
+		padding: 40rpx 32rpx 60rpx 32rpx;
 
 		.main {
 			display: flex;

+ 5 - 3
pages/oawork/approve/info.vue

@@ -6,7 +6,7 @@
 		<approve-info  v-if="viewApproveBl"
 		:fieldInfo="fieldInfo" :formData="formData" :fileList="fileList" ></approve-info>
 		
-		<view class="submitBtn">
+		<view class="submitBtn" v-if="isApproveUser">
 			<u-button type="info" class="submitBtn30" @click="submit(0)">退回</u-button>
 			<u-button type="primary" class="submitBtn60" @click="submit(1)" >通过</u-button>
 		</view>
@@ -92,7 +92,8 @@
 				sp:0,
 				spText:"",
 				spPopup:false,
-				pid:"",
+				pid:"",
+				isApproveUser:false,
 
 			}
 		},
@@ -164,7 +165,8 @@
 				}).then((res) => {
 					uni.hideLoading();
 					this.activityList = res.data.activityList
-					var applyContent = res.data.applyContent
+					var applyContent = res.data.applyContent
+					this.isApproveUser=res.data.isApproveUser;
 					this.init()
 					if(applyContent){
 						this.formData.id=applyContent.id

+ 1 - 1
pages/oawork/approve/list.vue

@@ -15,7 +15,7 @@
 							审批类型:
 						</view>
 						<view class="value">
-							{{item.templateName}}
+							{{item.typeName}}
 							
 						</view>
 					</view>

+ 58 - 6
pages/oawork/business/add.vue

@@ -162,7 +162,9 @@
 										</view>
 
 										<view class="editor-wrapper">
-											<editor id="editor" class="ql-container" placeholder="开始输入..." show-img-size
+											<editor id="editor" class="ql-container"
+											
+											 placeholder="开始输入..." show-img-size
 												show-img-toolbar show-img-resize @statuschange="onStatusChange"
 												:read-only="readOnly" @ready="onEditorReady">
 											</editor>
@@ -176,7 +178,7 @@
 				</template>
 
 			</view>
-			<view class="submitBtn">
+			<view class="submitBtn" v-if="isReady">
 				<u-button type="info" class="submitBtn30" @click="submit(0)">保存</u-button>
 				<u-button type="primary" class="submitBtn60" @click="submit(1)">提交</u-button>
 			</view>
@@ -213,6 +215,7 @@
 				//editor
 				readOnly: false,
 				formats: {},
+				editorCtx:"",
 				//editor
 				oatype: "",
 
@@ -242,8 +245,9 @@
 
 				},
 				id: "",
-				placeholder: '开始输入...'
-
+				placeholder: '开始输入...',
+				isReady:true,
+				themeWordKey:"",
 			}
 		},
 		onLoad(op) {
@@ -286,7 +290,22 @@
 				}
 				return true
 			},
+			
 			submit(draftStatus) {
+				if(this.editorCtx){
+					var _this=this
+					this.formData[this.themeWordKey]=this.editorCtx.getContents({
+						success(obj){
+							_this.formData[_this.themeWordKey]=obj.html
+							console.log(obj.html)
+							_this.submitApi(draftStatus);
+						}
+					})
+				}else{
+					this.submitApi(draftStatus);
+				}
+			},
+			submitApi(draftStatus) {
 				if(draftStatus){
 					var c=this.inspect()
 					if(!c){
@@ -301,6 +320,8 @@
 				this.formData.draftStatus = draftStatus
 				this.formData.formId = this.oatype
 				
+				
+				
 			
 				if(this.$refs.uUpload){
 					var list=this.$refs.uUpload[0].lists.filter(val => {
@@ -381,11 +402,24 @@
 							this.formData[obj.key] = applyContent[obj.key]
 						
 						}
+						
+						if(this.editorCtx){
+							var _this=this
+							//console.log(_this.formData.themeWord)
+							this.editorCtx.setContents({
+								html:_this.formData[_this.themeWordKey]
+							})
+						}
+						
 					}
 					
-					//(this.formData)
+					//console.log("formData",this.formData)
 					////(this.formData.maintenanceDescription,res.data.applyContent.maintenanceDescription)
 				}).catch(error => {
+					this.isReady=false;
+					if(!error){
+						error="未配置审批流程,请联系管理员"
+					}
 					uni.showToast({
 						title: error,
 						icon: "none"
@@ -417,6 +451,10 @@
 				for (var i in this.fieldList) {
 					var obj = this.fieldList[i];
 					this.formData[obj.key] = ""
+					if(obj.type.indexOf('texteditor')>-1){
+						this.themeWordKey=obj.key
+						console.log("this.themeWordKey",this.themeWordKey)
+					}
 				}
 
 				this.action = process.car.BASE_URL + "uploadPicture"
@@ -463,6 +501,15 @@
 				// #ifdef APP-PLUS || MP-WEIXIN || H5
 				uni.createSelectorQuery().select('#editor').context((res) => {
 					this.editorCtx = res.context
+				
+					if(this.editorCtx){
+						var _this=this
+						//console.log(_this.formData.themeWord)
+						this.editorCtx.setContents({
+							html:_this.formData[_this.themeWordKey]
+						})
+					}
+					
 				}).exec()
 				// #endif
 			},
@@ -622,7 +669,12 @@
 				width: 200%;
 			}
 		}
-
+		// .oawork-itemline {
+		// 	.oawork-item1_a {
+				
+		// 		width: 100%;
+		// 	}
+		// }
 		.oawork-textlong {
 			.oawork-item1_a {
 				width: 100%;

+ 1 - 1
pages/oawork/business/info.vue

@@ -141,7 +141,7 @@
 					}
 					this.viewApproveBl=true
 
-					//("formData",this.formData)
+					console.log("formData",this.formData)
 				}).catch(error => {
 					uni.showToast({
 						title: error,

+ 3 - 3
pages/oawork/business/list.vue

@@ -8,8 +8,8 @@
 		<view class="list1">
 			<view class="item" v-for="(item,i) in list" @click="ckInfo(item)" :key="i">
 				 
-				<view class="group">
-					<view  class="group1" v-for="(tinfo,i) in typeKey" :key="i">
+				<view class="group" v-for="(tinfo,i) in typeKey" :key="i">
+					<view  class="group1" >
 						<view class="name">
 							{{tinfo.name}}:
 						</view>
@@ -18,7 +18,7 @@
 							
 						</view>
 					</view>
-					<view  class="group2">
+					<view  class="group2" v-if="i==0">
 						<view class="title">
 							<span :style="{color:recordStatusColor(item.status)}">{{item.statusN}}</span>
 							

+ 1 - 1
pages/oawork/data/oa1.js

@@ -22,7 +22,7 @@ var obj={
 				view:1,
 				text:"日期",
 				sql:["createTime"],
-				viewSql:["createTime"]
+				viewSql:["formData","createTime"]
 			},
 			{
 				key:"",

+ 2 - 2
pages/oawork/data/oa10.js

@@ -6,13 +6,13 @@ var obj={
 		list:[
 			
 			{
-				key:"name4",
+				key:"matter",
 				type:["text"],
 				text:"事项",	
 				//isrequset:1
 			},
 			{
-				key:"name5",
+				key:"content",
 				type:["textlong"],
 				text:"内容",
 				//isrequset:1

+ 15 - 4
pages/oawork/data/oa2.js

@@ -3,6 +3,10 @@ var obj={
 		title:"发文稿纸",
 		
 		url:"apply2",
+		typeKey:[{
+			key:"title",
+			name:"标题"
+		}],
 		list:[
 			{
 				key:"fileNumber",
@@ -11,7 +15,7 @@ var obj={
 			},
 			{
 				key:"printing",
-				type:["text","width49"],
+				type:["textnumber","width49"],
 				text:"印数",		
 			},
 			{
@@ -40,7 +44,16 @@ var obj={
 				text:"主题词",
 				
 			},
-			
+			{
+				key:"mainDelivery",
+				type:["text"],
+				text:"主送",
+			},
+			{
+				key:"makeCopy",
+				type:["text"],
+				text:"抄送",
+			},
 			
 			{
 				key:"annexFile",
@@ -49,8 +62,6 @@ var obj={
 				
 			},
 			
-			
-			
 		]
 	}
 export const getdata=()=>{

+ 29 - 16
pages/oawork/data/oa3.js

@@ -2,38 +2,44 @@ var obj={
 		key:"3",
 		title:"合同审核表",
 		//fontsize:28,
-		
+		typeKey:[{
+			key:"name",
+			name:"合同名称"
+		},{
+			key:"number",
+			name:"合同编号"
+		}],
 		url:"apply3",
 		list:[
 			{
-				key:"name1",
+				key:"name",
 				type:["text"],
 				text:"合同名称",
 				
 			},
 			{
-				key:"name2",
+				key:"number",
 				type:["text","width49"],
 				text:"合同编号",		
 			},
 			{
-				key:"name1",
+				key:"counterpart",
 				type:["text","width49"],
 				text:"合同相对方",
 				
 			},
 			{
-				key:"name2",
+				key:"type",
 				type:["text","width49"],
 				text:"合同类别",		
 			},{
-				key:"name1",
+				key:"businessType",
 				type:["text","width49"],
 				text:"业务类型",
 				
 			},
 			{
-				key:"name2",
+				key:"amount",
 				
 				type:["textnumber",'unit'],
 			
@@ -43,7 +49,7 @@ var obj={
 			
 			
 			{
-				key:"name4",
+				key:"content",
 				type:["textlong"],
 				text:"主要业务内容",	
 				//isrequset:1
@@ -69,49 +75,56 @@ var obj={
 				
 			},
 			{
-				key:"name6",
+				key:"complianceOrNot",
 				type:["radio","itemrow"],
 				text:"合同业务是否合规",
 				role:["step1"]   // 0 申请人填写,1 全部可编辑,step0  审批人可审批,step1,  第一步可填写,
 			},
 			{
-				key:"name6",
+				key:"passedOrNot",
 				type:["radio","itemrow"],
 				text:"合同业务是否按照要求通过审批",
 				role:["step1"]   
 			},
 			{
-				key:"name6",
+				key:"legalOrNot",
 				type:["radio","itemrow"],
 				text:"合同资金、资产是否合法",
 				role:["step1"]   
 			},
 			{
-				key:"name6",
+				key:"settlementMethodOrNot",
 				type:["radio","itemrow"],
 				text:"合同价款、酬荆和结算方式是否合规",
 				role:["step1"]   
 			},
 			{
-				key:"name6",
+				key:"usageMethodOrNot",
 				type:["radio","itemrow"],
 				text:"资金、资产的用途及使用方法是否合规",
 				role:["step1"]   
 			},
 			{
-				key:"name6",
+				key:"divider",
+				type:["uview","divider","paddingTop"],
+				view:1,
+				text:"",
+				
+			},
+			{
+				key:"supplementaryExplanation",
 				type:["textlong","itemrow"],
 				text:"合同之外有无其他需要补充说明事项",
 				role:["step1"]   
 			},
 			{
-				key:"name6",
+				key:"handledBy",
 				type:["text","itemrow","width49"],
 				text:"经办人",
 				role:["step1"]   
 			},
 			{
-				key:"name6",
+				key:"head",
 				type:["text","itemrow","width49"],
 				text:"部门负责人",
 				role:["step1"]   

+ 4 - 4
pages/oawork/data/oa4.js

@@ -26,8 +26,8 @@ var obj={
 				sql:["personInfo","orgName"],
 			},
 			{
-				key:"name4",
-				type:["radio"],
+				key:"computeType",
+				type:["radio","textlong"],
 				text:"计算机类型",	
 				isrequset:1,
 				list:[
@@ -36,7 +36,7 @@ var obj={
 				],
 			},
 			{
-				key:"name5",
+				key:"faultPhenomenon",
 				type:["textlong"],
 				text:"故障现象",
 				isrequset:1
@@ -48,7 +48,7 @@ var obj={
 				
 			},
 			{
-				key:"name6",
+				key:"faultDescription",
 				type:["textlong"],
 				text:"故障描述",
 				isrequset:0

+ 2 - 2
pages/oawork/data/oa5.js

@@ -27,14 +27,14 @@ var obj={
 			},
 			
 			{
-				key:"name5",
+				key:"title",
 				type:["text"],
 				text:"标题",
 				isrequset:1
 			},
 			
 			{
-				key:"name6",
+				key:"content",
 				type:["texteditor"],
 				text:"详情",
 				

+ 31 - 7
pages/oawork/data/oa6.js

@@ -6,29 +6,29 @@ var obj={
 		list:[
 			 
 			{
-				key:"name1",
+				key:"receivingDocuments",
 				type:["text"],
 				text:"收文",		
 			},
 			
 			{
-				key:"name2",
+				key:"incomingAgency",
 				type:["text","width49"],
 				text:"来文机关",		
 			},
 			{
-				key:"name3",
+				key:"documentReceived",
 				type:["text","width49"],
 				text:"来文",		
 			},
 			{
-				key:"name3",
+				key:"secretLevel",
 				type:["text","width49"],
 				text:"秘密等级",		
 			},
 			
 			{
-				key:"name3",
+				key:"applyDate",
 				type:["selecttime","width49"],
 				text:"时间",	
 				sql:["createTime"],
@@ -36,7 +36,7 @@ var obj={
 			
 			
 			{
-				key:"name4",
+				key:"subjectMatter",
 				type:["textlong"],
 				text:"事由",	
 				
@@ -51,8 +51,32 @@ var obj={
 				
 			},
 			
+			{
+				key:"documentation",
+				type:["text"],
+				text:"归档",		
+			},
 			
-			
+			{
+				key:"category",
+				type:["text","width49"],
+				text:"类",		
+			},
+			{
+				key:"word",
+				type:["text","width49"],
+				text:"字",		
+			},
+			{
+				key:"num",
+				type:["text","width49"],
+				text:"号",		
+			},
+			{
+				key:"volume",
+				type:["text","width49"],
+				text:"卷",		
+			},
 		]
 	}
 export const getdata=()=>{

+ 4 - 4
pages/oawork/data/oa7.js

@@ -26,25 +26,25 @@ var obj={
 				sql:["personInfo","orgName"],
 			},
 			{
-				key:"name4",
+				key:"reason",
 				type:["textlong"],
 				text:"外出原因",	
 				isrequset:1
 			},
 			{
-				key:"name5",
+				key:"location",
 				type:["textlong"],
 				text:"外出地点",
 				isrequset:1
 			},
 			{
-				key:"name6",
+				key:"travelMode",
 				type:["textlong"],
 				text:"出行方式",
 				isrequset:1
 			},
 			{
-				key:"name7",
+				key:"travelDate",
 				type:["selecttime"],
 				text:"日期",
 				isrequset:1,

+ 6 - 6
pages/oawork/data/oa8.js

@@ -6,31 +6,31 @@ var obj={
 		list:[
 			
 			{
-				key:"name4",
+				key:"title",
 				type:["text"],
 				text:"标题",	
 				isrequset:0
 			},
 			{
-				key:"name5",
-				type:["text","width49"],
+				key:"publishingUnit",
+				type:["text"],
 				text:"发布单位",
 				isrequset:0
 			},
 			{
-				key:"name5",
+				key:"writer",
 				type:["text","width49"],
 				text:"撰稿人",
 				isrequset:0
 			},
 			{
-				key:"name5",
+				key:"releaseColumn",
 				type:["text","width49"],
 				text:"发布栏位",
 				isrequset:0
 			},
 			{
-				key:"name6",
+				key:"content",
 				type:["textlong"],
 				text:"主要内容",
 				isrequset:0

+ 7 - 7
pages/oawork/data/oa9.js

@@ -26,40 +26,40 @@ var obj={
 				sql:["personInfo","orgName"],
 			},
 			{
-				key:"name4",
+				key:"reason",
 				type:["textlong"],
 				text:"用车事由",	
 				isrequset:1
 			},
 			{
-				key:"name5",
-				key2:"name6",
+				key:"startTime",
+				key2:"endTime",
 				type:["selecttime2"],
 				text:"起止时间",
 				
 				isrequset:1
 			},
 			{
-				key:"name6",
+				key:"locations",
 				type:["textlong"],
 				text:"起止地点",
 				isrequset:0
 			},
 			{
-				key:"name7",
+				key:"bankAccount",
 				type:["text"],
 				text:"银行卡号",
 				isrequset:0
 			},
 			{
-				key:"name7",
+				key:"kilometers",
 				type:["text","width49"],
 				text:"公里数",
 				
 				isrequset:0
 			},
 			{
-				key:"name8",
+				key:"amount",
 				type:["textnumber",'unit',"width49"],
 				text:"金额",
 				unit:"元"

+ 1 - 1
pages/oawork/index.vue

@@ -8,7 +8,7 @@
 				<view class="name">{{info.name}}</view>
 				<view class="grid">
 					<u-grid :col="3" :border="false">
-						<u-grid-item   v-for="(item,index) in info.list" :key="index"   v-if="item.show"
+						<u-grid-item   v-for="(item,index) in info.list" :key="index"   
 							@click="gotoItem(info,item)" >
 							<view class="gridItem" :style="item.bgColor?item.bgColor:info.bgColor">
 								<img :src="item.img?item.img:info.img" alt="">