瀏覽代碼

bug 样式调整

lilei 4 年之前
父節點
當前提交
e7f230dad4

+ 1 - 1
hybrid/html/video.html

@@ -153,7 +153,7 @@
 					<!-- 评论 -->
 					<div class="pz-pinglun">
 						<div class="remarks">
-							<a-textarea placeholder="请填写备注内容(选填)" v-model="curZbItem.comments" :rows="4" />
+							<a-textarea :maxLength="300" placeholder="请填写备注内容(最多300个字符)" v-model="curZbItem.comments" :rows="4" />
 						</div>
 						<div class="icons" @click="takePhotos(2)">
 							<a-icon class="aicon" type="camera" />

+ 14 - 9
pages/organization/organization.vue

@@ -25,7 +25,7 @@
 						<text class="listData-item-l-name">{{item.name}}</text>
 					</view>
 					<view class="listData-item-r">
-						<u-icon class="listData-item-r-icon" name="yuanchengxundian" custom-prefix="xd-icon" size="40" color="#2b85e4"></u-icon>
+						<u-icon class="listData-item-r-icon" name="icon-xian-11" custom-prefix="xd-icon" size="24" color="#2b85e4"></u-icon>
 					</view>
 				</view>
 				<u-empty :text="noDataText" img-width="120" v-if="list.length == 0 && status != 'loading'" style="padding: 150px 0 180px;background: #fff;" mode="list"></u-empty>
@@ -181,20 +181,19 @@
 <style lang="scss">
 	page {
 		background-color: #f8f8f8;
-		height: calc(100vh - 44px);
+		height: 100vh;
 		position: relative;
 	}
 	.organization-wrap{
-		padding-top: 98upx;
 		.organization-root-tit{
 			position: fixed;
 			left: 0;
 			top: 0;
 			width: 100%;
 			padding: 20upx 30upx;
-			line-height: 48upx;
+			line-height: 45upx;
 			background-color: #fff;
-			border-bottom: 20upx solid #f8f8f8;
+			border-bottom: 6upx solid #f8f8f8;
 			z-index: 1;
 			.structure-con{
 				display: inline-block;
@@ -211,8 +210,11 @@
 			background-color: #fff;
 			.organization-node-item{
 				display: flex;
-				padding: 20upx 0;
+				padding: 25upx 10upx 25upx 20upx;
 				border-bottom: 1px solid #f8f8f8;
+				&:active{
+					opacity: 0.5;
+				}
 				&-name{
 					flex-grow: 1;
 				}
@@ -223,20 +225,23 @@
 		}
 		// 门店列表
 		.list-con{
+			padding: 0 20upx;
 			.list-tit{
-				padding: 20upx 30upx;
+				padding: 20upx 6upx;
 				border-bottom: 1upx solid #f8f8f8;
 			}
 			.listData-con{
-				padding: 0 30upx;
 				box-sizing: border-box;
 				.listData-item{
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
-					padding: 20upx;
+					padding: 25upx;
 					border-bottom: 1px solid #f8f8f8;
 					background-color: #fff;
+					&:active{
+						opacity: 0.5;
+					}
 					&-l{
 						flex-grow: 1;
 						padding-right: 10upx;

+ 7 - 4
pages/searchPage/searchPage.vue

@@ -14,7 +14,7 @@
 					<text class="listData-item-l-name">{{item.name}}</text>
 				</view>
 				<view class="listData-item-r">
-					<u-icon class="listData-item-r-icon" name="yuanchengxundian" custom-prefix="xd-icon" size="40" color="#2b85e4"></u-icon>
+					<u-icon class="listData-item-r-icon" name="icon-xian-11" custom-prefix="xd-icon" size="24" color="#2b85e4"></u-icon>
 				</view>
 			</view>
 			<u-empty :text="noDataText" img-width="120" v-if="list.length == 0 && status != 'loading'" :margin-top="400" mode="list"></u-empty>
@@ -94,18 +94,18 @@
 								buttons: ['继续巡店','重新开始'],
 							    success: function (result) {
 							        if (result.confirm || result.index==0) {  //  继续巡店
-										uni.navigateTo({
+										uni.redirectTo({
 											url: '/pages/shopTour/shopTour?storeId=' + item.id + '&taskId='+ res.data + '&restart=0&types=video'
 										})
 							        }else if(result.cancel || result.index==1){  //  重新开始
-										uni.navigateTo({
+										uni.redirectTo({
 											url: '/pages/shopTour/shopTour?storeId=' + item.id + '&taskId='+ res.data + '&restart=1&types=video'
 										})
 							        }
 							    }
 							})
 						}else{
-							uni.navigateTo({
+							uni.redirectTo({
 								url: '/pages/shopTour/shopTour?storeId=' + item.id + '&types=video'
 							})
 						}
@@ -154,6 +154,9 @@
 				align-items: center;
 				padding: 20upx 0;
 				border-bottom: 1upx dashed #f8f8f8;
+				&:active{
+					opacity: 0.5;
+				}
 				&-l{
 					flex-grow: 1;
 					padding-right: 10upx;

+ 3 - 0
pages/videoShopTour/videoShopTour.vue

@@ -163,6 +163,9 @@
 					padding: 25upx 15upx;
 					border-bottom: 1px solid #F8F8F8;
 					background-color: #fff;
+					&:active{
+						opacity: 0.5;
+					}
 					&-l{
 						flex-grow: 1;
 						padding-right: 10upx;

文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/app-plus/app-config-service.js


文件差異過大導致無法顯示
+ 3 - 3
unpackage/dist/dev/app-plus/app-service.js


文件差異過大導致無法顯示
+ 49 - 51
unpackage/dist/dev/app-plus/app-view.js


+ 3 - 2
unpackage/dist/dev/app-plus/hybrid/html/video.html

@@ -153,7 +153,7 @@
 					<!-- 评论 -->
 					<div class="pz-pinglun">
 						<div class="remarks">
-							<a-textarea placeholder="请填写备注内容(选填)" v-model="curZbItem.comments" :rows="4" />
+							<a-textarea :maxLength="300" placeholder="请填写备注内容(最多300个字符)" v-model="curZbItem.comments" :rows="4" />
 						</div>
 						<div class="icons" @click="takePhotos(2)">
 							<a-icon class="aicon" type="camera" />
@@ -355,7 +355,8 @@
 					// 耗时计算
 					haoshi() {
 						let s = this.kptj.startTime
-						this.kptj.haoshi = moment().diff(s, 'hours') + '时' + moment().diff(s, 'minutes') % 60 + '分'
+						let times = moment().diff(s, 'hours') + '时' + moment().diff(s, 'minutes') % 60 + '分'
+						this.$set(this.kptj,'haoshi',times)
 					},
 					// 发送消息给app 页面
 					sendMsg(action, msg) {

部分文件因文件數量過多而無法顯示