gjy il y a 2 ans
Parent
commit
a99b7d6897

+ 13 - 13
pages/business/businessNew.vue

@@ -58,7 +58,7 @@
 
 						</view>
 						<view class="row2">
-							<mote-lines-divide :dt="item.publishingContent" :line="3" expandText="展开" foldHint="收起" />
+							<mote-lines-divide :dt="item.publishingContent" :line="8" expandText="展开" foldHint="收起" />
 						</view>
 						<view class="row3">
 							<image :src="item1" mode="aspectFill" v-for="(item1,index) in item.imgList"
@@ -202,18 +202,18 @@
 			...mapState(['hasLogin', 'userInfo', 'clientId']),
 		},
 		onLoad() {
-		    uni.getSystemInfo({
-		        success: (res)=> {
-		            this.windowHeight = res.windowHeight;
-		        }
-		    });    
-		    uni.onWindowResize((res) => {
-		        if(res.size.windowHeight < this.windowHeight){
-		            uni.hideTabBar()
-		        }else{
-		            uni.showTabBar()
-		        }
-		    })
+		    // uni.getSystemInfo({
+		    //     success: (res)=> {
+		    //         this.windowHeight = res.windowHeight;
+		    //     }
+		    // });    
+		    // uni.onWindowResize((res) => {
+		    //     if(res.size.windowHeight < this.windowHeight){
+		    //         uni.hideTabBar()
+		    //     }else{
+		    //         uni.showTabBar()
+		    //     }
+		    // })
 		},
 		onShow() {
 			if(uni.getStorageSync('jiaoyikeyword')){

+ 2 - 2
pages/grain_pulse/home.vue

@@ -23,7 +23,7 @@
 			</view> -->
 		</view>
 		<view class="content">
-			<view @click='friendcircle' class="friendcircle">
+			<!-- <view @click='friendcircle' class="friendcircle">
 				<view class='title flex align-item-center Medium'>
 					<image class='icon-friendcircle' src="../../static/img/liangmai/icon.png" mode=""></image>
 					圈友说
@@ -40,7 +40,7 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<scroll-view scroll-x="true" scroll-with-animation="true" class='list-type'>
 				<view v-for='item in searchTypes' @click='mainBusinessTypechange(item)'
 					:class='mainBusinessTypeKey==item.value?"Semibold active":"Regular"' class="typeitem">{{item.name}}

+ 20 - 19
pages/task/audit/Issueandreceipt_task_approval.vue

@@ -732,27 +732,28 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
+								console.log(that.OutList,that.EnterList)
 								that.OutList.inOutFlag = 1
 								that.EnterList.inOutFlag = 2
-								if (that.OutList.taskTypeKey == 1) {
-									that.requestadd(that.OutList)
-								} else if (that.EnterList.taskTypeKey == 2) {
-									that.requestadd(that.EnterList)
-								} else if (
-									that.OutList.taskTypeKey == 3 ||
-									that.OutList.taskTypeKey == 4
-								) {
-									that.requestadd(that.OutList, 'repetition')
-									if (!that.deletetask) {
-										that.requestadd(that.EnterList, 'repetition')
-									}
-								}
-								if (that.retreatList.taskTypeKey == 1 || that.retreatList.taskTypeKey == 2) {
-									that.requestadd(that.retreatList)
-								} else if (that.retreatList.taskTypeKey == 3 || that.retreatList.taskTypeKey ==
-									4) {
-									that.requestadd(that.retreatList, 'repetition')
-								}
+								// if (that.OutList.taskTypeKey == 1) {
+								// 	that.requestadd(that.OutList)
+								// } else if (that.EnterList.taskTypeKey == 2) {
+								// 	that.requestadd(that.EnterList)
+								// } else if (
+								// 	that.OutList.taskTypeKey == 3 ||
+								// 	that.OutList.taskTypeKey == 4
+								// ) {
+								// 	that.requestadd(that.OutList, 'repetition')
+								// 	if (!that.deletetask) {
+								// 		that.requestadd(that.EnterList, 'repetition')
+								// 	}
+								// }
+								// if (that.retreatList.taskTypeKey == 1 || that.retreatList.taskTypeKey == 2) {
+								// 	that.requestadd(that.retreatList)
+								// } else if (that.retreatList.taskTypeKey == 3 || that.retreatList.taskTypeKey ==
+								// 	4) {
+								// 	that.requestadd(that.retreatList, 'repetition')
+								// }
 							}
 						}
 					})