From 49f12e81954d3d5a382e27a4f2f412a4ae65eeef Mon Sep 17 00:00:00 2001
From: "DESKTOP-A1SENDA\\HUzy" <472860318@qq.com>
Date: Tue, 11 May 2021 12:01:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=95=86=E5=93=81=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=AB=9E=E4=BB=B7=E5=8E=BB=E9=99=A4=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=8D=95=E4=BB=B7=E5=BF=85=E5=A1=AB=E3=80=82=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E8=B5=84=E8=AE=AF=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/article/article-item/index.wxml |  8 +++-
 pages/article/article-item/index.wxss | 14 ++++++
 pages/goods/create/index.js           | 62 +++++++++++++++------------
 3 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/pages/article/article-item/index.wxml b/pages/article/article-item/index.wxml
index 27daeeb..57cfbb9 100644
--- a/pages/article/article-item/index.wxml
+++ b/pages/article/article-item/index.wxml
@@ -16,8 +16,12 @@
 	</view>
 	<view class="text-black text-bold text-lg" style="padding:0rpx 32rpx 20rpx 32rpx">{{item.title}}</view>
 	<fold-text content="{{item.content}}"></fold-text>
-	<view style="padding:0rpx 32rpx;margin-top:16rpx" wx:if="{{item.imageUrlList.length}}">
-		<sudoku-image image-list="{{item.imageUrlList}}"></sudoku-image>
+	<view class="imgZt" style="padding:0rpx 32rpx;margin-top:16rpx" wx:if="{{item.imageUrlList.length}}">
+		<!-- <sudoku-image image-list="{{item.imageUrlList}}"></sudoku-image> -->
+		<view class="bottomViewRight" wx:for="{{ item.imageUrlList }}" wx:for-item="option" wx:for-index="optionIndex" wx:key="optionIndex" >
+			<image style="margin-left:10rpx" class="bottomViewRightImg" src="{{option}}" mode="widthFix"></image>
+		</view>
+	
 	</view>
 	<view class="flex flex-justify text-black" style="height:112rpx; padding:0rpx 32rpx">
 		<view>
diff --git a/pages/article/article-item/index.wxss b/pages/article/article-item/index.wxss
index 5580ebb..17a4676 100644
--- a/pages/article/article-item/index.wxss
+++ b/pages/article/article-item/index.wxss
@@ -6,4 +6,18 @@
   align-items: center;
   justify-content: center;
   border-radius: 50rpx;
+}
+.bottomViewRightImg {
+  width: 290rpx;
+  height: 200rpx;
+  overflow: hidden;
+}
+.bottomViewRight {
+  width: 290rpx;
+  height: 200rpx !important;
+  overflow: hidden;
+}
+.imgZt{
+  display: flex;
+  justify-content: flex-start;
 }
\ No newline at end of file
diff --git a/pages/goods/create/index.js b/pages/goods/create/index.js
index 9be1053..4ef6964 100644
--- a/pages/goods/create/index.js
+++ b/pages/goods/create/index.js
@@ -347,33 +347,33 @@ Page({
       util.showToast('请选择废纸品类')
       return
     }
-    if (util.isEmpty(this.data.form.unitPrice)) {
-      if (this.data.form.bidType == 1) {
-        util.showToast('请输入商品单价')
-      } else {
-        util.showToast('请输入起拍单价')
-      }
-      return
-    }
-    if(app.globalData.kg){
-      if(parseFloat(this.data.form.unitPrice) > 100){
-        if (this.data.form.bidType == 1) {
-          util.showToast('请检查您输入的商品单价是否合理')
-        } else {
-          util.showToast('请检查您输入的起拍单价是否合理')
-        }
-        return
-      }
-    } else {
-      if(parseFloat(this.data.form.unitPrice) < 100){
-        if (this.data.form.bidType == 1) {
-          util.showToast('请检查您输入的商品单价是否合理')
-        } else {
-          util.showToast('请检查您输入的起拍单价是否合理')
-        }
-        return
-      }
-    }
+    // if (util.isEmpty(this.data.form.unitPrice)) {
+    //   if (this.data.form.bidType == 1) {
+    //     util.showToast('请输入商品单价')
+    //   } else {
+    //     util.showToast('请输入起拍单价')
+    //   }
+    //   return
+    // }
+    // if(app.globalData.kg){
+    //   if(parseFloat(this.data.form.unitPrice) > 100){
+    //     if (this.data.form.bidType == 1) {
+    //       util.showToast('请检查您输入的商品单价是否合理')
+    //     } else {
+    //       util.showToast('请检查您输入的起拍单价是否合理')
+    //     }
+    //     return
+    //   }
+    // } else {
+    //   if(parseFloat(this.data.form.unitPrice) < 100){
+    //     if (this.data.form.bidType == 1) {
+    //       util.showToast('请检查您输入的商品单价是否合理')
+    //     } else {
+    //       util.showToast('请检查您输入的起拍单价是否合理')
+    //     }
+    //     return
+    //   }
+    // }
     if (util.isEmpty(this.data.form.stock)) {
       util.showToast('请输入库存')
       return
@@ -410,7 +410,13 @@ Page({
     this.setData({ requesting: true })
     wx.showLoading({ title: '加载中', mask: true })
     if(!app.globalData.kg){
-      this.data.form.unitPrice = math.divide(this.data.form.unitPrice, 1000)
+      if(this.data.form.unitPrice>0){
+        this.data.form.unitPrice = math.divide(this.data.form.unitPrice, 1000)
+        
+      }else{
+        this.data.form.unitPrice=''
+      }
+     
       this.data.form.stock = math.times(this.data.form.stock, 1000)
       if (!util.isEmpty(this.data.form.lowestNum)) {
         this.data.form.lowestNum = math.times(this.data.form.lowestNum, 1000)