Merge branch '2.0' of http://git.zonelife.cn:3000/IT/discounts-minapp into 2.0

pages/activity/index.vue

@@ -40,7 +40,7 @@
 										{{ item.goodsInfoVo.goodsDescribe || '景观中国天眼探索宇宙深度的秘密宇宙深度的秘宇宙深度的秘宇宙深度的秘宇宙深度的秘' }}
 									</view>
 									<view class="itinerary">
-										出发时间 {{ $u.timeFormat(item.reserveTime, 'yyyy-mm-dd') }}·{{ item.stateStr }}
+										出发时间 {{ $u.timeFormat(item.reserveTime, 'yyyy-mm-dd') }}
 									</view>
 								</view>
 								<view class="image">

pages/dev/index.vue

@@ -10,6 +10,7 @@
     <button @click="toShare">记录研学历程</button>
     <button @click="jscode">获取jscode</button>
     <button @click="fenxiang">研学分享</button>
+    <button @click="daijia">代驾</button>
     <uni-calendar ref="calendar" :showMonth="false" style="z-index: 999;" :insert="false" @confirm="confirm"
       title="出发时间" :showCancelAndOk="false">
       <template v-slot:btn>
@@ -31,6 +32,11 @@ export default {
     };
   },
   methods: {
+    daijia(){
+      uni.navigateTo({
+        url: '/trip/index/index'
+      });
+    },
     openCalendar() {
       this.$refs.calendar.open();
     },

study/index.vue

@@ -49,7 +49,7 @@
 						<view class="user-info">
 							<!-- <image class="head" :src="item.logoPath"></image> -->
 							<view class="user-name">
-								{{item.shopName}}
+								{{item.goodsDescribe}}
 							</view>
 						</view>
 						<view class="price-box">
@@ -190,13 +190,12 @@
 				getMenu({currentPage:1,pageSize:5,userId,belongType:2}).then(res=>{
 					if(res.state == 'Success'){
 						this.typeList = res.content.records
-						const redRoad = this.typeList.find(item=>item.columnName == '红色革命');
-						// 把红色革命放到列表的第一个
-						if(redRoad){
-							this.typeList = this.typeList.filter(item=>item.columnName != '红色革命')
-							this.typeList.unshift(redRoad)
-						}
-						console.log(res.content.records);
+						// const redRoad = this.typeList.find(item=>item.columnName == '红色革命');
+						// // 把红色革命放到列表的第一个
+						// if(redRoad){
+						// 	this.typeList = this.typeList.filter(item=>item.columnName != '红色革命')
+						// 	this.typeList.unshift(redRoad)
+						// }
 					}
 				})
 			},
@@ -424,6 +423,12 @@
 						.user-name{
 							color: #AAAAAA;
 							font-size: 24rpx;
+							// 超出部分变成...
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 1; 
+							overflow: hidden;
+							text-overflow: ellipsis;
 							// margin-left: 12rpx;
 						}
 					}
@@ -512,6 +517,10 @@
 							color: #AAAAAA;
 							font-size: 24rpx;
 							overflow: hidden;
+							text-overflow: ellipsis;
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 1; 
 							// margin-left: 12rpx;
 						}
 					}

study/studyGoodsDetail.vue

@@ -32,7 +32,7 @@
 
 			<view class="reservation" @click="openCalendar">
 				<view class="text">
-					<text style="color:#AAAAAA;margin-right:28rpx;"> 已预定 </text> {{ reserveTime ? '预定' + $u.timeFormat(new
+					<text style="color:#AAAAAA;margin-right:28rpx;"> 预定 </text> {{ reserveTime ? '预定' + $u.timeFormat(new
 						Date(reserveTime), 'yyyy年mm月dd日') + '出发' :
 						info.reservationDate || '' }}
 				</view>
@@ -69,7 +69,7 @@
 
 		<view class="tab-group">
 			<view class="tab" :class="[tab == 1 ? 'active' : '']" @click="handleTab(1)">
-				商品详情
+				详情介绍
 			</view>
 			<view class="tab" :class="[tab == 2 ? 'active' : '']" @click="handleTab(2)">
 				购买须知

study/type.vue

@@ -26,7 +26,7 @@
 						<view class="user-info">
 							<!-- <image class="head" :src="item.goodsPath"></image> -->
 							<view class="user-name">
-								{{ item.shopName }}
+								{{ item.goodsDescribe }}
 							</view>
 						</view>
 						<view class="price-box">
@@ -62,7 +62,7 @@
 						<view class="user-info">
 							<!-- <image class="head" :src="item.goodsPath" mode=""></image> -->
 							<view class="user-name">
-								{{ item.shopName }}
+								{{ item.goodsDescribe }}
 							</view>
 						</view>
 						<view class="price-box">
@@ -144,7 +144,7 @@
 									{{ item.communityName }}
 								</view>
 								<view class="user-name">
-									阅读 {{ item.viewedCount }}
+									观看 {{ item.viewedCount }}
 								</view>
 							</view>
 						</view>
@@ -640,6 +640,11 @@ export default {
 
 					.user-name {
 						font-size: 20rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 1; 
 					}
 				}