zxz vor 2 Jahren
Ursprung
Commit
389a96886f
5 geänderte Dateien mit 1063 neuen und 449 gelöschten Zeilen
  1. 154 14
      pageA/product/detail.vue
  2. 141 6
      pageA/product/sales_detail.vue
  3. 518 391
      pageD/myRelease/buyEdit.vue
  4. 244 32
      pageD/myRelease/sellEdit.vue
  5. 6 6
      pages/business/business.vue

+ 154 - 14
pageA/product/detail.vue

@@ -20,7 +20,8 @@
 						{{goods.basisPrice}}
 					</view>
 				</view>
-				<view style='text-align:right;' class="Regular" v-if='goods.procurementPlanType=="现货"'>采购价格</view>
+				<view style='text-align:right;' class="Regular"
+					v-if='goods.procurementPlanType=="现货" && goods.procurementPrice'>采购价格</view>
 				<view style='text-align:right;' class="Regular" v-if='goods.procurementPlanType=="期货"'>今日基差</view>
 			</view>
 		</view>
@@ -78,13 +79,13 @@
 						<text>{{goods.priceType}}</text>
 					</view>
 				</view>
-				<view v-if='goods.procurementPlanType=="现货"' class="c-row">
+				<view v-if='goods.procurementPlanType=="现货"  && goods.procurementPrice' class="c-row">
 					<text class="tit">采购价格(元/吨)</text>
 					<view class="con-list">
 						<text>{{goods.procurementPrice}}</text>
 					</view>
 				</view>
-				<view v-else class="c-row">
+				<view v-if='goods.procurementPlanType=="期货"' class="c-row">
 					<text class="tit">基差(元/吨)</text>
 					<view class="con-list">
 						<text>{{goods.basisPrice}}</text>
@@ -129,6 +130,12 @@
 						</view>
 					</view>
 				</view>
+				<view class="c-row">
+					<text class="tit">发布时间</text>
+					<view class="con-list">
+						<text>{{goods.updateDate}}</text>
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="detail-desc">
@@ -204,6 +211,36 @@
 				</view>
 			</view>
 		</view>
+		<view class="detail-desc" v-if="goods.remark && goods.addressUrl">
+			<view class="d-header Medium">
+				<text>备注信息</text>
+			</view>
+			<view class="c-list Regular">
+				<view class="c-row" v-if="goods.remark">
+					<text class="tit">备注</text>
+					<view class="con-list">
+						<text>{{goods.remark}}</text>
+					</view>
+				</view>
+				<view class="c-row" v-if="goods.addressUrl" style="display: block;">
+					<text class="tit">附件</text>
+					<view class="con-list" style="text-align: center;">
+						<view v-if='imgUrl.length>0'>
+							<swiper class="screen-swiper header-swiper" :class="dotStyle?'square-dot':'round-dot'"
+								:indicator-dots="false" :circular="true" interval="5000" :current="currentImg" @change="topSwiperTab">
+								<swiper-item style="margin-top: 20rpx;" v-for="(item,index) in imgUrl" :key="index"
+									:class="currentImg==index?'text-white':''" @click="preview(imgUrl,index)">
+									<image :src="item"></image>
+								</swiper-item>
+							</swiper>
+							<view class="dots">
+								<text class='Regular'>{{currentImg+1}} / {{imgUrl.length}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 		<view v-if='status' class='shade'>
 			<view class='shade-content'>
 				<view class='shade-content-item'>
@@ -218,9 +255,9 @@
 			<view class="Regular">
 				<u-button class="talk-online" @click="editInfo" v-if="show">编辑</u-button>
 				<u-button class="talk-online" @click="contactUs">立即沟通</u-button>
-				<u-button @click="salegrain" v-if="goods.pcFlag == 1" type="primary"
-					class="action-btn no-border add-cart-btn">立即卖粮</u-button>
-				<u-button v-else type="primary" class="action-btn no-border add-cart-btn" @click="tradeNow">立即发车
+				<!-- <u-button @click="salegrain" v-if="goods.pcFlag == 1" type="primary"
+					class="action-btn no-border add-cart-btn">立即卖粮</u-button> -->
+				<!-- <u-button v-else type="primary" class="action-btn no-border add-cart-btn" @click="tradeNow">立即发车 -->
 				</u-button>
 			</view>
 		</view>
@@ -252,6 +289,8 @@
 				swiperCurrent: 0,
 				titleNViewBackground: '',
 				swiperLength: 0,
+				dotStyle: false,
+				currentImg: 0,
 				goods: {
 					id: undefined,
 					title: undefined,
@@ -274,8 +313,14 @@
 					seller: '',
 					sellerPhone: '',
 					minSale: 0,
-					status: 0
+					status: 0,
+					// imglist2: [], //展示
+					// imglist: [], //存
+					// imgUrl: []
 				},
+				imglist2: [], //展示
+				imglist: [], //存
+				imgUrl: [],
 				status: false,
 				share: {
 					title: '',
@@ -287,18 +332,20 @@
 		},
 		onShow() {},
 		onLoad(options) {
-			this.goods.compId = options.compId
 			const that = this
+			that.goods.compId = options.compId
+			that.imgUrl = []
 			uni.showLoading({
 				title: '正在加载',
 				mask: true
 			})
-			this.$api.doRequest('get', '/procurementPlanInfo/getProcurementPlan', {
+			that.$api.doRequest('get', '/procurementPlanInfo/getProcurementPlan', {
 				id: options.id
 			}).then(res => {
 				uni.hideLoading()
-				this.goods = res.data.data
-				if(that.goods.createUserId == uni.getStorageSync('userInfo').id){
+				that.goods = res.data.data
+				that.imglist = that.goods.addressUrl.split(',')
+				if (that.goods.createUserId == uni.getStorageSync('userInfo').id) {
 					that.show = true
 				}
 			})
@@ -317,13 +364,59 @@
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
+		watch: {
+			imglist: {
+				handler: function() {
+					this.$api.doRequest('get', 'appendix/query/getFileList', {
+						appendixIds: this.imglist.toString()
+					}).then(res => {
+						this.imglist2 = res.data.data
+						for (let i = 0; i < this.imglist2.length; i++) {
+							// if (this.imglist2[i].appendixName) {
+							// 	this.imglist2[i].type = this.imglist2[i].appendixName.split(".")[1]
+							// }
+							if (this.imglist2[i].appendixPath) {
+								this.imgUrl.push(this.imglist2[i].appendixPath) 
+							}
+						}
+					})
+				},
+				deep: true
+			}
+		},
 		methods: {
-			editInfo(){
+			topSwiperTab(e) {
+				var that = this;
+				that.currentImg = Number(e.target.current);
+			},
+			preview(img, index) {
+				console.log("preview", img, index)
+				uni.previewImage({
+					urls: img,
+					current: index
+				});
+			},
+			// openDocument(src) {
+			// 	uni.downloadFile({
+			// 		url: src.appendixPath,
+			// 		success: function(res) {
+			// 			var filePath = res.tempFilePath;
+			// 			uni.openDocument({
+			// 				filePath: filePath,
+			// 				showMenu: true,
+			// 				success: function(res) {
+			// 					console.log('打开文档成功');
+			// 				}
+			// 			});
+			// 		}
+			// 	});
+			// },
+			editInfo() {
 				const that = this
 				uni.navigateTo({
-					url: '/pageD/myRelease/buyEdit?id='+that.goods.id+'&compId='+that.goods.compId
+					url: '/pageD/myRelease/buyEdit?id=' + that.goods.id + '&compId=' + that.goods.compId
 				})
-				
+
 			},
 			alertBtn1() {
 				uni.navigateTo({
@@ -1307,4 +1400,51 @@
 	.u-hairline-border:after {
 		border: none;
 	}
+
+	.upload {
+		width: 80rpx;
+		height: 80rpx;
+	}
+
+	.char_css {
+		font-size: 30rpx;
+		font-weight: 600;
+		display: -webkit-box;
+		overflow: hidden;
+		/*! autoprefixer: off; */
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		-webkit-box-orient: vertical;
+		text-overflow: ellipsis;
+		word-break: break-all;
+	}
+
+	.img_item {
+		display: flex;
+		width: 100%;
+		margin: 10px 0;
+		padding: 0 10rpx;
+
+		.img_dowload {
+			width: 14%;
+			color: #22C572;
+			text-align: right;
+		}
+	}
+	
+	.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;
+	}
 </style>

+ 141 - 6
pageA/product/sales_detail.vue

@@ -20,7 +20,7 @@
 						+{{goods.basisPrice}}
 					</view>
 				</view>
-				<view style='text-align:right;' v-if='goods.salePlanType=="现货"'>销售价格</view>
+				<view style='text-align:right;' v-if='goods.salePlanType=="现货" && goods.salePrice'>销售价格</view>
 				<view style='text-align:right;' v-if='goods.salePlanType=="期货"'>今日基差</view>
 			</view>
 		</view>
@@ -84,7 +84,7 @@
 						<text>{{goods.basisPrice}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.salePlanType == '现货'">
+				<view class="c-row" v-if="goods.salePlanType == '现货' && goods.salePrice">
 					<text class="tit">销售价格(元/吨)</text>
 					<view class="con-list">
 						<text>{{goods.salePrice}}</text>
@@ -129,6 +129,12 @@
 						</view>
 					</view>
 				</view>
+				<view class="c-row">
+					<text class="tit">发布时间</text>
+					<view class="con-list">
+						<text>{{goods.updateDate}}</text>
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="detail-desc">
@@ -204,6 +210,36 @@
 				</view>
 			</view>
 		</view>
+		<view class="detail-desc" v-if="goods.remark || goods.addressUrl">
+			<view class="d-header Medium">
+				<text>备注信息</text>
+			</view>
+			<view class="c-list Regular">
+				<view class="c-row" v-if="goods.remark">
+					<text class="tit">备注</text>
+					<view class="con-list">
+						<text>{{goods.remark}}</text>
+					</view>
+				</view>
+				<view class="c-row" v-if="goods.addressUrl" style="display: block;">
+					<text class="tit">附件</text>
+					<view class="con-list" style="text-align: center;">
+						<view v-if='imgUrl.length>0'>
+							<swiper class="screen-swiper header-swiper" :class="dotStyle?'square-dot':'round-dot'"
+								:indicator-dots="false" :circular="true" interval="5000" :current="currentImg" @change="topSwiperTab">
+								<swiper-item style="margin-top: 20rpx;" v-for="(item,index) in imgUrl" :key="index"
+									:class="currentImg==index?'text-white':''" @click="preview(imgUrl,index)">
+									<image :src="item"></image>
+								</swiper-item>
+							</swiper>
+							<view class="dots">
+								<text class='Regular'>{{currentImg+1}} / {{imgUrl.length}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 		<view v-if='status' class='shade'>
 			<view class='shade-content'>
 				<view class='shade-content-item'>
@@ -218,9 +254,9 @@
 			<view>
 				<button class="talk-online" @click="editInfo" v-if="show">编辑</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>
+				<!-- <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> -->
 			</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
@@ -243,6 +279,9 @@
 				isShowAlert: false,
 				content: '您尚未登录,是否立即登录?',
 				show: false,
+				dotStyle: false,
+				currentImg: 0,
+				imgUrl: [],
 				swiperCurrent: 0,
 				titleNViewBackground: '',
 				swiperLength: 0,
@@ -268,8 +307,12 @@
 					buyer: '',
 					buyerPhone: '',
 					minSale: 0,
-					status: 0
+					status: 0,
+					imglist2: [], //展示
+					imglist: [], //存
 				},
+				imglist2: [], //展示
+				imglist: [], //存
 				status: false,
 				share: {
 					title: '',
@@ -282,6 +325,7 @@
 		onShow() {},
 		onLoad(options) {
 			this.goods.compId = options.compId
+			this.imgUrl = []
 			const that = this
 			uni.showLoading({
 				title: '正在加载',
@@ -292,15 +336,62 @@
 			}).then(res => {
 				uni.hideLoading()
 				this.goods = res.data.data
+				this.imglist = this.goods.addressUrl.split(',')
 				if(that.goods.createUserId == uni.getStorageSync('userInfo').id){
 					that.show = true
 				}
 			})
 		},
+		watch: {
+			imglist: {
+				handler: function() {
+					this.$api.doRequest('get', 'appendix/query/getFileList', {
+						appendixIds: this.imglist.toString()
+					}).then(res => {
+						this.imglist2 = res.data.data
+						for (let i = 0; i < this.imglist2.length; i++) {
+							// if (this.imglist2[i].appendixName) {
+							// 	this.imglist2[i].type = this.imglist2[i].appendixName.split(".")[1]
+							// }
+							if (this.imglist2[i].appendixPath) {
+								this.imgUrl.push(this.imglist2[i].appendixPath) 
+							}
+						}
+					})
+				},
+				deep: true
+			}
+		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		methods: {
+			topSwiperTab(e) {
+				var that = this;
+				this.currentImg = Number(e.target.current);
+			},
+			preview(img, index) {
+				console.log("preview", img, index)
+				uni.previewImage({
+					urls: img,
+					current: index
+				});
+			},
+			// openDocument(src) {
+			// 	uni.downloadFile({
+			// 		url: src.appendixPath,
+			// 		success: function(res) {
+			// 			var filePath = res.tempFilePath;
+			// 			uni.openDocument({
+			// 				filePath: filePath,
+			// 				showMenu: true,
+			// 				success: function(res) {
+			// 					console.log('打开文档成功');
+			// 				}
+			// 			});
+			// 		}
+			// 	});
+			// },
 			editInfo(){
 				const that = this
 				uni.navigateTo({
@@ -1248,4 +1339,48 @@
 		padding: 35px 10px;
 		border-radius: 15px;
 	}
+	.upload {
+		width: 80rpx;
+		height: 80rpx;
+	}
+	
+	.char_css {
+		font-size: 30rpx;
+		font-weight: 600;
+		display: -webkit-box;
+		overflow: hidden;
+		/*! autoprefixer: off; */
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		-webkit-box-orient: vertical;
+		text-overflow: ellipsis;
+		word-break: break-all;
+	}
+	.img_item {
+		display: flex;
+		width: 100%;
+		margin: 10px 0;
+		padding: 0 10rpx;
+	
+		.img_dowload {
+			width: 13%;
+			color: #22C572;
+			text-align: right;
+		}
+	}
+	.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;
+	}
 </style>

Datei-Diff unterdrückt, da er zu groß ist
+ 518 - 391
pageD/myRelease/buyEdit.vue


+ 244 - 32
pageD/myRelease/sellEdit.vue

@@ -81,12 +81,12 @@
 					<input placeholder="请输入买方手机号" name="input" v-model="deptList.sellerPhone"></input>
 				</view>
 			</view>
-			<view  class="c-row">
+			<view class="c-row">
 				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode'
 					class='getcode'>{{sendText}}</button>
-					<view class="con-list">
-						<input v-model='verifyCode' maxlength="6" placeholder="请输入验证码" type="text">
-					</view>
+				<view class="con-list">
+					<input v-model='verifyCode' maxlength="6" placeholder="请输入验证码" type="text">
+				</view>
 			</view>
 		</view>
 		<view class="buylow">
@@ -157,9 +157,10 @@
 			<view v-if='checked' class="c-row b-b">
 				<text class="tit">产出年份</text>
 				<view class="con-list">
-				<view @click='yearchange'>{{deptList.outputYear == null?"请选择出厂年份":deptList.outputYear}}</view>
-				<u-picker :params='params2' @confirm='yearpicker($event)' v-model="show2" mode="time" :start-year="startData" :end-year="endData">
-				</u-picker>
+					<view @click='yearchange'>{{deptList.outputYear == null?"请选择出厂年份":deptList.outputYear}}</view>
+					<u-picker :params='params2' @confirm='yearpicker($event)' v-model="show2" mode="time"
+						:start-year="startData" :end-year="endData">
+					</u-picker>
 				</view>
 			</view>
 			<view v-if='checked' class="c-row b-b">
@@ -185,18 +186,57 @@
 				</picker>
 			</view>
 		</view>
+		<view class="remark">
+			<view class="c-row b-b">
+				<text class="tit">备注</text>
+			</view>
+			<view style='position:relative;' class="wrap no-boder">
+				<u-input class='textarea' v-model="deptList.remark" :type="type" :border="border" :height="height"
+					:auto-height="autoHeight" maxlength="500" />
+				<!-- <view style='position:absolute;right:10px;bottom:20px;color:#AFB3BF;'>
+					{{deptList.remark.length}}/500个字
+				</view> -->
+			</view>
+			<view class="c-row b-b" style="display: block;">
+				<text class="tit">附件</text>
+				<view style="display: flex;flex-wrap: wrap;">
+					<view v-for='(item,index) in imglist2' v-if="imglist2 && imglist2.length > 0"
+						style="position: relative;margin-left: 20rpx;">
+						<view class="delete_img" @click="deleteImg(index)">X</view>
+						<image :src="item.appendixPath" mode="" style="width: 100px;height: 100px;"></image>
+					</view>
+					<view class="biankuang" @click="uploadClick" v-if="imglist2.length < 30">
+						<view class="tubiao">
+							<image class="upload" src="../../static/img/oa_office/upload.png" mode="">
+							</image>
+							<view class="" style="color:#8c8f98;">
+								选择图片
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 
 		<button @click="commit()" class="btn">重新发布</button>
 	</view>
 </template>
 
 <script>
+	import * as config from '../../config'
 	import {
 		mapState
 	} from 'vuex';
 	export default {
 		data() {
 			return {
+				dotStyle: false,
+				currentImg: 0,
+				imgUrl: [],
+				type: 'textarea',
+				border: true,
+				height: 150,
+				autoHeight: true,
 				types: '',
 				goods: {},
 				typesType: ["现货", "期货"],
@@ -209,7 +249,11 @@
 					outputYear: "2020",
 					packingType: "可议",
 					freightPayer: "",
+					imglist2: [], //展示
+					imglist: [], //存
 				},
+					imglist2: [], //展示
+					imglist: [], //存
 				params: {
 					province: true,
 					city: true,
@@ -246,14 +290,14 @@
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
-			startData(){
-					var data = new Date()
-					return data.getFullYear() - 30
-				},
-				endData(){
-					var data = new Date()
-					return data.getFullYear()
-				}
+			startData() {
+				var data = new Date()
+				return data.getFullYear() - 30
+			},
+			endData() {
+				var data = new Date()
+				return data.getFullYear()
+			}
 		},
 		onLoad(options) {
 			this.getList(options)
@@ -275,24 +319,98 @@
 				uni.hideLoading()
 			})
 		},
+		watch: {
+			imglist: {
+				handler: function() {
+					this.$api.doRequest('get', 'appendix/query/getFileList', {
+						appendixIds: this.imglist.toString()
+					}).then(res => {
+						this.imglist2 = res.data.data
+						for (let i = 0; i < this.imglist2.length; i++) {
+							// if (this.imglist2[i].appendixName) {
+							// 	this.imglist2[i].type = this.imglist2[i].appendixName.split(".")[1]
+							// }
+							if (this.imglist2[i].appendixPath) {
+								this.imgUrl.push(this.imglist2[i].appendixPath) 
+							}
+						}
+					})
+				},
+				deep: true
+			}
+		},
 		methods: {
+			deleteImg(index) {
+				this.imglist.splice(index, 1)
+			},
 			yearpicker(e) {
-				if(e!=null){
-					this.morestatus=true
-				}else{
-					this.morestatus=false
+				if (e != null) {
+					this.morestatus = true
+				} else {
+					this.morestatus = false
 				}
 				this.deptList.outputYear = e.year
 			},
 			yearchange() {
 				this.show2 = true
 			},
+			async uploadClick() {
+				let baseUrlNew = config.def().baseUrlNew
+				console.log('baseUrlNew',baseUrlNew)
+				uni.chooseImage({
+					count:10,
+					success: (chooseImageRes) => {
+						console.log('chooseImageRes',chooseImageRes)
+						let files = []
+						for (let item of chooseImageRes.tempFiles) {
+							files.push({
+								name: 'fileName',
+								url : item.path
+							});
+						}
+						console.log(files)
+						for (let i = 0; i < files.length; i++) {
+							uni.uploadFile({
+							url: baseUrlNew + 'appendix/api/uploadFiles',
+							// url: baseUrlNew+'appendix/api/uploadFiles', //仅为示例,非真实的接口地址
+							// files: files[i],
+							filePath:files[i].url,
+							name:files[i].name,
+							formData: {
+								// fileName: chooseImageRes.tempFiles[0],
+								companyId: "2710b21efc1e4393930c5dc800010dc4",
+								modelId: '',
+								vesselId: '',
+							},
+							success: (uploadFileRes) => {
+								console.log(JSON.parse(uploadFileRes.data))
+								var data = JSON.parse(uploadFileRes.data).data
+								this.$api.doRequest('post', '/appendix/api/saveFiles', {
+									newAppendixs: [data],
+									oldAppendixIds: ""
+								}).then(res => {
+									this.imglist.push(res.data.data[0])
+									console.log(res)
+								})
+								console.log(uploadFileRes.data);
+							},
+							fail(res) {
+								
+								console.log(res);
+							}
+						});
+						}
+						
+					}
+				});
+			},
 			getList(options) {
 				this.$api.doRequest('get', '/salePlanInfo/getSalePlanInfo', {
 						id: options.id
 					}).then(res => {
 						if (res.data.code == 200) {
 							this.deptList = res.data.data
+							this.imglist = this.deptList.addressUrl.split(',')
 							if (this.deptList.waterContent != null || this.deptList.bulkDensity != null || this
 								.deptList.jiaorenli != null || this.deptList.impurity != null || this.deptList
 								.mildewGrain != null || this.deptList.imperfectGrain != null || this.deptList
@@ -300,10 +418,10 @@
 								this.deptList.packingType != null || this.deptList.freightPayer != null) {
 								this.checked = false
 							}
-							if(this.deptList.outputPrivate&&this.deptList.outputCity){
+							if (this.deptList.outputPrivate && this.deptList.outputCity) {
 								this.region1 = this.deptList.outputPrivate + '-' + this.deptList.outputCity
 							}
-							
+
 							this.region = this.deptList.sendPrivate + '-' + this.deptList.sendCity + '-' + this
 								.deptList.sendArea
 							// if(this.deptList.salePlanTypeKey==2){
@@ -332,14 +450,13 @@
 
 					})
 					.catch(res => {
-						if(res.errmsg){
+						if (res.errmsg) {
 							uni.showToast({
 								title: res.errmsg,
 								icon: 'none',
 								duration: 2000
 							})
-						}
-						else{
+						} else {
 							uni.showToast({
 								title: "系统异常,请联系管理员",
 								icon: 'none',
@@ -599,6 +716,9 @@
 				if (this.deptList.salePlanType == '期货') {
 					this.insertProcurementPlanInfo.basisPrice = this.insertProcurementPlanInfo.basisPrice
 				}
+				if (this.imglist.length > 0) {
+					this.insertProcurementPlanInfo.addressUrl = this.imglist.toString()
+				}
 				this.insertProcurementPlanInfo.commonId = this.userInfo.id
 				this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 				uni.showModal({
@@ -611,7 +731,8 @@
 									verifyCode: this.verifyCode
 								}).then(res => {
 									if (res.data.code == 200) {
-										that.$api.doRequest('post', '/salePlanInfo/api/editSalePlanInfo', that
+										that.$api.doRequest('post', '/salePlanInfo/api/editSalePlanInfo',
+												that
 												.insertProcurementPlanInfo).then(res => {
 												if (res.data.code == 200) {
 													// uni.showToast({
@@ -632,14 +753,13 @@
 												}
 											})
 											.catch(res => {
-												if(res.errmsg){
+												if (res.errmsg) {
 													uni.showToast({
 														title: res.errmsg,
 														icon: 'none',
 														duration: 2000
 													})
-												}
-												else{
+												} else {
 													uni.showToast({
 														title: "系统异常,请联系管理员",
 														icon: 'none',
@@ -673,7 +793,7 @@
 						}
 					}
 				})
-				
+
 				// this.$api.doRequest('post', '/salePlanInfo/api/editSalePlanInfo', this
 				// 		.insertProcurementPlanInfo).then(res => {
 				// 		if (res.data.code == 200) {
@@ -772,9 +892,11 @@
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
-	.con-list input{
-			font-size:14px !important;
-		}
+
+	.con-list input {
+		font-size: 14px !important;
+	}
+
 	.buyup {
 		background-color: #FFFFFF;
 		border-radius: 20px;
@@ -787,6 +909,12 @@
 		margin-top: 10px;
 	}
 
+	.remark {
+		background-color: #FFFFFF;
+		border-radius: 20px;
+		margin-top: 10px;
+	}
+
 	.btn {
 		border-radius: 20px;
 		margin-top: 10px;
@@ -813,8 +941,92 @@
 		line-height: 30px;
 	}
 
+	.no-boder {
+		border: 0;
+	}
+
+	.wrap {
+		padding-top: 5px;
+		font-size: 14px;
+		background: #fff;
+		margin: 10px;
+		border-radius: 10px;
+
+		input {
+			font-size: 14px;
+		}
+	}
+	.textarea {
+		background: #F9F9FA;
+		border: 1px solid #EEEEEE;
+	}
 	.getcode.active {
 		background: #22C572;
 		color: #fff;
 	}
+	.fujian{
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			color: $font-color-dark;
+			line-height: 40upx;
+			text-align: right;
+			padding-right: 20upx;
+	}
+	.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;
+	}
+	.delete_img {
+		position: absolute;
+		z-index: 100;
+		left: 84px;
+		color: #ffffff;
+		font-size: 28rpx;
+		border: 1px;
+		border-radius: 5rpx;
+		width: 32rpx;
+		height: 32rpx;
+		background-color: #ff0000;
+		text-align: center;
+	}
+	.delete_img {
+		position: absolute;
+		z-index: 100;
+		left: 84px;
+		color: #ffffff;
+		font-size: 28rpx;
+		border: 1px;
+		border-radius: 5rpx;
+		width: 32rpx;
+		height: 32rpx;
+		background-color: #ff0000;
+		text-align: center;
+	}
+	.tubiao {
+		margin: 0 auto;
+		text-align: center;
+		margin-top: 35rpx;
+	}
+	
+	.biankuang {
+		border: 1px dashed #AFB3BF;
+		border-radius: 10rpx;
+		width: 200rpx;
+		height: 200rpx;
+		margin-left: 20rpx;
+	}
+	
+	.upload {
+		width: 80rpx;
+		height: 80rpx;
+	}
 </style>

+ 6 - 6
pages/business/business.vue

@@ -53,15 +53,15 @@
 					<view v-if='TabCur==1' class='address'>
 						{{item.sendPrivate}}{{item.sendCity}}{{item.sendArea}}{{item.sendWarehouse}}
 					</view>
-					<view class='price NumberBold' v-if='item.procurementPlanType=="期货"'>
+					<view class='price NumberBold' v-if='item.procurementPlanType=="期货" && item.basisPrice'>
 						<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=="现货"'>
+					<view class='price NumberBold' v-if='item.procurementPlanType=="现货" && item.procurementPrice'>
 						<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
+					<view class='price NumberBold' v-if='item.salePlanType=="期货" && item.basisPrice'><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
+					<view class='price NumberBold' v-if='item.salePlanType=="现货" && item.salePrice'><text class="number-style">{{item.salePrice}}</text><text
 							style='font-size:13px;color:#333;' class="Semibold">元/吨</text></view>
 				</view>
 				<view class='flex justify-between Regular'>
@@ -78,11 +78,11 @@
 					</view>
 					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货" && TabCur== 0'>
 						今日基差</view>
-					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货" && TabCur== 0'>
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货" && TabCur== 0 && item.procurementPrice'>
 						采购价格</view>
 					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="期货" && TabCur== 1'>今日基差
 					</view>
-					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货" && TabCur== 1'>销售价格
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货" && TabCur== 1 && item.salePrice'>销售价格
 					</view>
 				</view>
 			</view>

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.