From 4e25eaee3b486671178b39776009cff13d5ee589 Mon Sep 17 00:00:00 2001
From: "DESKTOP-A1SENDA\\HUzy" <472860318@qq.com>
Date: Tue, 11 May 2021 10:40:29 +0800
Subject: [PATCH] =?UTF-8?q?--=E5=8D=96=E5=BA=9F=E7=BA=B8=E6=97=A0=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E6=98=BE=E7=A4=BA=E4=BB=B7=E6=A0=BC=E9=9D=A2=E8=AE=AE?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E5=85=A5=E6=8F=90=E7=A4=BA=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E5=92=A8=E8=AF=A2=E3=80=82=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=B7=A6=E4=B8=8A=E4=B8=BA=E6=88=AA=E5=8F=96=E5=9F=BA=E7=82=B9?=
 =?UTF-8?q?--?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/article/newInfo/index.wxml   |   2 +-
 pages/article/newInfo/index.wxss   |   1 +
 pages/mall/detail/index.js         |  14 ++-
 pages/mall/detail/index.wxml       | 145 ++++++++++++++++++-----------
 pages/mall/product-item/index.wxml |   5 +-
 5 files changed, 108 insertions(+), 59 deletions(-)

diff --git a/pages/article/newInfo/index.wxml b/pages/article/newInfo/index.wxml
index f9cc2b4..13187ab 100644
--- a/pages/article/newInfo/index.wxml
+++ b/pages/article/newInfo/index.wxml
@@ -146,7 +146,7 @@
 			</view>
 		</view>
 		<view class="bottomViewRight">
-			<image class="bottomViewRightImg" src="{{item.imageUrlList[0]||'https://img.imgdb.cn/item/607664a48322e6675cd68a55.png'}}" mode="aspectFill"></image>
+			<image class="bottomViewRightImg" src="{{item.imageUrlList[0]||'https://img.imgdb.cn/item/607664a48322e6675cd68a55.png'}}" mode="widthFix"></image>
 		</view>
 	</view>
 </scroll-view>
diff --git a/pages/article/newInfo/index.wxss b/pages/article/newInfo/index.wxss
index f0263ff..e4cd6d9 100644
--- a/pages/article/newInfo/index.wxss
+++ b/pages/article/newInfo/index.wxss
@@ -188,6 +188,7 @@ page {
   width: 240rpx;
   height: 180rpx;
   float: right;
+  overflow: hidden;
 }
 
 .tableStyle {
diff --git a/pages/mall/detail/index.js b/pages/mall/detail/index.js
index 7455f8f..93655e5 100644
--- a/pages/mall/detail/index.js
+++ b/pages/mall/detail/index.js
@@ -373,5 +373,17 @@ Page({
       wx.hideLoading()
       util.showToast(err)
     })
-  }
+  },
+  phoneShopInfo: function () {
+    if (!app.globalData.userInfo) {
+      wx.navigateTo({
+        url: '/pages/login/index'
+      })
+      return
+    }
+      wx.makePhoneCall({
+        phoneNumber: this.data.orderInfo.ownerPhone|| '0000'
+      })
+    
+  },
 })
\ No newline at end of file
diff --git a/pages/mall/detail/index.wxml b/pages/mall/detail/index.wxml
index 81d2eeb..a014aad 100644
--- a/pages/mall/detail/index.wxml
+++ b/pages/mall/detail/index.wxml
@@ -6,56 +6,71 @@
 
 <view wx:if="{{orderInfo}}">
 	<view style="position: relative">
-	  <swiper class="screen-swiper" style="min-height:{{imageHeight}}rpx" indicator-dots="{{false}}" autoplay="true" interval="3000" duration="500" bindchange="onChange">
-	  	<swiper-item wx:for="{{imgList}}" wx:key="index">
-		  	<view wx:if="{{videoUrl && index == 0}}">
-				  <view class="video-cnt">
-					  <video src="{{item}}" style="width:100%;min-height:{{imageHeight}}rpx" show-center-play-btn="{{false}}" controls="{{false}}" />
-				  </view>
-				  <text class="play-btn cuIcon-video text-white" style="font-size:80rpx" catchtap="videoTap" wx:if="{{!visible}}"></text>
-			  </view>
-			  <view wx:else bindtap="viewImage" style="width:100%;height:100%" data-url="{{item}}">
-				  <image src="{{item}}" mode="aspectFill"></image>
-			  </view>
-		  </swiper-item>
+		<swiper class="screen-swiper" style="min-height:{{imageHeight}}rpx" indicator-dots="{{false}}" autoplay="true"
+			interval="3000" duration="500" bindchange="onChange">
+			<swiper-item wx:for="{{imgList}}" wx:key="index">
+				<view wx:if="{{videoUrl && index == 0}}">
+					<view class="video-cnt">
+						<video src="{{item}}" style="width:100%;min-height:{{imageHeight}}rpx" show-center-play-btn="{{false}}"
+							controls="{{false}}" />
+					</view>
+					<text class="play-btn cuIcon-video text-white" style="font-size:80rpx" catchtap="videoTap"
+						wx:if="{{!visible}}"></text>
+				</view>
+				<view wx:else bindtap="viewImage" style="width:100%;height:100%" data-url="{{item}}">
+					<image src="{{item}}" mode="aspectFill"></image>
+				</view>
+			</swiper-item>
 		</swiper>
 		<view class="info-layout flex" wx:if="{{expiredTime}}">
 			<view class="pacman"></view>
-		  <view style="width:100%;font-size:30rpx;line-height:60rpx;height: 60rpx;text-align: center">活动倒计时：{{expiredTime || ''}}</view>
-	  </view>
-		<view class="text-white" style="line-height:60rpx;position: absolute; top: 0; width: 180rpx; height: 60rpx;text-align: center" wx:if="{{expiredTime}}">正在进行</view>
+			<view style="width:100%;font-size:30rpx;line-height:60rpx;height: 60rpx;text-align: center">
+				活动倒计时：{{expiredTime || ''}}</view>
+		</view>
+		<view class="text-white"
+			style="line-height:60rpx;position: absolute; top: 0; width: 180rpx; height: 60rpx;text-align: center"
+			wx:if="{{expiredTime}}">正在进行</view>
 		<view class="text-white info-index">{{current}}/{{imgList.length}}</view>
-  </view>
+	</view>
 	<view class="bg-white flex flex-justify" style="padding:24rpx 0rpx 24rpx 32rpx">
 		<view>
-		  <view class="flex flex-center">
-			  <image style="width:72rpx;height:36rpx;" src="/assets/image/ico_tag{{orderInfo.bidType == 2 ? '2' : '1'}}.png"></image>
-				<view class="detail-price" style="margin-left:8rpx">￥{{ formate.formatePrice(orderInfo.unitPrice, kg) }}</view>
-				<view class="text-df" style="color: rgba(255, 66, 43, 1);margin-left:8rpx;margin-top:8rpx">{{ kg? '元/KG' : '元/吨' }}</view>
-		  </view>
-		  <view class="text-name" style="margin-top:12rpx">{{orderInfo.secondCategoryName}}</view>
+			<view class="flex flex-center">
+				<image style="width:72rpx;height:36rpx;" src="/assets/image/ico_tag{{orderInfo.bidType == 2 ? '2' : '1'}}.png">
+				</image>
+				<view class="detail-price" style="margin-left:8rpx"
+					wx:if="{{formate.formatePrice(orderInfo.unitPrice, kg)!=''}}">
+					￥{{ formate.formatePrice(orderInfo.unitPrice, kg) }}</view>
+				<view class="text-df" style="color: rgba(255, 66, 43, 1);margin-left:8rpx;margin-top:8rpx"
+					wx:if="{{formate.formatePrice(orderInfo.unitPrice, kg)!=''}}">{{ kg? '元/KG' : '元/吨' }}</view>
+				<view class="text-df" style="color: rgba(255, 66, 43, 1);margin-left:8rpx;margin-top:8rpx"
+					wx:if="{{formate.formatePrice(orderInfo.unitPrice, kg)==''}}">价格面议</view>
+			</view>
+			<view class="text-name" style="margin-top:12rpx">{{orderInfo.secondCategoryName}}</view>
 		</view>
 		<view class="flex flex-center">
-			<button open-type="share" style="background-color: #DDDDDD;border-radius: 48rpx 0rpx 0rpx 48rpx;padding:0rpx 12rpx 0rpx 16rpx;height:60rpx;line-height: 60rpx">
+			<button open-type="share"
+				style="background-color: #DDDDDD;border-radius: 48rpx 0rpx 0rpx 48rpx;padding:0rpx 12rpx 0rpx 16rpx;height:60rpx;line-height: 60rpx">
 				<view class="flex flex-center">
-				  <text class="cuIcon-share text-black" style="font-size:28rpx;"></text>
-				  <text class="text-sm" style="margin-left:4rpx">分享</text>
-			  </view>
+					<text class="cuIcon-share text-black" style="font-size:28rpx;"></text>
+					<text class="text-sm" style="margin-left:4rpx">分享</text>
+				</view>
 			</button>
 		</view>
 	</view>
 	<view style="height:18rpx;width:100%"></view>
 	<view class="bg-white" style="font-size:28rpx;padding:0rpx 32rpx">
-	  <view class="bg-white flex" style="padding:24rpx 0rpx;border-bottom:2rpx solid #eee">
-	  	<view class="text-gray" style="min-width:150rpx">发货地址</view>
-	  	<view class="text-black">{{orderInfo.locProvinceName}}{{orderInfo.locCityName}}{{orderInfo.locDistrictName}}</view>
+		<view class="bg-white flex" style="padding:24rpx 0rpx;border-bottom:2rpx solid #eee">
+			<view class="text-gray" style="min-width:150rpx">发货地址</view>
+			<view class="text-black">{{orderInfo.locProvinceName}}{{orderInfo.locCityName}}{{orderInfo.locDistrictName}}
+			</view>
 		</view>
 		<view class="bg-white flex" style="padding:24rpx 0rpx;">
-	  	<view class="text-gray" style="min-width:150rpx">平台保障</view>
-	  	<view class="text-black">平台担保交易、维护买卖双方权益</view>
+			<view class="text-gray" style="min-width:150rpx">平台保障</view>
+			<view class="text-black">平台担保交易、维护买卖双方权益</view>
 		</view>
-  </view>
-	<view class="flex flex-justify" style="width:100%;padding: 24rpx 32rpx" wx:if="{{orderInfo.bidType == 2 && recordList}}">
+	</view>
+	<view class="flex flex-justify" style="width:100%;padding: 24rpx 32rpx"
+		wx:if="{{orderInfo.bidType == 2 && recordList}}">
 		<view class="page-name flex flex-center">
 			<text>竞价记录</text>
 			<text style="margin:0rpx 24rpx;height:28rpx;width:2rpx;background-color:#999999"></text>
@@ -63,12 +78,15 @@
 		</view>
 		<!-- <view class="page-name" style="font-size:13px" wx:if="{{expiredTime}}">倒计时：{{expiredTime || ''}}</view> -->
 	</view>
-	<view class="bg-white" style="height:12rpx;width:100%" wx:if="{{orderInfo.bidType == 2 && recordList.length == 0}}"></view>
+	<view class="bg-white" style="height:12rpx;width:100%" wx:if="{{orderInfo.bidType == 2 && recordList.length == 0}}">
+	</view>
 	<view wx:for="{{recordList}}" wx:key="index">
 		<wux-divider show-text="{{ false }}"></wux-divider>
-		<view class="flex flex-justify bg-white" style="width:100%;padding: 20rpx 32rpx" data-index="{{index}}" bindtap="checkRecord">
+		<view class="flex flex-justify bg-white" style="width:100%;padding: 20rpx 32rpx" data-index="{{index}}"
+			bindtap="checkRecord">
 			<view class="flex flex-justify">
-				<wux-image width="{{20}}" height="{{20}}" shape="circle" lazyLoad="true" src="{{item.avatarUrl || '/assets/image/ygImg.png'}}" mode="aspectFill">
+				<wux-image width="{{20}}" height="{{20}}" shape="circle" lazyLoad="true"
+					src="{{item.avatarUrl || '/assets/image/ygImg.png'}}" mode="aspectFill">
 					<image class="image-load" slot="loading" src="/assets/image/def_image.png"></image>
 				</wux-image>
 				<view class="page-num">{{item.mobile || ''}}</view>
@@ -77,26 +95,28 @@
 			<view class="page-num" style="color:red">￥{{formate.formatePrice2(item.biddingUnitPrice, kg)}}</view>
 		</view>
 	</view>
-	<view class="page-name bg-white" style="padding: 32rpx 0rpx;text-align: center;border-top: 1rpx solid #eee" wx:if="{{offered}}">当前我的报价：{{formate.formatePrice2(offered, kg)}}</view>
+	<view class="page-name bg-white" style="padding: 32rpx 0rpx;text-align: center;border-top: 1rpx solid #eee"
+		wx:if="{{offered}}">当前我的报价：{{formate.formatePrice2(offered, kg)}}</view>
 	<view style="height:18rpx;width:100%"></view>
 	<view class="bg-white" style="font-size:28rpx;padding:0rpx 32rpx">
 		<view class="bg-white flex flex-justify" style="padding:24rpx 0rpx;border-bottom:2rpx solid #eee">
-	  	<view class="text-black" style="min-width:150rpx">库存</view>
-	  	<view class="text-black">{{formate.formateWeight(orderInfo.stock, kg)}}</view>
-	  </view>
-  	<view class="bg-white flex flex-justify" style="padding:24rpx 0rpx;border-bottom:2rpx solid #eee" wx:if="{{orderInfo.lowestNum}}">
-	  	<view class="text-black" style="min-width:150rpx">起订重量</view>
-	  	<view class="text-black">{{formate.formateWeight(orderInfo.lowestNum, kg)}}</view>
-	  </view>
-	  <view class="bg-white flex flex-justify" style="padding:24rpx 0rpx;border-bottom:2rpx solid #eee">
+			<view class="text-black" style="min-width:150rpx">库存</view>
+			<view class="text-black">{{formate.formateWeight(orderInfo.stock, kg)}}</view>
+		</view>
+		<view class="bg-white flex flex-justify" style="padding:24rpx 0rpx;border-bottom:2rpx solid #eee"
+			wx:if="{{orderInfo.lowestNum}}">
+			<view class="text-black" style="min-width:150rpx">起订重量</view>
+			<view class="text-black">{{formate.formateWeight(orderInfo.lowestNum, kg)}}</view>
+		</view>
+		<view class="bg-white flex flex-justify" style="padding:24rpx 0rpx;border-bottom:2rpx solid #eee">
 			<view class="text-black" style="min-width:150rpx">含杂比例</view>
-	  	<view class="text-black">{{orderInfo.dopantRateName}}</view>
-	  </view>
-  	<view class="bg-white flex flex-justify" style="padding:24rpx 0rpx">
+			<view class="text-black">{{orderInfo.dopantRateName}}</view>
+		</view>
+		<view class="bg-white flex flex-justify" style="padding:24rpx 0rpx">
 			<view class="text-black" style="min-width:150rpx">湿水比例</view>
-	  	<view class="text-black">{{orderInfo.waterRateName}}</view>
-  	</view>
-  </view>
+			<view class="text-black">{{orderInfo.waterRateName}}</view>
+		</view>
+	</view>
 	<view style="height:18rpx;width:100%"></view>
 	<view class="bg-white" style="padding:32rpx">
 		<view class="text-black" style="font-size:32rpx">商品描述</view>
@@ -106,7 +126,9 @@
 </view>
 
 <view style="height:{{136 + safeBottom}}rpx"></view>
-<view class="cu-bar bg-white tabbar foot" style="height:{{120 + safeBottom}}rpx;padding: 32rpx 32rpx {{safeBottom + 32}}rpx 16rpx;" wx:if="{{orderInfo.isOwner != 1}}">
+<view class="cu-bar bg-white tabbar foot"
+	style="height:{{120 + safeBottom}}rpx;padding: 32rpx 32rpx {{safeBottom + 32}}rpx 16rpx;"
+	wx:if="{{formate.formatePrice(orderInfo.unitPrice, kg)!='' && orderInfo.isOwner != 1}}">
 	<view class="action" style="width: 100rpx" bindtap="toShopInfo">
 		<view class="cuIcon-shop" style="font-size:24px"></view> 店铺
 	</view>
@@ -117,13 +139,26 @@
 		</view>
 		<view style="width:100%">
 			<wux-button block type="positive" bind:click="offerProject" wx:if="{{orderInfo.bidType == 1}}">立即购买</wux-button>
-			<wux-button block type="assertive" bind:click="offerProject" wx:if="{{orderInfo.bidType == 2 && orderInfo.biddingActivityId}}">{{offered?'修改':'立即'}}报价</wux-button>
-	  </view>
+			<wux-button block type="assertive" bind:click="offerProject"
+				wx:if="{{orderInfo.bidType == 2 && orderInfo.biddingActivityId}}">{{offered?'修改':'立即'}}报价</wux-button>
+		</view>
+	</view>
+</view>
+<view wx:if="{{formate.formatePrice(orderInfo.unitPrice, kg)=='' && orderInfo.isOwner != 1 }}" class="cu-bar bg-white foot flex flex-center" style="height:{{120 + safeBottom}}rpx;padding-bottom:{{safeBottom}}rpx">
+	<view class="flex flex-center" style="width: 50%" bindtap="toShopInfo">
+		<text class="cuIcon-shop text-blue" style="font-size:20px;margin-right:16rpx"></text>
+		<text class="text-blue text-lg">店铺</text>
+	</view>
+	<text style="width:1px;height:40rpx;background-color:#eee"></text>
+	<view class="flex flex-center" style=";width:50%;height: 100%" bindtap="phoneShopInfo">
+		<text class="cuIcon-phone text-blue" style="font-size:20px;margin-right:16rpx">
+		</text><text class="text-blue text-lg">电话咨询</text>
 	</view>
 </view>
 
 <wux-landscape visible="{{ visible }}" bind:close="onClose">
-	<video id="video" src="{{videoUrl}}" style="width:750rpx;min-height:{{imageHeight}}rpx" show-center-play-btn="{{false}}" bindended="bindended" custom-cache="{{false}}" />
+	<video id="video" src="{{videoUrl}}" style="width:750rpx;min-height:{{imageHeight}}rpx"
+		show-center-play-btn="{{false}}" bindended="bindended" custom-cache="{{false}}" />
 </wux-landscape>
 
 <wux-dialog id="wux-dialog" />
\ No newline at end of file
diff --git a/pages/mall/product-item/index.wxml b/pages/mall/product-item/index.wxml
index aaa4632..44967de 100644
--- a/pages/mall/product-item/index.wxml
+++ b/pages/mall/product-item/index.wxml
@@ -16,9 +16,10 @@
 		</view>
 		<view class="flex flex-center" style="margin-top:16rpx;justify-content: flex-start">
 			<text class="text-xs text-gray" wx:if="{{item.bidType == 2}}">起拍单价</text>
-			<text class="page-price">￥{{formate.formatePrice(item.unitPrice, kg)}}</text>
-			<view class="text-df" style="color: rgba(255, 66, 43, 1);margin-left:8rpx">{{ kg? '元/KG' : '元/吨' }}
+			<text class="page-price" wx:if="{{formate.formatePrice(item.unitPrice, kg)!=''}}">￥{{formate.formatePrice(item.unitPrice, kg)}}</text>
+			<view class="text-df" style="color: rgba(255, 66, 43, 1);margin-left:8rpx" wx:if="{{formate.formatePrice(item.unitPrice, kg)!=''}}">{{ kg? '元/KG' : '元/吨' }}
 			</view>
+			<text class="page-price" wx:if="{{formate.formatePrice(item.unitPrice, kg)==''}}">价格面议</text>
 		</view>
 		<view style="height:32px">
 			<view class="page-outline">{{item.description || ''}}</view>