ccjgmwz 3 سال پیش
والد
کامیت
be8bdfe279

+ 1 - 0
manifest.json

@@ -78,6 +78,7 @@
                 "permissions" : [
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>"

+ 7 - 9
pageA/product/business_buy.vue

@@ -6,7 +6,7 @@
 		<view  class="c-row b-b">
 			<view class="title">卖方</view>
 			<view class="con-list">
-				<view v-if='goods.customerTypeFlag==2' class="title" @click="liang">{{purchaseOrder.compName?purchaseOrder.compName:goods.compName}}></view>
+				<view v-if='goods.customerTypeFlag==2' class="title" @click="liang">{{purchaseOrder.compName?purchaseOrder.compName:goods.compName}}&nbsp></view>
 				<view v-else class="title" @click="liang">{{purchaseOrder.customer?purchaseOrder.customer:goods.customerName}}></view>
 			</view>
 		</view>
@@ -66,7 +66,7 @@
 			<view class="con-list">
 			<picker @change="invoiceChange" :value="invoiceIndex" :range="invoiceType">
 				<view class="picker">
-					{{packingIndex>-1?invoiceType[packingIndex]:'请选择'}}
+					{{invoiceIndex>-1?invoiceType[invoiceIndex]:'请选择'}}
 				</view>
 			</picker>
 			</view>
@@ -87,7 +87,7 @@
 			</picker>
 			</view>
 		</view>
-		<view v-if='packingIndex==0' class="beizhu align-start">
+		<view v-if='packingIndex!=0' class=" beizhu align-start">
 			<view class="title">袋装备注</view>
 			<view >
 			<textarea maxlength="-1" v-model='purchaseOrder.baggingNotes' placeholder="请填写包装规格、质量、包装物要求。例:50kg袋装、大粒、彩包" placeholder-style="font-size: 12px;" class="textareas"></textarea>
@@ -96,7 +96,7 @@
 		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
 			<view class="title">点价(元/吨)</view>
 			<view class="con-list">
-			<input placeholder="请填写点价" name="input" @input='someprice' v-model="purchaseOrder.pointPrice"></input>
+			<input placeholder="请填写点价" name="input" placeholder-style="font-size: 12px;" @input='someprice' v-model="purchaseOrder.pointPrice"></input>
 			</view>
 		</view>
 		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
@@ -111,12 +111,10 @@
 		<input placeholder="请填写包装费" name="input" @input='someprice' v-model="purchaseOrder.packingFee"></input>
 		</view>
 		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class=" align-start ">
+		<view  v-if="purchaseOrder.procurementPlanType=='期货'"  class=" align-start ">
 			<view class="titles">结算价格</view>
 			<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
-			<view class="con-list">
-			<text >{{purchaseOrder.settlementPrice}}</text>
-			</view>
+			<text style="font-size: 18px;color: #FD714F;margin-left: 120rpx;">¥{{purchaseOrder.settlementPrice}}</text>
 			<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
 		</view>
 		<!-- <view style='background:#fff;'>
@@ -476,7 +474,7 @@
 		border-radius: 10px;
 	}
 	.beizhu{
-		margin-left: 20px;
+		margin-left: 15px;
 		margin-bottom: 20px;
 		/* margin: 10px; */
 		margin-top: 10px;

+ 15 - 29
pageA/product/buydetails.vue

@@ -165,7 +165,7 @@
 		<!-- 底部操作菜单 -->
 		<view class="page-bottom">
 			<view class="action-btn-group">
-				<button type="primary" class=" action-btn no-border buy-now-btn" @click="contactUs">在线客服</button>
+				<button type="primary" class=" action-btn no-border buy-now-btn" @click="contactUs">立即沟通</button>
 				<button v-if="goods.status == 1" type="primary" class=" action-btn no-border add-cart-btn" >交易结束</button>
 				<button v-else type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">我要买粮</button>
 			</view>
@@ -262,36 +262,22 @@
 			},
 			contactUs() {
 				const that = this
-				if(that.goods.liangxinId)
-				{
-					let chat = {
-						chatId: that.goods.liangxinId,
-						chatType:0,
-						chatName:'易粮易运'
+				uni.makePhoneCall({
+				 	
+				 	// 手机号
+				    phoneNumber: that.goods.sellerPhone, 
+				
+					// 成功回调
+					success: (res) => {
+						console.log('调用成功!')	
+					},
+				
+					// 失败回调
+					fail: (res) => {
+						console.log('调用失败!')
 					}
-					this.$u.vuex('chatObj',chat);
-					this.$u.route({
-						url:"pageC/chat/chat"
-					});
-				}
-				else{
-					uni.makePhoneCall({
-					 	
-					 	// 手机号
-					    phoneNumber: that.goods.sellerPhone, 
 					
-						// 成功回调
-						success: (res) => {
-							console.log('调用成功!')	
-						},
-					
-						// 失败回调
-						fail: (res) => {
-							console.log('调用失败!')
-						}
-						
-					  });
-				}
+				  });
 				
 			},
 			ViewImage(e) {

+ 13 - 27
pageA/product/detail.vue

@@ -196,7 +196,7 @@
 		<!-- 底部操作菜单 -->
 		<view class="page-bottom1">
 			<view>
-				<button type="primary" @click="contactUs">在线客服</button>
+				<button type="primary" @click="contactUs">立即沟通</button>
 				<button  @click="salegrain" v-if="goods.pcFlag == 1" type="primary" class=" action-btn no-border add-cart-btn" >立即卖粮</button>
 				<button v-else type="primary" class=" action-btn no-border add-cart-btn" 
 				@click="tradeNow">立即发车</button>
@@ -295,33 +295,19 @@
 			},
 			contactUs() {
 				const that = this
-				if(that.goods.liangxinId)
-				{
-					let chat = {
-						chatId: that.goods.liangxinId,
-						chatType:0,
-						chatName:'易粮易运'
+				uni.makePhoneCall({
+				 	// 手机号
+				    phoneNumber: that.goods.buyerPhone, 
+				
+					// 成功回调
+					success: (res) => {
+						console.log('调用成功!')	
+					},
+					// 失败回调
+					fail: (res) => {
+						console.log('调用失败!')
 					}
-					this.$u.vuex('chatObj',chat);
-					this.$u.route({
-						url:"pageC/chat/chat"
-					});
-				}
-				else{
-					uni.makePhoneCall({
-					 	// 手机号
-					    phoneNumber: that.goods.buyerPhone, 
-					
-						// 成功回调
-						success: (res) => {
-							console.log('调用成功!')	
-						},
-						// 失败回调
-						fail: (res) => {
-							console.log('调用失败!')
-						}
-					  });
-				}
+				  });
 				
 			},
 			ViewImage(e) {

+ 1 - 1
pageA/product/detail_buy.vue

@@ -151,7 +151,7 @@
 		<!-- 底部操作菜单 -->
 		<view class="page-bottom">
 			<view class="action-btn-group">
-				<button type="primary" class=" action-btn no-border buy-now-btn" @click="contactUs">联系我们</button>
+				<button type="primary" class=" action-btn no-border buy-now-btn" @click="contactUs">立即沟通</button>
 				<button v-if="goods.status == 20" type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">我要卖粮</button>
 				<button v-else type="primary" class=" action-btn no-border add-cart-btn" >交易结束</button>
 			</view>

+ 15 - 29
pageA/product/saledetails.vue

@@ -165,7 +165,7 @@
 		<!-- 底部操作菜单 -->
 		<view class="page-bottom">
 			<view class="action-btn-group">
-				<button type="primary" class=" action-btn no-border buy-now-btn" @click="contactUs">在线客服</button>
+				<button type="primary" class=" action-btn no-border buy-now-btn" @click="contactUs">立即沟通</button>
 				<button v-if="goods.status == 1" type="primary" class=" action-btn no-border add-cart-btn" >交易结束</button>
 				<button v-else type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">我要买粮</button>
 			</view>
@@ -262,36 +262,22 @@
 			},
 			contactUs() {
 				const that = this
-				if(that.goods.liangxinId)
-				{
-					let chat = {
-						chatId: that.goods.liangxinId,
-						chatType:0,
-						chatName:'易粮易运'
+				uni.makePhoneCall({
+				 	
+				 	// 手机号
+				    phoneNumber: that.goods.sellerPhone, 
+				
+					// 成功回调
+					success: (res) => {
+						console.log('调用成功!')	
+					},
+				
+					// 失败回调
+					fail: (res) => {
+						console.log('调用失败!')
 					}
-					this.$u.vuex('chatObj',chat);
-					this.$u.route({
-						url:"pageC/chat/chat"
-					});
-				}
-				else{
-					uni.makePhoneCall({
-					 	
-					 	// 手机号
-					    phoneNumber: that.goods.sellerPhone, 
 					
-						// 成功回调
-						success: (res) => {
-							console.log('调用成功!')	
-						},
-					
-						// 失败回调
-						fail: (res) => {
-							console.log('调用失败!')
-						}
-						
-					  });
-				}
+				  });
 				
 			},
 			ViewImage(e) {

+ 14 - 28
pageA/product/sales_detail.vue

@@ -208,7 +208,7 @@
 		<!-- 底部操作菜单 -->
 		<view class="page-bottom1">
 			<view>
-				<button type="primary" @click="contactUs">在线客服</button>
+				<button type="primary" @click="contactUs">立即沟通</button>
 				<button  @click="salegrain" v-if="goods.pcFlag == 1" type="primary" class=" action-btn no-border add-cart-btn" >立即买粮</button>
 				<button v-else type="primary" class=" action-btn no-border add-cart-btn" 
 				@click="tradeNow">立即发车</button>
@@ -297,35 +297,21 @@
 			},
 			contactUs() {
 				const that = this
-				if(that.goods.liangxinId)
-				{
-					let chat = {
-						chatId: that.goods.liangxinId,
-						chatType:0,
-						chatName:'易粮易运'
+				uni.makePhoneCall({
+				 	// 手机号
+				    phoneNumber: that.goods.buyerPhone, 
+				
+					// 成功回调
+					success: (res) => {
+						console.log('调用成功!')	
+					},
+				
+					// 失败回调
+					fail: (res) => {
+						console.log('调用失败!')
 					}
-					this.$u.vuex('chatObj',chat);
-					this.$u.route({
-						url:"pageC/chat/chat"
-					});
-				}
-				else{
-					uni.makePhoneCall({
-					 	// 手机号
-					    phoneNumber: that.goods.buyerPhone, 
 					
-						// 成功回调
-						success: (res) => {
-							console.log('调用成功!')	
-						},
-					
-						// 失败回调
-						fail: (res) => {
-							console.log('调用失败!')
-						}
-						
-					  });
-				}
+				  });
 				
 			},
 			ViewImage(e) {

+ 1 - 5
pages/sale/information.vue

@@ -267,7 +267,6 @@
 				// 新闻类型
 				uni.showLoading({
 					title: '正在加载',
-					mask:true
 				})
 				that.$api.request('dict', 'getDictDataList',{
 					dictType: "news_type"
@@ -281,7 +280,6 @@
 				})
 				uni.showLoading({
 					title: '正在加载',
-					mask:true
 				})
 				// 工厂价格
 				that.$api.request('news', 'getFactoryPriceInfo',{
@@ -333,7 +331,6 @@
 				})
 				uni.showLoading({
 					title: '正在加载',
-					mask:true
 				})
 				that.$api.request('integral', 'getIndexData', failres => {
 					that.$api.msg(failres.errmsg)
@@ -461,7 +458,6 @@
 							   
 				uni.showLoading({
 					title: '正在加载',
-					mask:true
 				})
 				that.$api.request('news', 'getNewsInfo', {
 					category:2,
@@ -712,7 +708,7 @@
 		// width:50%;
 	}
 	.guess-section-wrap-item:first-child{
-		margin-left:2px;
+		// margin-left:2px;
 	}
 	.clearfix:after{
 		content:"";

+ 2 - 2
pages/sale/plant.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="guess-section">
 					<view class="cu-card article no-card" style='width: 100%;'>
-						<view class="cu-item shadow factoryItem factorytitle flex justify-between align-center">
+						<view class="cu-item  factoryItem justify-between align-center" style="display:flex;">
 							<view style='flex:1;color:#B2B3BB;'>工厂</view>
 							<view style='flex:1;color:#B2B3BB;'>价格</view>
 							<view style='flex:1;color:#B2B3BB;'>较昨日</view>
@@ -12,7 +12,7 @@
 						v-for="(item, index) in newsInfo" :key="index"
 						class="guess-item">
 						<view class="cu-card article no-card"  >
-							<view class="cu-item shadow factoryItem flex justify-between align-center">
+							<view class="cu-item  factoryItem justify-between align-center"style="display:flex;">
 								<view style='flex:1;'>
 									<view class='factory'>{{item.factory}}</view>
 									<view class='wrap'>{{item.city}} {{item.factoryType}}</view>

+ 2 - 2
pages/sale/portprice.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="guess-section">
 					<view class="cu-card article no-card" style='width: 100%;'>
-						<view class="cu-item shadow factoryItem flex justify-between align-center">
+						<view class="cu-item shadow factoryItem justify-between align-center" style="display:flex;">
 							<view style='flex:1.5;color:#B2B3BB;'>港口</view>
 							<view style='flex:1;color:#B2B3BB;'>价格</view>
 							<view style='flex:1;color:#B2B3BB;'>较昨日</view>
@@ -13,7 +13,7 @@
 						class="guess-item"
 					>
 					<view class="cu-card article no-card" >
-						<view class="cu-item shadow factoryItem flex justify-between align-center">
+						<view class="cu-item shadow factoryItem justify-between align-center" style="display:flex;">
 							<view style='flex:1.5;'><view class='factory'>{{item.port}}</view><view class='wrap'>{{item.goodsName}}</view></view>
 							<view style='flex:1;' >
 								<view class='price'>{{item.price}}</view>