Explorar o código

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

wangchao %!s(int64=3) %!d(string=hai) anos
pai
achega
e4f9edcf02

+ 2 - 2
config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://192.168.1.120:8090/',
-	// baseUrlNew: 'http://api.eliangeyun.com/',
+	// baseUrlNew: 'http://192.168.1.122:9100/',
+	baseUrlNew: 'http://api.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 3 - 3
manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.0",
-    "versionCode" : 110,
+    "versionName" : "1.1.1",
+    "versionCode" : 111,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},
@@ -45,7 +45,7 @@
         }
     },
     "app-plus" : {
-		"runmode":"liberate",
+        "runmode" : "liberate",
         "privacy" : {
             "prompt" : "template",
             "template" : {

+ 48 - 6
pages.json

@@ -22,12 +22,12 @@
 				"selectedIconPath": "static/img/jiaoyi_check.png",
 				"text": "交易"
 			},
-			// {
-			// 	"pagePath": "pages/grain_pulse/home",
-			// 	"iconPath": "static/img/liangmai.png",
-			// 	"selectedIconPath": "static/img/liangmai_check.png",
-			// 	"text": "粮脉"
-			// },
+			{
+				"pagePath": "pages/grain_pulse/home",
+				"iconPath": "static/img/liangmai.png",
+				"selectedIconPath": "static/img/liangmai_check.png",
+				"text": "粮脉"
+			},
 			{
 				"pagePath": "pages/tran/tran",
 				"iconPath": "static/img/wuliu.png",
@@ -65,6 +65,48 @@
 				"navigationBarTitleText": "工厂价格"
 			}
 		},
+		{
+			"path": "pages/grain_pulse/friendcircle",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "动态"
+			}
+		},
+		{
+			"path": "pages/grain_pulse/details",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "详情"
+			}
+		},
+		{
+			"path": "pages/grain_pulse/jubao",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "举报"
+			}
+		},
+		{
+			"path": "pages/grain_pulse/errorcorrection",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "纠错"
+			}
+		},
+		{
+			"path": "pages/grain_pulse/enter",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "入驻"
+			}
+		},
+		{
+			"path": "pages/grain_pulse/search",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "搜索"
+			}
+		},
 		{
 			"path": "pages/sale/portprice",
 			"style": {

+ 253 - 0
pages/grain_pulse/details.vue

@@ -0,0 +1,253 @@
+<template>
+	<view>
+		<view class='swiper'>
+			<swiper class="screen-swiper header-swiper" ::class="dotStyle?'square-dot':'round-dot'"
+				:indicator-dots="false" :circular="true"  interval="5000" 
+				 :current="status" @change="topSwiperTab">
+				<swiper-item class="swiper-item" v-for="(item,index) in imagelist" :key="index"
+					:class="status==index?'text-white':''" @click="naviageToPage(item.url)">
+					<image :src="item.url"></image>
+					<!-- 	<view style='position:absolute;top:50%;left:50%;transform: translate(-50%,-50%);'>11111</view> -->
+				</swiper-item>
+			</swiper>
+			<view class="dots">
+				<text class='Regular'>{{status+1}} / {{imagelist.length}}</text>
+			</view>
+			<view class='functionality'>
+				<image @click='show=true' class='jubao' src="../../static/img/liangmai/jubao.png" mode=""></image>
+				<image class='collect' :src="iscollect?'../../static/img/liangmai/shoucang1.png':'../../static/img/liangmai/shoucang-2.png'" mode=""></image>
+			</view>
+		</view>
+		<view class='company'>
+			<view style='padding:21px;'>
+				<view style='font-size:24px;' class='Medium'>中天昊元粮库中天昊元粮库</view>
+				<view style='margin-top:3px;' class='flex'>
+					<view class='aptitude'>
+						<image class='aptitudeImage' :src="aptiutudeStatus?'../../static/img/liangmai/bg_no_check.png':'../../static/img/liangmai/bg_check.png'" mode=""></image>
+						<text class='aptitudeText Medium'>资质</text>
+					</view>
+					<view class='Regular' style='font-size:13px;'>主营:<text>烘干塔 粮库 加工厂</text></view>
+				</view>
+				<view style='margin:12.5px 0;' class='flex'>
+					<view class="tag Regular">
+						超大规模
+					</view>
+					<view class="tag Regular">
+						超大规模
+					</view>
+					<view class="tag Regular">
+						超大规模
+					</view>
+				</view>
+				
+				
+			</view>
+			<view class="generalSituation">
+				<view class="title Medium">企业概况</view>
+				<view class="content Regular">
+					黑龙江中天昊元贸易有限公司成立至今,从仅2名员工的人资力量以及从俭的办公条件,现以发展转型为员工70余人,年贸易周转量150余万吨的规模性粮食贸易公司…
+				</view>
+			</view>
+			<view class='contactWay'>
+				<view class="title Medium">联系方式</view>
+				<view class='contactWayContent'>
+					<view class='flex linkman'>
+						<view style='flex:1;' class='title Regular'>联系人</view>
+						<view style='flex:3;'>
+							<view class='Regular linkmanItem' v-for='item in linkmanList'>
+								{{item.name}} <a :href="item.phone"><image class="phone" src="../../static/img/liangmai/dianhau.png" mode=""></image></a>
+							</view>
+						</view>
+					</view>
+					<view class="flex mailbox">
+						<view style='flex:1;' class='title Regular'>邮箱</view>
+						<view class='Regular' style='font-size:14px;flex:3;'>
+							12345678@xx.com
+						</view>
+					</view>
+					<view class="flex fax">
+						<view style='flex:1;' class='title Regular'>传真</view>
+						<view class='Regular' style='font-size:14px;flex:3;'>
+							12345678@xx.com
+						</view>
+					</view>
+					<view class="flex fax">
+						<view style='flex:1;' class='title Regular'>地址</view>
+						<view style='font-size:14px;flex:3;' class='Regular'>
+							12345678@xx.com
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-picker mode="selector" v-model="show"  @confirm='selecttype' :range="selector"></u-picker>
+	</view>
+	
+</template>
+
+<script>
+	export default {
+	    components: {
+	        
+	    },
+		data() {
+			return {
+				imagelist:[
+					{url:'../../static/img/authentication/banklow(2).png'},
+					{url:'../../static/img/authentication/banklow(2).png'},
+					{url:'../../static/img/authentication/banklow(2).png'}
+				],
+				linkmanList:[
+					{name:'廖经理',phone:'18513069273'},
+					{name:'廖经理',phone:'18513069273'},
+					{name:'廖经理',phone:'18513069273'},
+					{name:'廖经理',phone:'18513069273'},
+				],
+				dotStyle: false,
+				status: 0,
+				show:false,
+				selector:['纠错','举报'],
+				aptiutudeStatus:false,
+				iscollect:false
+			}
+		},
+		onLoad(){
+			
+		},
+		methods: {
+			topSwiperTab(e) {
+				var that = this;
+				this.status = Number(e.target.current);
+			},
+			selecttype(e){
+				console.log(e)
+				if(e[0]==1){
+					uni.navigateTo({
+						url:'/pages/grain_pulse/jubao'
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages/grain_pulse/errorcorrection'
+					})
+				}
+			},
+			jubao(){
+				
+			},
+		}
+	}
+</script>
+
+<style lang='scss' scoped>
+	/* 《--轮播 */
+	.swiper{
+		position:relative;
+		height:281.5px;
+	}
+	.screen-swiper{
+		height:281.5px;
+	}
+	.swiper .dots{
+		position:absolute;
+		bottom:53px;
+		background: rgba(255, 255, 255, 0.4);
+		border-radius: 0px 11px 11px 0px;
+		width: 58.5px;
+		height: 23px;
+		line-height:23px;
+		text-align:center;
+		padding:3px;
+		color:#FFFFFF;
+	}
+	.functionality{
+		position: absolute;
+		right:0;
+		bottom:53px;
+	}
+	.jubao{
+		width:22px;height:19px;
+		margin-right:25px;
+	}
+	.collect{
+		width:22px;height:22px;
+		margin-right:19.5px;
+	}
+	/* 轮播--》 */
+	/*《--公司 */
+	.company{
+		background: linear-gradient(180deg, #FFFFFF 0%, #F7F8FC 100%);
+		height:550px;
+		border-radius:20px;
+		margin-top:-38px;
+		position: relative;
+		z-index: 3;
+	}
+	.aptitude,.aptitudeImage{
+		width: 38px;
+		height:20px;
+	}
+	.aptitude{
+		position:relative;
+		margin-right:5px;
+	}
+	.aptitudeText{
+		color:#8B511E;
+		position:absolute;
+		left:0;
+		width:40px;
+		top:0;
+		text-align:center;
+		width:100%;
+		line-height: 20px;
+		font-size:11px;
+		height:100%;
+	}
+	.tag{
+		background:#F5F6F9;
+		padding:2.5px 6.5px;
+		border-radius:3px;
+		font-size:11px;
+		margin-right:11.5px;
+	}
+	.generalSituation{
+		background:#fff;
+		margin:9px;
+		padding:12px;
+		border-radius:10px;
+		.title{
+			font-size:16px;
+			margin:0 0 9.5px;
+		}
+		.content{
+			font-size:12px;
+			color:#676E80;
+		}
+	}
+	.contactWay{
+		margin:9px;
+		padding:11.5px 13px;
+		background:#fff;
+		border-radius:10px;
+		>.title{
+			font-size:16px;
+			color:#333;
+			margin-bottom:12px;
+		}
+		.contactWayContent{
+			.linkman>.title,.mailbox>.title,.fax>.title,.address>.title{
+				color:#676E80;
+				font-size:14px;
+			}
+			.mailbox,.fax,.address{
+				margin-bottom:10px;
+			}
+			.linkmanItem{
+				margin-bottom:10px;
+			}
+			.phone{
+				width:14px;height:14px;margin-left:6px;
+			}
+		}
+	}
+	/* 公司--》 */
+</style>

+ 11 - 0
pages/grain_pulse/enter.vue

@@ -0,0 +1,11 @@
+<template>
+	<view>
+		11111
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

+ 115 - 0
pages/grain_pulse/errorcorrection.vue

@@ -0,0 +1,115 @@
+<template>
+	<view>
+		<view class="Regular header-title">我是公司名称我是公司名称</view>
+		<view class='content'>
+			<view class='matter'>
+				<view class="title Regular">纠错事项<text style='color:#FB1E1E;'>*</text></view>
+				<view style='position:relative;'>
+					<textarea class='textarea Regular' maxlength="150" v-model='status' placeholder="请输入举报事项" placeholder-style="color:#AFB3BF;" />
+					<view class='Regular words'>{{status.length}}/150个字</view>
+				</view>
+			</view>
+			<view class="uploading">
+				<view class="title Regular">上传图片</view>
+				<u-upload width='140' height='140' :file-list="fileList" :custom-btn="true"  :show-upload-list="showUploadList" ref="uUpload" :max-size="5 * 1024 * 1024" max-count="6" :action="$uploadUrl">
+					<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
+						<image style='width:23px;height:23px;margin-top:10px;' src="../../static/img/liangmai/xiangji-2.png" mode=""></image>
+						<view style='color:#AFB3BF;font-size:10px;' class='Medium'>上传图片</view>
+					</view>
+				</u-upload>
+			</view>
+		</view>
+		<view class="commitwrap">
+			<view class='commit' @click='commit'>提交</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+	    components: {
+	        
+	    },
+		data() {
+			return {
+				status:'',
+				fileList:[]
+			}
+		},
+		onReady() {
+			// 得到整个组件对象,内部图片列表变量为"lists"
+			this.fileList = this.$refs.uUpload.lists;
+		},
+		onLoad(){
+			
+		},
+		methods: {
+			commit(){
+				console.log(this.fileList)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background:#F5F6FA;
+	}
+	.header-title{
+		margin:9.5px;
+		padding:16.5px 12.5px;
+		background:#fff;
+		border-radius:10px;
+		height:51px;
+	}
+	.content{
+		padding:12.5px;margin:9px;
+		background:#fff;
+		border-radius:10px;
+	}
+	.matter .title{
+		font-size:14px;
+		margin-bottom:15px;
+	}
+	.uploading .title{
+		font-size:14px;margin-top:13px;margin-bottom:13px;
+	}
+	.textarea{
+		background:#F9F9FA;
+		font-size:12px;
+		padding:6.5px;
+		width:326.5px;height:70px;
+		border-radius:5px;
+	}
+	.words{
+		font-size:10px;color:#AFB3BF;position: absolute;right:5px;
+		bottom:8px;
+	}
+	.slot-btn{
+		width: 70px;
+		height: 70px;
+		border-radius: 4px;
+		border: 2px dashed #AFB3BF;
+		text-align:center;
+	}
+	.commitwrap{
+		position:fixed;bottom:0;left:0;
+		width:100%;
+	}
+	.commit{
+		background:#22C572;
+		margin:10px 24px;
+		text-align:center;
+		height:46px;line-height:46px;
+		color:#fff;
+		font-size:17px;
+		border-radius:20px;
+	}
+	/deep/.u-delete-icon{
+		top:0;
+		right:0;
+		border-radius:0 0 0 15px;
+		background:rgba(17, 26, 52, 0.5) !important;
+	}
+</style>

+ 9 - 0
pages/grain_pulse/friendcircle.vue

@@ -0,0 +1,9 @@
+<template>
+	<view>11</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

+ 73 - 5
pages/grain_pulse/home.vue

@@ -12,14 +12,14 @@
 				</view>
 			</view>
 			<view class="cu-bar search">
-				<view class="search-form round" @click="naviageToPage('')">
+				<view class="search-form round" @click="naviageToPage('/pages/grain_pulse/search')">
 					<image class='icon-scarch' src="../../static/img/liangmai/sousuo.png" mode=""></image>
 					<view class='Regular'> 请输入货名或标题</view>
 				</view>
 			</view>
 		</view>
-		<view class="content">
-			<view class="friendcircle">
+		<view class="content" >
+			<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>
 					圈友说
@@ -42,15 +42,28 @@
 				<view :class='status==0?"Semibold active":"Regular"' class="typeitem">饲料厂</view>
 				<view :class='status==0?"Semibold active":"Regular"' class="typeitem">饲料厂</view>
 			</view>
-			<view class="listitem">
+			<view @click='todetails' class="listitem">
 				<view class="flex">
 					<image class='listitem-left' src="../../static/img/authentication/bankup(2).png" mode=""></image>
 					<view class="listitem-right">
 						<view class="companyname Medium">中天昊元粮库中天昊元粮库</view>
+						<view class='Regular introduce'>我是企业介绍我是企业介绍我是企业介绍我是</view>
 					</view>
 				</view>
+				<view class="flex  align-item-center justify-between">
+					<view class='companylocation flex align-item-center Regular'>
+						<image class='location' src="../../static/img/liangmai/icon_ditu.png" mode=""></image>
+						辽宁省营口市鲅鱼圈区xx路108号
+					</view>
+					<view class='distance Regular'>50m</view>
+				</view>
 			</view>
 		</view>
+		<view class="enter">
+			<image style='width:56.5px;height:28px;' src="../../static/img/liangmai/ruzhu.png" mode=""></image>
+			<view class='enter-content'>入驻</view>
+		</view>
+		
 	</view>
 </template>
 
@@ -68,7 +81,21 @@
 			
 		},
 		methods: {
-
+			friendcircle(){
+				uni.navigateTo({
+					url:'/pages/grain_pulse/friendcircle'
+				})
+			},
+			todetails(){
+				uni.navigateTo({
+					url:'/pages/grain_pulse/details'
+				})
+			},
+			naviageToPage(item){
+				uni.navigateTo({
+					url:item
+				})
+			}
 		}
 	}
 </script>
@@ -163,6 +190,7 @@
 		width:100%;
 		padding-top:5px;
 		height:49px;
+		overflow-x: scroll;
 	}
 	.typeitem{
 		margin:10px;
@@ -187,9 +215,49 @@
 	}
 	/* 类型--》 */
 	/* 《--数据 */
+	.listitem{
+		background:#fff;
+		margin:10px;
+		padding:15px 19px;
+	}
 	.listitem-left{
 		width:98.5px;
 		height:96.5px;
+		margin-right:8px;
+		border-radius:5px;
+	}
+	.companyname{
+		font-size:14px;
+		color:#333;
+	}
+	.introduce{
+		font-size:12px;
+		color:#676E80;
+	}
+	.companylocation{
+		color:#676E80;
+		background:#F5F6FA;
+		margin-top:8px;
+		padding:4px 10px;
+		border-radius:15px;
+	}
+	.distance{
+		color:#AFB3BF;
+		padding:4px;
+		margin-top:8px;
 	}
 	/* 数据--》 */
+	.enter{
+		position:fixed;
+		right:0;
+		width:56.5px;height:28px;
+	}
+	.enter-content{
+		position:absolute;
+		right:5px;
+		top:50%;
+		transform: translateY(-50%);
+		color:#fff;
+		
+	}
 </style>

+ 115 - 0
pages/grain_pulse/jubao.vue

@@ -0,0 +1,115 @@
+<template>
+	<view>
+		<view class="Regular header-title">我是公司名称我是公司名称</view>
+		<view class='content'>
+			<view class='matter'>
+				<view class="title Regular">举报事项<text style='color:#FB1E1E;'>*</text></view>
+				<view style='position:relative;'>
+					<textarea class='textarea Regular' maxlength="150" v-model='status' placeholder="请输入举报事项" placeholder-style="color:#AFB3BF;" />
+					<view class='Regular words'>{{status.length}}/150个字</view>
+				</view>
+			</view>
+			<view class="uploading">
+				<view class="title Regular">上传图片</view>
+				<u-upload width='140' height='140' :file-list="fileList" :custom-btn="true"  :show-upload-list="showUploadList" ref="uUpload" :max-size="5 * 1024 * 1024" max-count="6" :action="$uploadUrl">
+					<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
+						<image style='width:23px;height:23px;margin-top:10px;' src="../../static/img/liangmai/xiangji-2.png" mode=""></image>
+						<view style='color:#AFB3BF;font-size:10px;' class='Medium'>上传图片</view>
+					</view>
+				</u-upload>
+			</view>
+		</view>
+		<view class="commitwrap">
+			<view class='commit' @click='commit'>提交</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+	    components: {
+	        
+	    },
+		data() {
+			return {
+				status:'',
+				fileList:[]
+			}
+		},
+		onReady() {
+			// 得到整个组件对象,内部图片列表变量为"lists"
+			this.fileList = this.$refs.uUpload.lists;
+		},
+		onLoad(){
+			
+		},
+		methods: {
+			commit(){
+				console.log(this.fileList)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background:#F5F6FA;
+	}
+	.header-title{
+		margin:9.5px;
+		padding:16.5px 12.5px;
+		background:#fff;
+		border-radius:10px;
+		height:51px;
+	}
+	.content{
+		padding:12.5px;margin:9px;
+		background:#fff;
+		border-radius:10px;
+	}
+	.matter .title{
+		font-size:14px;
+		margin-bottom:15px;
+	}
+	.uploading .title{
+		font-size:14px;margin-top:13px;margin-bottom:13px;
+	}
+	.textarea{
+		background:#F9F9FA;
+		font-size:12px;
+		padding:6.5px;
+		width:326.5px;height:70px;
+		border-radius:5px;
+	}
+	.words{
+		font-size:10px;color:#AFB3BF;position: absolute;right:5px;
+		bottom:8px;
+	}
+	.slot-btn{
+		width: 70px;
+		height: 70px;
+		border-radius: 4px;
+		border: 2px dashed #AFB3BF;
+		text-align:center;
+	}
+	.commitwrap{
+		position:fixed;bottom:0;left:0;
+		width:100%;
+	}
+	.commit{
+		background:#22C572;
+		margin:10px 24px;
+		text-align:center;
+		height:46px;line-height:46px;
+		color:#fff;
+		font-size:17px;
+		border-radius:20px;
+	}
+	/deep/.u-delete-icon{
+		top:0;
+		right:0;
+		border-radius:0 0 0 15px;
+		background:rgba(17, 26, 52, 0.5) !important;
+	}
+</style>

+ 922 - 0
pages/grain_pulse/search.vue

@@ -0,0 +1,922 @@
+<template>
+	<view class="content">
+		<view class="map">
+			<view class='Medium flex align-item-center locationwrap'>
+				<image class='location' src="../../static/img/liangmai/icon_ditu.png" mode=""></image>
+				黑龙江中天昊元…
+			</view>
+		</view>
+		<view style='background:#fff;display:flex;' class="cu-bar search">
+			<view style='flex:6;' class="search-form round Medium">
+				<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
+				<input type="text" maxlength="20" :focus="true" v-model="searchKeyWord" @confirm="doSearch()"
+					@input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
+			</view>
+			<view @click='doSearch()' class="Regular" style="width:4%;flex:1;">搜索</view>
+			<u-icon @click='emptysearch' class="cuIcon" v-if='searchKeyWord.length>0' size="34" name="close-circle-fill" color="#D6D9E0"></u-icon>
+			<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
+		</view>
+		<!-- mSearch组件 如果使用原样式,删除组件元素-->
+		<!-- <mSearch class="mSearch-input-box" :mode="2" button="inside" :placeholder="defaultKeyword" @search="doSearch(false)" @input="inputChange" @confirm="doSearch(false)" v-model="keyword"></mSearch> -->
+		<!-- 原样式 如果使用原样式,恢复下方注销代码 -->
+		<!-- 			
+			<view class="input-box">
+				<input type="text" :placeholder="defaultKeyword" @input="inputChange" v-model="keyword" @confirm="doSearch(false)"
+				 placeholder-class="placeholder-class" confirm-type="search">
+			</view>
+			<view class="search-btn" @tap="doSearch(false)">搜索</view> 
+			-->
+		<!-- 原样式 end -->
+		<view class="search-keyword" @touchstart="blur">
+			<scroll-view style='background:#F5F6FA;' class="keyword-list-box"
+				v-show="isShowKeywordList&&keywordList.length>0" scroll-y>
+				<view style='background:#fff;padding:0 15px;border-radius:0rpx 0rpx 30rpx 30rpx;' class="Semibold">
+					<view @click='tabcarchange(0)' class='line' :class='TabCur==0?"active":""'>采购</view>
+					<view @click='tabcarchange(1)' class='line' :class='TabCur==1?"active":""'>销售</view>
+				</view>
+				<view class="introduce-section">
+					<view v-for="(item, index) in keywordList" :key="index" class="guess-item"
+						@click="navToDetailPage(item)">
+						<view class="price-box">
+							<view class="title Medium">{{item.title}}</view>		
+							<view class='flex justify-between align-item-center Regular'>
+								<view v-if='TabCur==0' class='address'>
+									{{item.receivePrivate}}{{item.receiveCity}}{{item.receiveArea}}{{item.receiveWarehouse}}
+								</view>
+								<view v-if='TabCur==1' class='address'>
+									{{item.sendPrivate}}{{item.sendCity}}{{item.sendArea}}{{item.sendWarehouse}}
+								</view>
+								<view class='price NumberBold' v-if='item.procurementPlanType=="期货"'>
+									<text class="number-style">{{item.basisPrice}}</text><text style='font-size:13px;color:#333333;'
+										class="Semibold">元/吨</text></view>
+								<view class='price NumberBold' v-if='item.procurementPlanType=="现货"'>
+									<text class="number-style">{{item.procurementPrice}}</text><text style='font-size:13px;color:#333;'
+										class="Semibold">元/吨</text></view>
+								<view class='price NumberBold' v-if='item.salePlanType=="期货"'><text class="number-style">+{{item.basisPrice}}</text><text
+										style='font-size:13px;color:#333333;' class="Semibold">元/吨</text></view>
+								<view class='price NumberBold' v-if='item.salePlanType=="现货"'><text class="number-style">{{item.salePrice}}</text><text
+										style='font-size:13px;color:#333;' class="Semibold">元/吨</text></view>
+							</view>
+						</view>
+				<view class='flex justify-between Regular'>
+					<view class="Regular">
+						<view class='tag1 tag-bule radius line-pink' v-if='item.procurementPlanType=="现货"'>现货</view>
+						<view class='tag1 tag-bule radius line-pink' v-if='item.procurementPlanType=="期货"'>期货</view>
+						<view class='tag1 tag-bule radius line-pink' v-if='item.salePlanType=="现货"'>现货</view>
+						<view class='tag1 tag-bule radius line-pink' v-if='item.salePlanType=="期货"'>期货</view>
+						<view class='tag1 tag-yellow radius line-green'>{{item.goodsName}}</view>
+						<view class='tag1 tag-red radius line-yellow' v-if="TabCur== 0">{{item.plannedPurchaseVolume}}吨
+						</view>
+						<view class='tag1 tag-red radius line-yellow' v-if="TabCur== 1">{{item.plannedSaleVolume}}吨
+						</view>
+					</view>
+					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货" && TabCur== 0'>
+						今日基差</view>
+					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货" && TabCur== 0'>
+						采购价格</view>
+					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="期货" && TabCur== 1'>今日基差
+					</view>
+					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货" && TabCur== 1'>销售价格
+					</view>
+				</view>
+					</view>
+					<view v-show="isLoadMore">
+						<uni-load-more :status="loadStatus"></uni-load-more>
+					</view>
+				</view>
+			</scroll-view>
+			<view style='height:80vh;' v-show="isShowKeywordList&&keywordList.length==0">
+				<view style='background:#fff;padding:0 15px;'>
+					<view @click='tabcarchange(0)' class='line' :class='TabCur==0?"active":""'>采购</view>
+					<view @click='tabcarchange(1)' class='line' :class='TabCur==1?"active":""'>销售</view>
+				</view>
+				<view style='background:#F5F6FA;height:100%;line-height:80vh;text-align:center;'>
+					暂无相关结果
+				</view>
+			</view>
+			<scroll-view class="keyword-box" v-show="!isShowKeywordList" scroll-y>
+				<view class="keyword-block" v-if="oldKeywordList.records.length>0">
+					<view class="keyword-list-header Medium">
+						<view style='font-size:16px;font-weight:600;'>最近搜索</view>
+						<view>
+							<image @tap="oldDelete" style='width:16px;height:16px;'
+								src="../../static/img/jiaoyi/shanchu@3x.png"></image>
+							<!-- <image @tap="oldDelete" src="./static/delete.png"></image> -->
+							<!-- 	<text class="cuIcon-delete text-gray "  ></text> -->
+
+						</view>
+					</view>
+					<view class="keyword Regular">
+						<view v-for="(keyword,index) in oldKeywordList.records" @tap="doSearch(keyword)" :key="index">
+							{{keyword.searchContent}}
+						</view>
+					</view>
+				</view>
+				<view class="keyword-block Medium">
+					<view class="keyword-list-header">
+						<view style='font-size:16px;font-weight:600;'>推荐搜索</view>
+						<view>
+							<image @tap="hotToggle" :src="'/static/HM-search/attention'+forbid+'.png'"></image>
+						</view>
+					</view>
+					<view class="keyword Regular" v-if="forbid==''">
+						<view v-for="(keyword,index) in hotKeywordList" @tap="doSearch(keyword)" :key="index">
+							{{keyword.searchContent}}
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	//引用mSearch组件,如不需要删除即可
+	import mSearch from '@/components/mehaotian-search-revision.vue';
+	export default {
+		data() {
+			return {
+				defaultKeyword: "",
+				searchKeyWord: "",
+				pageSize: 10,
+				currentPage: 1,
+				oldKeywordList: [],
+				hotKeywordList: [],
+				keywordList: [],
+				forbid: '',
+				isShowKeywordList: false,
+				TabCur: 0,
+				isLoadMore: false,
+				loadStatus: '',
+				content: '搜索'
+			}
+		},
+		onLoad(options) {
+			if (options.searchKeyWord) {
+				this.searchKeyWord = options.searchKeyWord
+			}
+			this.TabCur = options.TabCur
+			if (this.searchKeyWord) {
+				this.isShowKeywordList = true
+				this.getData()
+			}
+		},
+		onShow() {
+			this.init();
+		},
+		components: {
+			//引用mSearch组件,如不需要删除即可
+			mSearch
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		methods: {
+			//详情
+			navToDetailPage(item) {
+				let id = item.id;
+				if (this.TabCur == 0) {
+					uni.navigateTo({
+						url: `/pageA/product/detail?id=${id}`
+					})
+				} else {
+					uni.navigateTo({
+						url: `/pageA/product/sales_detail?id=${id}`
+					})
+				}
+			},
+			init() {
+				this.loadDefaultKeyword();
+				this.loadOldKeyword();
+				this.loadHotKeyword();
+
+			},
+			search(e) {
+				if (e.detail.value.length == 0) {
+					this.isShowKeywordList = false
+					this.loadOldKeyword()
+					this.loadHotKeyword()
+				} else {
+					this.searchKeyWord = e.detail.value
+				}
+			},
+			blur() {
+				uni.hideKeyboard()
+			},
+			doSearch(keyword) {
+				console.log(keyword)
+				if (keyword) {
+					this.searchKeyWord = keyword.searchContent
+
+				}
+				if (this.searchKeyWord.length > 0) {
+					this.isShowKeywordList = true
+					this.$api.doRequest('post', '/searchRecordsInfo/api/addInfo', {
+							commonId: this.userInfo.id,
+							searchContent: this.searchKeyWord
+						}).then(res => {})
+						.catch(res => {
+
+						});
+				} else {
+					this.isShowKeywordList = false
+					this.loadOldKeyword()
+					this.loadHotKeyword()
+				}
+				uni.showLoading({
+					title: '正在加载',
+					mask: true
+				})
+				var param1 = ''
+				if (this.TabCur == 0) {
+					param1 = '/procurementPlanInfo/selectProcurementPlanInfo'
+				} else {
+					param1 = '/salePlanInfo/selectSalePlanInfo'
+				}
+				this.$api.doRequest('get', param1, {
+						pageSize: this.pageSize,
+						currentPage: this.currentPage,
+						searchKeyWord: this.searchKeyWord
+					}).then(res => {
+						uni.hideLoading()
+						this.keywordList = res.data.data.records
+					})
+					.catch(res => {
+						uni.hideLoading()
+						if (res.errmsg) {
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						} else {
+							uni.showToast({
+								title: "系统异常,请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					});
+			},
+			emptysearch() {
+				this.searchKeyWord = ''
+				this.isShowKeywordList = false
+				this.loadOldKeyword()
+				this.loadHotKeyword()
+			},
+			loadHotKeyword() {
+				this.$api.doRequest('get', '/searchRecordsInfo/selectRecommendedSearchRecordsInfo', {
+						pageSize: this.pageSize,
+						currentPage: this.currentPage,
+						commonId: this.userInfo.id
+					}).then(res => {
+						uni.hideLoading()
+						this.hotKeywordList = res.data.data.records
+					})
+					.catch(res => {
+						if (res.errmsg) {
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						} else {
+							uni.showToast({
+								title: "系统异常,请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					});
+			},
+			tabSelect(e) {
+				if (e.currentTarget.dataset.id) {
+					this.TabCur = e.currentTarget.dataset.id;
+				} else {
+					this.TabCur = e.target.current;
+				}
+				this.pages = 1
+				this.isLoadMore = false
+				this.loadData()
+			},
+			getData() {
+				var param1 = ''
+				if (this.TabCur == 0) {
+					param1 = '/procurementPlanInfo/selectProcurementPlanInfo'
+				} else {
+					param1 = '/salePlanInfo/selectSalePlanInfo'
+				}
+				this.$api.doRequest('get', param1, {
+						pageSize: this.pageSize,
+						currentPage: this.currentPage,
+						searchKeyWord: this.searchKeyWord
+					}).then(res => {
+						uni.hideLoading()
+						this.keywordList = res.data.data.records
+					})
+					.catch(res => {
+						if (res.errmsg) {
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						} else {
+							uni.showToast({
+								title: "系统异常,请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					});
+			},
+			//加载默认搜索关键字
+			loadDefaultKeyword() {
+				//定义默认搜索关键字,可以自己实现ajax请求数据再赋值,用户未输入时,以水印方式显示在输入框,直接不输入内容搜索会搜索默认关键字
+				this.defaultKeyword = "默认关键字";
+			},
+			//加载历史搜索,自动读取本地Storage
+			loadOldKeyword() {
+				var that = this
+				this.$api.doRequest('get', '/searchRecordsInfo/selectSearchRecordsInfo', {
+					pageSize: this.pageSize,
+					currentPage: this.currentPage,
+					commonId: this.userInfo.id
+				}).then(res => {
+					uni.hideLoading()
+					that.oldKeywordList = res.data.data
+					console.log(that.oldKeywordList)
+				})
+			},
+			//监听输入
+			inputChange(event) {
+				//兼容引入组件时传入参数情况
+				var keyword = event.detail ? event.detail.value : event;
+				// if (!keyword) {
+				// 	this.keywordList = [];
+				// 	this.isShowKeywordList = false;
+				// 	return;
+				// }
+				// this.isShowKeywordList = true;
+				// //以下示例截取淘宝的关键字,请替换成你的接口
+				// uni.request({
+				// 	url: 'https://suggest.taobao.com/sug?code=utf-8&q=' + keyword, //仅为示例
+				// 	success: (res) => {
+				// 		this.keywordList = this.drawCorrelativeKeyword(res.data.result, keyword);
+				// 	}
+				// });
+			},
+			//高亮关键字
+			drawCorrelativeKeyword(keywords, keyword) {
+				var len = keywords.length,
+					keywordArr = [];
+				for (var i = 0; i < len; i++) {
+					var row = keywords[i];
+					//定义高亮#9f9f9f
+					var html = row[0].replace(keyword, "<span style='color: #9f9f9f;'>" + keyword + "</span>");
+					html = '<div>' + html + '</div>';
+					var tmpObj = {
+						keyword: row[0],
+						htmlStr: html
+					};
+					keywordArr.push(tmpObj)
+				}
+				return keywordArr;
+			},
+			//顶置关键字
+			setkeyword(data) {
+				this.keyword = data.keyword;
+			},
+			//清除历史搜索
+			oldDelete() {
+				var that = this
+				uni.showModal({
+					content: '确定清除历史搜索记录?',
+					success: (res) => {
+						if (res.confirm) {
+							this.$api.doRequest('post', '/searchRecordsInfo/api/deleteSearchRecordsInfo', {
+									commonId: this.userInfo.id
+								}).then(res => {
+									if (res.data.code == 200) {
+										uni.showToast({
+											title: '清除历史搜索成功',
+											icon: 'none',
+											duration: 2000
+										})
+										that.oldKeywordList.records = []
+									}
+								})
+								.catch(res => {
+									uni.showToast({
+										title: '清除历史搜索成功',
+										icon: 'none',
+										duration: 2000
+									})
+								});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			//热门搜索开关
+			hotToggle() {
+				this.forbid = this.forbid ? '' : '_forbid';
+			},
+			// //执行搜索
+			// doSearch(e) {
+			// 	if(e.detail){
+			// 		if(e.detail.value.length>0){
+			// 			this.content='取消'
+			// 			this.isShowKeywordList=true
+			// 			this.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{commonId:this.userInfo.id,searchContent:e.detail.value}).then(res => {
+			// 			})
+			// 			.catch(res => {
+
+			// 			});
+			// 		}else{
+			// 			this.content='搜索'
+			// 			this.isShowKeywordList=false
+			// 			this.loadOldKeyword()
+			// 			this.loadHotKeyword()
+			// 		}
+			// 	}
+			// 	else if(e){
+			// 		if(e.length>0){
+			// 			this.isShowKeywordList=true
+			// 			this.content='取消'
+			// 			this.searchKeyWord = e
+			// 			this.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{commonId:this.userInfo.id,searchContent:e}).then(res => {
+			// 			})
+			// 			.catch(res => {
+
+			// 			})
+			// 		}else{
+			// 			this.content='搜索'
+			// 			this.isShowKeywordList=false
+			// 			this.loadOldKeyword()
+			// 			this.loadHotKeyword()
+			// 		}
+			// 	}
+			// 	uni.showLoading({
+			// 		title: '正在加载',
+			// 		mask:true
+			// 	})
+			// 	var param1=''
+			// 	if (this.TabCur == 0) {
+			// 		param1 = '/procurementPlanInfo/selectProcurementPlanInfo'
+			// 	} else {
+			// 		param1 = '/salePlanInfo/selectSalePlanInfo'
+			// 	}
+			// 	this.$api.doRequest('get', param1,{pageSize:this.pageSize,
+			// 	currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
+			// 		uni.hideLoading()
+			// 		this.keywordList=res.data.data.records
+			// 	})
+			// 	.catch(res => {
+			// 		uni.hideLoading()
+			// 		uni.showToast({
+			// 			title: res.errmsg,
+			// 			icon:'none',
+			// 			duration: 2000
+			// 		})
+			// 	});
+			// 	// console.log(key)
+			// 	// console.log(this.keyword)
+			// 	// key = key ? key : this.keyword ? this.keyword : this.defaultKeyword;
+			// 	// this.keyword = key;
+			// 	// this.saveKeyword(key); //保存为历史 
+			// 	// var TabCur = this.TabCur
+			// 	// uni.navigateTo({
+			// 	// 	url: `/pageA/product/querylist?keywords=${key}&TabCur=${TabCur}`
+			// 	// })
+			// },
+			tabcarchange(status) {
+				this.TabCur = status
+				var param1 = ''
+				if (this.TabCur == 0) {
+					param1 = '/procurementPlanInfo/selectProcurementPlanInfo'
+				} else {
+					param1 = '/salePlanInfo/selectSalePlanInfo'
+				}
+				this.$api.doRequest('get', param1, {
+						pageSize: this.pageSize,
+						currentPage: this.currentPage,
+						searchKeyWord: this.searchKeyWord
+					}).then(res => {
+						if (res.data.code == 200) {
+							this.keywordList = res.data.data.records
+						} else {
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
+							})
+
+						}
+						uni.hideLoading()
+					})
+					.catch(res => {
+						uni.hideLoading()
+						if (res.errmsg) {
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						} else {
+							uni.showToast({
+								title: "系统异常,请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					});
+			},
+			//保存关键字到历史记录
+			saveKeyword(keyword) {
+				uni.getStorage({
+					key: 'OldKeys',
+					success: (res) => {
+						console.log(res.data);
+						var OldKeys = JSON.parse(res.data);
+						var findIndex = OldKeys.indexOf(keyword);
+						if (findIndex == -1) {
+							OldKeys.unshift(keyword);
+						} else {
+							OldKeys.splice(findIndex, 1);
+							OldKeys.unshift(keyword);
+						}
+						//最多10个纪录
+						OldKeys.length > 10 && OldKeys.pop();
+						uni.setStorage({
+							key: 'OldKeys',
+							data: JSON.stringify(OldKeys)
+						});
+						this.oldKeywordList = OldKeys; //更新历史搜索
+					},
+					fail: (e) => {
+						var OldKeys = [keyword];
+						uni.setStorage({
+							key: 'OldKeys',
+							data: JSON.stringify(OldKeys)
+						});
+						this.oldKeywordList = OldKeys; //更新历史搜索
+					}
+				});
+			}
+		}
+	}
+</script>
+<style scoped>
+	.content{
+		padding:13.5px;
+	}
+	page{
+		background:#fff;
+	}
+	.location{
+		width:15.5px;height:17.5px;margin-right:2.5px;
+	}
+	.locationwrap{
+		font-size:16px;
+	}
+	.search-form {
+		background: #F5F6F9;
+	}
+	.cu-bar .search-form{
+		margin:0;margin-right: 15px;
+	}
+	.line {
+		display: inline-block;
+		padding: 5px;
+		position: relative;
+		font-size: 17px;
+	}
+
+	.line.active {
+		font-size: 19px;
+		font-weight: 900;
+	}
+
+	.line.active:after {
+		content: '';
+		display: block;
+		position: absolute;
+		width: 36rpx;
+		height: 6rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 0;
+		background: #22C572;
+		/* border-bottom: 1px solid #22C572; */
+	}
+
+	.search-box {
+		width: 100%;
+		background-color: rgb(242, 242, 242);
+		padding: 15upx 2.5%;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.search-box .mSearch-input-box {
+		width: 100%;
+	}
+
+	.search-box .input-box {
+		width: 85%;
+		flex-shrink: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.search-box .search-btn {
+		width: 15%;
+		margin: 0 0 0 2%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-shrink: 0;
+		font-size: 28upx;
+		color: #fff;
+		background: linear-gradient(to right, #ff9801, #ff570a);
+		border-radius: 60upx;
+	}
+
+	.search-box .input-box>input {
+		width: 100%;
+		height: 60upx;
+		font-size: 32upx;
+		border: 0;
+		border-radius: 60upx;
+		-webkit-appearance: none;
+		-moz-appearance: none;
+		appearance: none;
+		padding: 0 3%;
+		margin: 0;
+		background-color: #ffffff;
+	}
+
+	.placeholder-class {
+		color: #9e9e9e;
+	}
+
+	.search-keyword {
+		width: 100%;
+		background-color: rgb(242, 242, 242);
+	}
+
+	.keyword-list-box {
+		background: #F5F6FA;
+		height: calc(100vh - 110upx);
+		/* padding-top: 10upx; */
+		border-radius: 20upx 20upx 0 0;
+	}
+
+	.keyword-entry-tap {
+		background-color: #eee;
+	}
+
+	.keyword-entry {
+		width: 94%;
+		height: 80upx;
+		margin: 0 3%;
+		font-size: 30upx;
+		color: #333;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		border-bottom: solid 1upx #e7e7e7;
+	}
+
+	.keyword-entry image {
+		width: 60upx;
+		height: 60upx;
+	}
+
+	.keyword-entry .keyword-text,
+	.keyword-entry .keyword-img {
+		height: 80upx;
+		display: flex;
+		align-items: center;
+	}
+
+	.keyword-entry .keyword-text {
+		width: 90%;
+	}
+
+	.keyword-entry .keyword-img {
+		width: 10%;
+		justify-content: center;
+	}
+
+	.keyword-box {
+		height: calc(100vh - 110upx);
+		border-radius: 20upx 20upx 0 0;
+		background-color: #fff;
+	}
+
+	.keyword-box .keyword-block {
+		padding: 10upx 0;
+	}
+
+	.keyword-box .keyword-block .keyword-list-header {
+		width: 94%;
+		padding: 10upx 3%;
+		font-size: 27upx;
+		color: #333;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.keyword-box .keyword-block .keyword-list-header image {
+		width: 40upx;
+		height: 40upx;
+	}
+
+	.keyword-box .keyword-block .keyword {
+		width: 94%;
+		padding: 3px 3%;
+		display: flex;
+		flex-flow: wrap;
+		justify-content: flex-start;
+	}
+
+	.keyword-box .keyword-block .hide-hot-tis {
+		display: flex;
+		justify-content: center;
+		font-size: 28upx;
+		color: #6b6b6b;
+	}
+
+	.keyword-box .keyword-block .keyword>view {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 60upx;
+		padding: 0 20upx;
+		margin: 10upx 20upx 10upx 0;
+		height: 60upx;
+		font-size: 28upx;
+		background-color: rgb(242, 242, 242);
+		color: #6b6b6b;
+	}
+
+	.cuIcon {
+		position: absolute;
+		right: 80px;
+	}
+
+	.tag1 {
+		background: #F5F6F9;
+		padding: 5px;
+		color: #333333;
+		display: inline-flex;
+		font-size: 22rpx;
+		border-radius: 3px;
+		margin: 3px;
+	}
+
+	.tag {
+		background: #F5F6F9;
+		padding: 7px 12px;
+		color: #333333;
+		display: inline-flex;
+		font-size: 22rpx;
+		border-radius: 15px;
+		margin: 3px;
+	}
+
+	.tag-bule {
+		background: #EBEEFA;
+		color: #5C76DF;
+	}
+
+	.tag-green {
+		background: #C6F7BC;
+		color: #065112;
+	}
+
+	.tag-yellow {
+		background: #F9F2EA;
+		color: #BE9C69;
+	}
+
+	.tag-red {
+		background: #FEECE6;
+		color: #FE6430;
+	}
+
+	.introduce-section .title {
+		font-size: 17px;
+		height: 40px;
+		line-height: 40px;
+		flex: 2.5;
+		border-bottom: 1px solid #EEEEEE;
+	}
+
+	.introduce-section .address {
+		color: #878C9C;
+		font-size: 12px;
+		padding: 15px 0 10px;
+	}
+
+	.introduce-section .price {
+		padding: 10px 0 10px;
+		color: #FD714F;
+		font-size: 19px;
+		font-weight: 700;
+	}
+
+	/* 销售信息 */
+	.introduce-section {
+		background: #fff;
+		padding: 0upx 30upx 20upx;
+		margin: 10px;
+		border-radius: 4px;
+
+		.guess-item {
+			padding-bottom: 20upx;
+			border-bottom: 1px solid #ccc;
+		}
+
+		.title-tip {
+			flex: 1;
+		}
+
+		.price-box {
+			display: flex;
+			align-items: baseline;
+			height: 70upx;
+			padding: 10upx 0;
+			font-size: 26upx;
+			color: $uni-color-primary;
+		}
+
+		.price {
+			font-size: $font-lg + 2upx;
+		}
+
+		.m-price {
+			margin: 0 12upx;
+			color: $font-color-light;
+			text-decoration: line-through;
+		}
+
+		.coupon-tip {
+			align-items: center;
+			padding: 4upx 10upx;
+			background: $uni-color-primary;
+			font-size: $font-sm;
+			color: #fff;
+			border-radius: 6upx;
+			line-height: 1;
+			transform: translateY(-4upx);
+		}
+
+		.bot-row {
+			display: flex;
+			align-items: center;
+			height: 50upx;
+			font-size: $font-sm;
+			color: $font-color-light;
+
+			view {
+				flex: 1;
+			}
+		}
+	}
+
+	.side-bg {
+		position: absolute;
+		width: 64px;
+		height: 64px;
+		z-index: 1;
+	}
+
+	.drag {
+		position: relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: $uni-text-color-inverse;
+		width: 64px;
+		height: 64px;
+		background: transparent;
+		font-size: $uni-font-size-sm;
+		position: fixed;
+		z-index: 9;
+
+		&.transition {
+			transition: left .3s ease, top .3s ease;
+		}
+	}
+	.number-style{
+		font-size: 44rpx;
+	}
+</style>

+ 40 - 62
pages/sale/information.vue

@@ -300,11 +300,11 @@
 			this.scrollTop = e.scrollTop;
 		},
 		onReachBottom() { //上拉触底函数
-			// if (!this.isLoadMore) { //此处判断,上锁,防止重复请求
-			// 	this.isLoadMore = true
-			// 	this.pages += 1
-			// 	this.getIndexSaleData()
-			// }
+			if (!this.isLoadMore) { //此处判断,上锁,防止重复请求
+				this.isLoadMore = true
+				this.pages += 1
+				this.getMoreData()
+			}
 		},
 		onPullDownRefresh() {
 			this.pages = 1
@@ -486,6 +486,13 @@
 					uni.hideLoading()
 				}).then(res => {
 					let data = res.data
+					for(var k =0;k<data.length;k++){
+						if(data[k].title.length > 20){
+							data[k].title = data[k].title.substring(0,20) + "..."
+						}
+						let _date = new Date(data[k].gmtUpdate)
+						data[k].gmtUpdate = this.$u.timeFormat(_date.getTime(), 'mm-dd hh:MM');
+					}
 					that.newsInfo = data
 					uni.hideLoading()
 				})
@@ -569,71 +576,42 @@
 					}
 				})
 			},
-			getIndexSaleData() {
-				// const that = this
-				// var pages = that.pages
-				// var limit = that.limit
-				// uni.showLoading({
-				// 	title: '正在加载'
-				// })
-				// that.$api.request('integral', 'getIndexSaleData', {
-				// 	page: pages,
-				// 	limit: limit
-				// }, failres => {
-				// 	that.$api.msg(failres.errmsg)
-				// 	that.isLoadMore = false
-				// 	that.loadStatus = 'nomore'
-				// 	if (that.pages > 1) {
-				// 		that.pages -= 1
-				// 	}
-				// 	uni.hideLoading()
-				// }).then(res => {
-				// 	let data = res.data
-				// 	//销售信息
-				// 	if (data.saleInfo.length > 0 ) {
-				// 		that.saleInfo = that.saleInfo.concat(data.saleInfo)
-				// 		that.isLoadMore = false
-				// 	} else {
-				// 		if (that.pages > 1) {
-				// 			that.pages -= 1
-				// 		}
-				// 		that.isLoadMore = true
-				// 		that.loadStatus = 'nomore'
-				// 	}
-				// 	if(data.saleInfo.length < that.limit){
-				// 		if (that.pages > 1) {
-				// 			that.pages -= 1
-				// 		}
-				// 		that.isLoadMore = true
-				// 		that.loadStatus = 'nomore'
-				// 	}
-				// 	uni.hideLoading()
-				// })
+			getMoreData() {
 				const that = this
-				var pages = that.pages
-				var limit = that.limit
-
+				var pages=that.pages
+				var limit=that.limit
+							   
 				uni.showLoading({
-					title: '正在加载',
+					title: '正在加载'
 				})
-				var pages = that.pages
-				var limit = that.limit
 				that.$api.request('news', 'getNewsInfo', {
-					category: 2,
-					page: 1,
-					limit: 10
-				}, failres => {
+					category:2,
+					page: pages,
+					limit:limit
+				},failres => {
 					that.$api.msg(failres.errmsg)
-					that.isLoadMore = false
+					that.isLoadMore=false
 					that.loadStatus = 'nomore'
-					if (that.pages > 1) {
-						that.pages -= 1
-					}
+					if(that.pages>1){that.pages-=1}
 					uni.hideLoading()
 				}).then(res => {
 					let data = res.data
-					that.newsInfo = data
-					that.isLoadMore = false
+					if(data.length > 0){
+						for(var k =0;k<data.length;k++){
+							if(data[k].title.length > 20){
+								data[k].title = data[k].title.substring(0,20) + "..."
+							}
+							let _date = new Date(data[k].gmtUpdate)
+							data[k].gmtUpdate = this.$u.timeFormat(_date.getTime(), 'mm-dd hh:MM');
+						}
+						that.newsInfo = that.newsInfo.concat(data)
+						that.isLoadMore=false
+					}
+					else{
+						if(that.pages>1){that.pages-=1}						
+						that.isLoadMore=true
+						that.loadStatus = 'nomore'
+					}
 					uni.hideLoading()
 				})
 			}
@@ -881,7 +859,7 @@
 		border-radius: 5px;
 		background: #fff;
 		overflow: hidden;
-		height: 366px;
+		// height: 366px;
 	}
 
 	.guess-section-wrap-content {

+ 1 - 1
pages/sale/newsinfo.vue

@@ -229,7 +229,7 @@
 						that.loadStatus = 'nomore'
 						if(that.pages>1){that.pages-=1}
 						uni.hideLoading()
-					}).then(res => {debugger
+					}).then(res => {
 						let data = res.data
 						if(data.length > 0){
 							for(var k =0;k<data.length;k++){

+ 1 - 0
pages/task/my_task.vue

@@ -162,6 +162,7 @@
 				})
 				this.warehouseInOutInfo.statusFlag = this.statusFlag
 				this.warehouseInOutInfo.phone = this.userInfo.phone
+				this.warehouseInOutInfo.pcFlag = 0
 				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfo', this.warehouseInOutInfo).then(res => {
 					if (res.data.code == 200) {

+ 8 - 8
static/css/font.css

@@ -1,19 +1,19 @@
 @font-face {
 	font-family: "PingFang SC";
-	src: url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/PingFang-Bold.ttf'),
-		url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/PingFang-ExtraLight.ttf'),
+	src: url('https://taohaoliang.oss-accelerate.aliyuncs.com/app/tmp/PingFang-Bold.ttf'),
+/* 		url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/PingFang-ExtraLight.ttf'),
 		url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/PingFang-Heavy.ttf'),
-		url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/PingFang-Light.ttf'),
-		url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/PingFang-Medium.ttf'),
-		url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/PingFang-Regular.ttf');
+		url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/PingFang-Light.ttf'), */
+		url('https://taohaoliang.oss-accelerate.aliyuncs.com/app/tmp/PingFang-Medium.ttf'),
+		url('https://taohaoliang.oss-accelerate.aliyuncs.com/app/tmp/PingFang-Regular.ttf');
 		font-weight: normal;
 	font-style: normal;
 }
 @font-face {
 	font-family: "DINPro";
-	src:url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/DINPro-Bold.ttf'),
-		url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/DINPro-Light.ttf'),
-		url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/DINPro-Medium.ttf');
+	src:url('https://taohaoliang.oss-accelerate.aliyuncs.com/app/tmp/DINPro-Bold.ttf'),
+		/* url('https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/DINPro-Light.ttf'), */
+		url('https://taohaoliang.oss-accelerate.aliyuncs.com/app/tmp/DINPro-Medium.ttf');
 		font-weight: normal;
 	font-style: normal;
 }

BIN=BIN
static/img/liangmai/bg_check.png


BIN=BIN
static/img/liangmai/bg_no_check.png


BIN=BIN
static/img/liangmai/dianhau.png


BIN=BIN
static/img/liangmai/jubao.png


BIN=BIN
static/img/liangmai/ruzhu.png


BIN=BIN
static/img/liangmai/shoucang-2.png


BIN=BIN
static/img/liangmai/shoucang1.png


BIN=BIN
static/img/liangmai/xiangji-2.png