1

lihongjuan
base/nearshop.css
pages/luntan/luntan.vue
pages/nearshop/goodtail.vue
pages/nearshop/shopdetail.vue
pages/usercenter/myPublish.vue
static/xiahuang.png
unpackage/debug/android_debug.apk
unpackage/dist/build/app-plus/app-service.js
unpackage/dist/build/app-plus/app-view.js
unpackage/dist/dev/app-plus/app-service.js
unpackage/dist/dev/app-plus/app-view.js
unpackage/dist/dev/app-plus/static/xiahuang.png
unpackage/dist/dev/app-plus/static/下拉@2x (1).png
--- a/base/nearshop.css
查看文件 @10ab42a
+++ b/base/nearshop.css
查看文件 @10ab42a
@@ -145,6 +145,13 @@
 	color: #3C444C;
 	font-size: 28rpx;
 	font-weight: bold;
+	
+}
+.tailnamek{
+	height:40rpx;
+	overflow: hidden;
+	text-overflow:ellipsis;
+	white-space: nowrap;
 }
 .heziprice {
@@ -157,7 +164,7 @@
 }
 .tailhezi {
-	margin-top: 24rpx;
+	margin-top:8rpx;
 }
 .send {
--- a/pages/luntan/luntan.vue
查看文件 @10ab42a
+++ b/pages/luntan/luntan.vue
查看文件 @10ab42a
@@ -15,7 +15,7 @@
 				</view>
 				<view class="proselect flexthree" @click="selprovince">
 					<text class="proname">{{provincename}}</text>
-					<image class="down-ico" src="../../static/xiala.png" />
+					<image class="down-ico" src="../../static/xiahuang.png" />
 				</view>
 				<!-- <picker @change="bindproChange" :value="index" :range="provincelist" range-key="name">
@@ -24,6 +24,10 @@
 			</view>
 			<!-- nav -->
 			<view class="nav-wrap nav-wrapk">
+				<view class="navigator" @click="zhaopin" :data-id="4">
+					<image src="../../static/zhonglogo.png"></image>
+					<text>视频专区</text>
+				</view>
 				<view class="navigator" @click="zhaopin" :data-id="1">
 					<image src="../../static/helppeople.png"></image>
 					<text>帮工招聘求职</text>
@@ -36,10 +40,7 @@
 					<image src="../../static/friend.png"></image>
 					<text>征婚交友</text>
 				</view>
-				<view class="navigator" @click="zhaopin" :data-id="4">
-					<image src="../../static/zhonglogo.png"></image>
-					<text>中面集团</text>
-				</view>
+				
 			</view>
 			<!-- 最新发布 -->
 			<view class="new-release-wrap">
@@ -88,14 +89,10 @@
 							</view>
 						</view>
 					</view>
-
 				</view>
-
-
 			</view>
-		</view>
-
-		<!-- 发布 -->
+		</view>ssss
+		<!-- 发布 -->sss
 		<view class="release-news" v-if="publish">
 			<view class="release-content">
 				<view class="nav-wrap publishnav">
@@ -455,6 +452,7 @@
 		padding: 0 10rpx;
 		box-sizing: border-box;
 		margin-left: 16rpx;
+		background: #fff;
 	}
 	.proname {
@@ -463,6 +461,7 @@
 		text-overflow: ellipsis;
 		white-space: nowrap;
 		margin-right: 5rpx;
+		color:#FF9417
 	}
 	.down-ico {
--- a/pages/nearshop/goodtail.vue
查看文件 @10ab42a
+++ b/pages/nearshop/goodtail.vue
查看文件 @10ab42a
@@ -7,7 +7,7 @@
 		<!-- 面坊商品 -->
 		<view v-if="type==1">
 			<view class="tailbox boxsizing" v-if="goodtail.is_seckill==2||timestatus==3">
-				<view class="tailname">
+				<view class="tailname tailnamek">
 					{{goodtail.name}}
 				</view>
 				<view class="tailhezi flextwo">
@@ -24,7 +24,7 @@
 			</view>
 			<view class="tailbox boxsizing" v-else>
-				<view class="tailname">
+				<view class="tailname tailnamek">
 					<text class='miaobox'>限时秒杀</text>
 					{{goodtail.name}}
 				</view>
@@ -61,7 +61,7 @@
 		<!-- 积分商品 -->
 		<view class="tailbox boxsizing" v-else-if="type==2">
-			<view class="tailname">
+			<view class="tailname tailnamek">
 				{{goodtail.name}}
 			</view>
 			<view class="tailhezi flextwo">
@@ -77,7 +77,7 @@
 		</view>
 		<!-- 店铺商品 -->
 		<view class="tailbox boxsizing" v-else-if="type==3">
-			<view class="tailname">
+			<view class="tailname tailnamek">
 				{{goodtail.name}}
 			</view>
 			<view class="tailhezi flextwo">
@@ -93,15 +93,16 @@
 		</view>
 		<view class="send" v-if="type==1">
-			运费{{mianpostage.postage}} 店铺满{{mianpostage.free_postage}}包邮
+			运费{{mianpostage.postage}} <text style='margin-left:20rpx;'>店铺满{{mianpostage.free_postage}}包邮</text> 
 			<!-- 包邮 店铺满100元包邮 -->
 		</view>
+		
 		<view class="send"  v-if="type==2">
-			运费{{jifenpostpage.postage}} 店铺满{{mianpostage.free_postage}}包邮
+			运费{{jifenpostpage.postage}} <text style='margin-left:20rpx;'>店铺满{{mianpostage.free_postage}}包邮</text> 
 			<!-- 包邮 店铺满100元包邮 -->
 		</view>
 		<view class="send"  v-if="type==3">
-			运费{{shoppostage.postage}} 店铺满{{mianpostage.free_postage}}包邮
+			运费{{shoppostage.postage}} <text style='margin-left:20rpx;'>店铺满{{mianpostage.free_postage}}包邮</text> 
 			<!-- 包邮 店铺满100元包邮 -->
 		</view>
 		<view class="tapnav flextwo">
@@ -852,9 +853,10 @@
 						icon: 'none'
 					})
 					setTimeout(function() {
-						uni.navigateTo({
-							url: '/pages/nearshop/cartlist'
-						})
+						that.shuwrap=false;
+						// uni.navigateTo({
+						// 	url: '/pages/nearshop/cartlist'
+						// })
 					}, 1500)
@@ -893,7 +895,7 @@
 			// },
 			buynowk() {
 				let that = this;
-				uni.setStorageSync("addressitem", "");
+				// uni.setStorageSync("addressitem", "");
 				uni.setStorageSync("couponitem", "")
 				var url = 'order/confirm_order';
 				let obj = {}
--- a/pages/nearshop/shopdetail.vue
查看文件 @10ab42a
+++ b/pages/nearshop/shopdetail.vue
查看文件 @10ab42a
@@ -139,10 +139,12 @@
 				<view class="tapprice">价格</view>
 				<view class="tapbox flexfour">
 					<view class="tapboxtop">
-						<image src="../../static/toprow.png" mode=""></image>
+						<image src="../../static/shangsan.png" mode="" v-if="order==3"></image>
+						<image src="../../static/toprow.png" mode="" v-else></image>
 					</view>
 					<view class="tapboxtop">
-						<image src="../../static/xiarow.png" mode=""></image>
+						<image src="../../static/xiasan.png" mode="" v-if="order==4"></image>
+						<image src="../../static/xiarow.png" mode="" v-else></image>
 					</view>
 				</view>
 			</view>
@@ -240,18 +242,18 @@
 			// 排序
 			orderrange(e) {
 				this.order = e.currentTarget.dataset.id;
-				this.shoplist = [],
+				this.goodlist = [],
 					this.page = 1;
 				 this.getgoodlist();
 			},
 			selprice() {
 				this.price = !this.price;
 				if (this.price == true) {
-					this.order = 4;
+					this.order = 3;
 				} else {
-					this.order = 5;
+					this.order = 4;
 				}
-				this.shoplist = [],
+				this.goodlist = [],
 					this.page = 1;
 				this.getgoodlist();
 			},
--- a/pages/usercenter/myPublish.vue
查看文件 @10ab42a
+++ b/pages/usercenter/myPublish.vue
查看文件 @10ab42a
 <template>
 	<view class="page">
-		<view class="searchbox">
+		<!-- <view class="searchbox">
 			<view class="flexone">
 				<text class="tipsword">开始日期</text>
 				<picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindDateChange">
@@ -15,7 +15,7 @@
 			</view>
 			<view class="searchbtn" @click="search">搜索</view>
-		</view>
+		</view> -->
 		<view class="nodata" v-if="publishlist.length==0">暂无数据</view>
 		<view class="box" v-else>
@@ -29,10 +29,11 @@
 					<image src="../../static/del.png" mode="widthFix" class="del" @click.stop="del(item)"></image>
 				</view>
 				<view class="wordarea">
+					
 					{{item.content}}
 				</view>
 				<view class="numbox">
-					<view class="time">{{item.createtime}}</view>
+					<view class="time">{{item.creatssssetime}}</view>
 					<view class="btnbox">
 						<view class="zan">
 							<image src="../../static/zan.png" mode="widthFix" class="icon"></image>{{item.praise}}
@@ -131,22 +132,22 @@
 			getpublish() {
 				let that = this;
 				// 将时间转换成时间戳
-				if(that.CompareDate(that.date,that.dateone)==true){
-					uni.showToast({
-						title:'结束日期要大于开始日期',
-						icon:"none"
-					})
+				// if(that.CompareDate(that.date,that.dateone)==true){
+				// 	uni.showToast({
+				// 		title:'结束日期要大于开始日期',
+				// 		icon:"none"
+				// 	})
-					return false
-				}
+				// 	return false
+				// }
 				var url = 'forum/get_my_forum';
 				var params = {
-					starttime: that.date,
-					endtime: that.dateone,
+					starttime:'',
+					endtime: '',
 					user_id: uni.getStorageSync("user_id"),
-					page: that.page,
-					pageNum: 10
+					page: '',
+					pageNum: ''
 				}
 				console.log('7766554', params)
 				app.post(url, params).then((res) => {
@@ -285,6 +286,7 @@
 		background: #fff;
 		padding: 0 32rpx;
 		box-sizing: border-box;
+		margin-top:20rpx;
 	}
 	.item {
@@ -340,7 +342,7 @@
 		-webkit-box-orient: vertical;
 		-webkit-line-clamp: 3;
 		overflow: hidden;
-		height: 120rpx;
+		height: auto;
 	}
 	.numbox {
--- a/static/xiahuang.png 0 → 100644
查看文件 @10ab42a
+++ b/static/xiahuang.png 0 → 100644
查看文件 @10ab42a
--- a/unpackage/debug/android_debug.apk
查看文件 @10ab42a
+++ b/unpackage/debug/android_debug.apk
查看文件 @10ab42a
--- a/unpackage/dist/build/app-plus/app-service.js
查看文件 @10ab42a
+++ b/unpackage/dist/build/app-plus/app-service.js
查看文件 @10ab42a
--- a/unpackage/dist/build/app-plus/app-view.js
查看文件 @10ab42a
+++ b/unpackage/dist/build/app-plus/app-view.js
查看文件 @10ab42a
--- a/unpackage/dist/dev/app-plus/app-service.js
查看文件 @10ab42a
+++ b/unpackage/dist/dev/app-plus/app-service.js
查看文件 @10ab42a
--- a/unpackage/dist/dev/app-plus/app-view.js
查看文件 @10ab42a
+++ b/unpackage/dist/dev/app-plus/app-view.js
查看文件 @10ab42a
--- a/unpackage/dist/dev/app-plus/static/xiahuang.png 0 → 100644
查看文件 @10ab42a
+++ b/unpackage/dist/dev/app-plus/static/xiahuang.png 0 → 100644
查看文件 @10ab42a
--- a/unpackage/dist/dev/app-plus/static/下拉@2x (1).png 0 → 100644
查看文件 @10ab42a
+++ b/unpackage/dist/dev/app-plus/static/下拉@2x (1).png 0 → 100644
查看文件 @10ab42a