Merge branch 'devlop' of http://git.qniao.cn/dengxiongfei/paper-shopkeeper-app into devlop

apis/trade.js

@@ -45,7 +45,28 @@ export function enquiryReplyDetail(data) {
     },
     { hideLoading: true }
   )
-}
+}
+// 消息列表
+export function systemMessageList(data) {
+  return http.get(
+    {
+      url: '/base-paper-trading/get/system-message/list',
+      data
+    },
+    { hideLoading: true }
+  )
+}
+// 系统消息已读
+export function systemRead(data) {
+  return http.post({
+    url: '/base-paper-trading/set/message-read',
+    data
+  })
+}
+
+
+
+
 
 
 

pages/add-paper/index.vue

@@ -203,7 +203,7 @@
 					class="paper-price-textArea"
 					:maxlength="200"
 					:styles="{ disableColor: '#F7F8FA' }"
-					v-model="form.remark"
+					v-model="form.sellingProposition"
 					:inputBorder="false"
 					type="textarea"
 					placeholder="请输入商品卖点"
@@ -219,7 +219,7 @@
 					class="paper-price-textArea"
 					:maxlength="200"
 					:styles="{ disableColor: '#F7F8FA' }"
-					v-model="form.remark"
+					v-model="form.description"
 					:inputBorder="false"
 					type="textarea"
 					placeholder="请输入商品描述"
@@ -234,7 +234,7 @@
 					class="paper-price-textArea"
 					:maxlength="200"
 					:styles="{ disableColor: '#F7F8FA' }"
-					v-model="form.remark"
+					v-model="form.shippingNote"
 					:inputBorder="false"
 					type="textarea"
 					placeholder="请输入送货说明"
@@ -249,7 +249,7 @@
 					class="paper-price-textArea"
 					:maxlength="200"
 					:styles="{ disableColor: '#F7F8FA' }"
-					v-model="form.remark"
+					v-model="form.otherNote"
 					:inputBorder="false"
 					type="textarea"
 					placeholder="请输入其他说明"
@@ -281,7 +281,7 @@
 </template>
 
 <script>
-import { back, go2 } from '@/utils/hook.js'
+import { back, go2,uploadFile } from '@/utils/hook.js'
 import qnEasyinput from '@/components/qn-easyinput/qn-easyinput.vue'
 import uGap from '@/components/u-gap/u-gap.vue'
 import { getCategoryList, createProduct, getSupplierDteail, updateProduct } from '@/apis/add-paper.js'
@@ -349,11 +349,12 @@ export default {
 			this.getDteailList()
 			this.eidtFor = 1
 		}
+		console.log('this.$store.state.supplierInfo.id',this.$store.state.supplierInfo.id)
 		this.getCategoryListQuery()
 	},
 	watch: {
 		['form.name'](val) {
-			this.form.id = null
+			this.form.id = ""
 			console.log(111)
 		}
 	},
@@ -417,9 +418,13 @@ export default {
 		},
 		// 图片选择事件
 		select(item) {
-			console.log(item)
-			console.log(this.imgList)
 			this.imgList.push(item.tempFiles[0])
+			this.postuploadFile(item.tempFiles[0])
+		},
+		postuploadFile(path){
+			uploadFile(path.path).then(val=>{
+			  this.imgList[this.imgList.length -1].pathUrl = val
+			})
 		},
 		// 删除图片
 		deleteImage(item) {
@@ -452,10 +457,15 @@ export default {
 					}
 				}
 			}
+			var upImage = []
+			for(let i = 0;i < this.imgList.length;i++){
+				upImage.push(this.imgList[i].pathUrl)
+			}
 			var params = {
 				...this.form,
 				skuList: this.skuList,
-				imgList: this.imgList
+				imgList:upImage,
+				supplierId:this.$store.state.supplierInfo.id
 			}
 			if (this.eidtFor === 0) {
 				createProduct(params).then(res => {

pages/login/index.vue

@@ -139,7 +139,7 @@ export default {
                     store.commit('setToken', token)
                     // 登录成功先查看是否有下一个页面
                     const nextPage = store.state.nextPage
-                    let page = null
+                    let page = undefined
                     if (nextPage.name) {
                       page = { url: nextPage.name, data: nextPage.data, isRedirect: true }
                     }

pages/mall/index.vue

@@ -80,18 +80,20 @@ export default {
 				pageNum: 0, // 初始会执行一次下拉加载
 				pageSize: 10,
 				storeId:null,
-				name:null
+				name:null,
+				supplierId:this.$store.state.supplierInfo.id
 			},
-			listData:[{}]
+			listData:[]
 		}
 	},
 	onLoad() {
-		
+		this.quertData()
 	},
 	methods: {
 		back,
 		// 获取纸品列表
 		quertData() {
+			console.log('this.$store.state',this.$store.state)
 			return new Promise((resolve, reject) => {
 				SupplierList({  ...this.orderPagination })
 					.then(res => {

pages/message/index.vue

@@ -4,13 +4,13 @@
 			<uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="">
 				<view class="message-info-title">消息通知</view>
 				<view slot="left"></view>
-				<view slot="right" class="message-info-right-title">一键全读</view>
+				<view slot="right" class="message-info-right-title" @click="cupRead()">一键全读</view>
 			</uni-nav-bar>
 		</view>
 		<view class="">
 			<view class="message-tab">
 				<view :class="subIndex === 0 ? 'message-bottom meeage-change' : 'message-noChange'" @click="checkMessage(0)">
-					<uni-badge size="small" :custom-style="subIndex === 0 ? customStyle:customStylet" :text="5" absolute="rightTop" type="error">系统消息</uni-badge>
+					<uni-badge size="small" :custom-style="subIndex === 0 ? customStyle:customStylet" :text="systemBadge" absolute="rightTop" type="error">系统消息</uni-badge>
 				</view>
 				<view :class="subIndex === 1 ? 'message-bottom meeage-change' : 'message-noChange'" @click="checkMessage(1)">
 					<uni-badge size="small" :custom-style="subIndex === 1 ? customStyle:customStylet" :text="5" absolute="rightTop" type="error">平台公告</uni-badge>
@@ -18,8 +18,8 @@
 			</view>
 		</view>
 		<view class="">
-			<systemMessage v-if="subIndex === 0" v-for="item in 10"></systemMessage>
-			<platformMessage v-if="subIndex === 1" v-for="item in 10"></platformMessage>
+			<systemMessage ref="systemRef" v-if="subIndex === 0" @systemCount="systemCount"></systemMessage>
+			<platformMessage v-if="subIndex === 1" ></platformMessage>
 		</view>
 	</view>
 </template>
@@ -36,6 +36,7 @@ export default {
 	data() {
 		return {
 			subIndex: 0,
+			systemBadge:0,
 			customStyle: {
 				top: '5px',
 				background:'#FF0000 '
@@ -50,6 +51,13 @@ export default {
 		back,
 		checkMessage(item) {
 			this.subIndex = item
+		},
+		systemCount(item){
+			this.systemBadge = item
+			console.log('this.systemBadge',this.systemBadge)
+		},
+		cupRead(){
+			this.$refs.systemRef.allread()
 		}
 	}
 }

pages/message/system-message.vue

@@ -1,24 +1,119 @@
 <template>
 	<view class="system-message">
-		<view class="system-message-main">
-			<view class="system-message-main-top">
-				<view class="system-message-title">
-					<view class="">客户下单</view>
-					<view class="dian"></view>
-				</view>
-				<view class="system-message-subtitle">50分钟前</view>
-			</view>
-			<view class="system-message-contant">老板，您的空闲设备海德堡SD-1有新的报价订单发布了，赶紧去报价吧！</view>
-		</view>
+		 <scroll-list ref="messageRef" :option="option" @load="quotationUp" @refresh="quotationDown">
+			 <view v-for="(item,index) in list" :key="index">
+			 	<view class="system-message-main">
+			 		<view class="system-message-main-top">
+			 			<view class="system-message-title">
+			 				<view class="">客户下单</view>
+			 				<view class="dian" v-if="item.readOrNot === 0"></view>
+			 			</view>
+			 			<view class="system-message-subtitle">{{item.createTime}}</view>
+			 		</view>
+			 		<view class="system-message-contant">{{item.content}}</view>
+			 	</view>
+			 </view>
+		 </scroll-list>
+	
 	</view>
+
 </template>
 
 <script>
+	import { systemMessageList,systemRead } from '@/apis/trade'
 export default {
 	data() {
-		return {}
+		return {
+			option: {
+			  size: 10,
+			  auto: true,
+			  emptyText: '暂无消息~',
+			  background: '#F7F8FA',
+			  fontSize: '40rpx'
+			},
+			pagination: {
+			  pageNum: 0, // 初始会执行一次下拉加载
+			  pageSize: 10
+			},
+			list:[]
+		}
 	},
-	methods: {}
+	 onLoad(option) {
+		 this.queryData()
+	 },
+	methods: {
+		queryData(){
+			return new Promise((resolve, reject) => {
+			  systemMessageList({...this.pagination })
+			    .then((res) => {
+			      if (res) {
+					  var data= res.records
+					  var count = 0
+					  for(let i =0;i<data.length;i++){
+						  if(data[i].readOrNot === 0){
+							  count = count + 1
+						  }
+					  }
+					  this.$emit('systemCount',count)
+			        if (this.pagination.pageNum === 0) {
+			          this.list = res.records
+			        } else {
+			          this.list = this.list.concat(res.records)
+			        }
+			        resolve({ list: this.list, total: res.total })
+			      } else {
+			        reject()
+			      }
+			    })
+			    .catch((err) => {
+			      reject(err)
+			    })
+			})
+		},
+		//消息分页
+		quotationUp(page) {
+		  this.pagination.pageNum++
+		  this.queryData()
+		    .then(({ list, total }) => {
+		      this.$refs.messageRef.refreshSuccess({ list, total })
+		    })
+		    .catch(() => {
+		      this.$refs.messageRef.loadFail()
+		    })
+		},
+		//消息分页
+		quotationDown() {
+		  this.pagination.pageNum = 0
+		  this.queryData()
+		    .then(({ list, total }) => {
+		      this.$refs.messageRef.refreshSuccess({ list, total })
+		    })
+		    .catch(() => {
+		      this.$refs.messageRef.refreshFail()
+		    })
+		},
+		allread(){
+			return new Promise((resolve, reject) => {
+				var meesage = this.list.map(item => {return item.id})
+			  systemRead(meesage)
+			    .then((res) => {
+			      if (res) {
+					 uni.showToast({
+					 	title: '操作成功',
+					 	icon: 'success'
+					 })
+					  this.pagination.pageNum = 0
+					 this.queryData()
+			      } else {
+			        reject()
+			      }
+			    })
+			    .catch((err) => {
+			      reject(err)
+			    })
+			})
+		}
+	}
 }
 </script>
 

pages/my-offer/index.vue

@@ -10,7 +10,7 @@
 		<scroll-list style="touch-action: none" ref="orderRef" :option="orderOption" @load="orderUp" @refresh="orderDown">
 			<view v-for="(items, index) in orderData" :key="index" @click="myPriceInfo(items)">
 				<view class="list-border list-title-line">
-					<text class="list-title">广州民族印刷有限公司</text>
+					<text class="list-title">{{items.belongEnterpriseName}}</text>
 					<text class="list-title-Subtitle">{{ controlItems[items.orderStatus - 1] }}</text>
 				</view>
 				<view class="list-border list-info-line" v-for="(item, index) in items.orderItemList" :key="index">
@@ -26,7 +26,7 @@
 					</view>
 				</view>
 				<view class="list-border list-bottom-contant">
-					<view><text class="list-time">三分钟前</text></view>
+					<view><text class="list-time">{{items.deliveryDay}}</text></view>
 					<view class="">
 						<text class="list-title-Subtitle">¥{{ items.totalOfferPrice }}</text>
 					</view>
@@ -59,9 +59,7 @@ export default {
 				pageNum: 0, // 初始会执行一次下拉加载
 				pageSize: 10
 			},
-			orderData: [
-				{"id":"638458876659896320","totalOfferPrice":10,"orderItemList":[{"id":"123456","productName":"交易大厅-订单商品","pieceQuantity":0,"productImg":null,"gramWeight":"300","width":"1024","length":"789","brandName":"丽盈","categoryName":"白卡纸"}],"deliveryDay":null,"orderStatus":3}
-			],
+			orderData: [],
 			controlCurrent: 0,
 			controlItems: ['待付款', '待发货', '待收货', '已完成', '已关闭'],
 			orderOption: {
@@ -101,7 +99,7 @@ export default {
 		// 获取我的报价
 		getMyreplyListQuery() {
 			return new Promise((resolve, reject) => {
-				getMyreplyList({ ...this.orderParams, ...this.orderPagination })
+				getMyreplyList({...this.orderPagination })
 					.then(res => {
 						if (res) {
 							if (this.orderPagination.pageNum == 1) {

pages/submit-quotation/index.vue

@@ -26,33 +26,33 @@
 		<view class="submit-deadline">
 			<view class="submit-text">报价截止</view>
 			<view class="submit-time">
-				<text class="submit-time-text">{{ upDataObj.enquiryValidTime[0] }}</text>
+				<text class="submit-time-text">{{ upDataObj.enquiryValidTimeSplit[0] }}</text>
 			</view>
 			<view class="sbumit-colon">:</view>
 			<view class="submit-time">
-				<text class="submit-time-text">{{ upDataObj.enquiryValidTime[1] }}</text>
+				<text class="submit-time-text">{{ upDataObj.enquiryValidTimeSplit[1] }}</text>
 			</view>
 			<view class="sbumit-colon">:</view>
 			<view class="submit-time">
-				<text class="submit-time-text">{{ upDataObj.enquiryValidTime[2] }}</text>
+				<text class="submit-time-text">{{ upDataObj.enquiryValidTimeSplit[2] }}</text>
 			</view>
 		</view>
 		<uGap></uGap>
 		<view class="submit-contant" v-for="(items, index) in upDataObj.itemList" :key="index">
 			<view class="submit-contant-head">
-				<view class="submit-contant-title">{{ items.brandName }}|{{ items.gramWeight }}|{{ items.length }}*{{ items.width }}|{{ items.quantity }}</view>
-				<view class="" @click="commodityModify()"><image class="submit-image" src="../../static/imgs/trade/myPrice.png" mode=""></image></view>
+				<view class="submit-contant-title">{{ items.paperName }}|{{ items.gramWeight }}|{{ items.length }}*{{ items.width }}|{{ items.quantity }}</view>
+				<view class="" @click="commodityModify(items, index)"><image class="submit-image" src="../../static/imgs/trade/myPrice.png" mode=""></image></view>
 			</view>
 			<view class="submit-contant-body">
 				<view class="">
 					<text class="submit-contant-body-title">重量(吨)：</text>
-					<text class="submit-contant-body-subtitle">1.6544</text>
+					<text class="submit-contant-body-subtitle">{{ items.gramWeight }}</text>
 				</view>
 				<view>
 					<text class="submit-contant-body-title">单价(元/吨)：</text>
 					<text class="submit-contant-body-subtitle">
 						{{ items.unitFee }}
-						<image @click="priceModify()" class="submit-image-price" src="../../static/imgs/trade/myPrice.png" mode=""></image>
+						<image @click="priceModify(items, index)" class="submit-image-price" src="../../static/imgs/trade/myPrice.png" mode=""></image>
 					</text>
 				</view>
 				<view>
@@ -67,18 +67,18 @@
 		<view class="submit-contant-order">
 			<view class="">
 				<text class="submit-contant-order-title">其他费用：</text>
-				<text class="submit-contant-order-subtitle">¥ 80.00</text>
+				<text class="submit-contant-order-subtitle">¥ {{ upDataObj.otherFee }}</text>
 			</view>
 			<view class="">
 				<text class="submit-contant-order-title">合计：</text>
-				<text class="submit-contant-order-money">¥ 13800.32</text>
+				<text class="submit-contant-order-money">¥ {{ upDataObj.totalAllPrice }}</text>
 			</view>
 		</view>
 		<uGap></uGap>
 		<view class="submit-contant-time">
 			<view class="">
 				<text class="submit-contant-time-title">有效时间：</text>
-				<text class="submit-contant-time-title">24小时</text>
+				<text class="submit-contant-time-title">{{ upDataObj.createTime }}</text>
 			</view>
 			<view class="" @click="resetTime()"><text class="submit-contant-time-subtitle">设置</text></view>
 		</view>
@@ -97,11 +97,16 @@
 							<view class="submit-popup-title">纸品名称：</view>
 							<view class="" @click="close()"><image class="submit-popup-close-image" src="../../static/imgs/client/close-icon.png" mode=""></image></view>
 						</view>
-						<view><uni-data-picker class="submit-popup-input" :border="false" :localdata="items" @change="onchange"></uni-data-picker></view>
+						<view>
+							<!-- <uni-data-picker class="submit-popup-input" :border="false" :localdata="items" @change="onchange"></uni-data-picker> -->
+							<uni-easyinput :inputBorder="false" class="submit-popup-input" type="text" v-model="addObj.paperName" placeholder="请输入内容"></uni-easyinput>
+						</view>
 					</view>
 					<view class="submit-line">
 						<view class="submit-popup-close"><view class="submit-popup-title">克重(g)</view></view>
-						<view class=""><uni-easyinput :inputBorder="false" class="submit-popup-input" type="number" v-model="value" placeholder="请输入内容"></uni-easyinput></view>
+						<view class="">
+							<uni-easyinput :inputBorder="false" class="submit-popup-input" type="number" v-model="addObj.gramWeight" placeholder="请输入内容"></uni-easyinput>
+						</view>
 					</view>
 					<view class="submit-line">
 						<view class="submit-popup-close"><view class="submit-popup-title">规格(mm)</view></view>
@@ -111,7 +116,7 @@
 									:inputBorder="false"
 									class="submit-popup-input submit-popup-specifications"
 									type="number"
-									v-model="value"
+									v-model="addObj.length"
 									placeholder="请输入内容"
 								></uni-easyinput>
 							</view>
@@ -121,7 +126,7 @@
 									:inputBorder="false"
 									class="submit-popup-input submit-popup-specifications"
 									type="number"
-									v-model="value"
+									v-model="addObj.width"
 									placeholder="请输入内容"
 								></uni-easyinput>
 							</view>
@@ -130,11 +135,11 @@
 					<view class="submit-popup-close submit-number-box">
 						<view class=""><view class="submit-popup-title">购买数量(张)</view></view>
 						<view class="submit-number-line">
-							<uni-number-box v-model="vModelValue"></uni-number-box>
-							<text class="submit-number-text">预估重量：1.6346吨</text>
+							<uni-number-box v-model="addObj.quantity"></uni-number-box>
+							<text class="submit-number-text">预估重量：{{ (addObj.quantity * addObj.gramWeight).toFixed(2) }}</text>
 						</view>
 					</view>
-					<view class=""><button class="submit-btn submit-number-btn" type="primary">确认修改纸品</button></view>
+					<view class=""><button class="submit-btn submit-number-btn" type="primary" @click="sureModifyPaper()">确认修改纸品</button></view>
 				</view>
 			</uni-popup>
 		</view>
@@ -145,25 +150,34 @@
 						<view class="submit-popup-close">
 							<view class="submit-popup-title">
 								单价(元/吨)
-								<text class="submit-number-text submit-price-subTitle">预估重量：1.6346吨</text>
+								<text class="submit-number-text submit-price-subTitle">预估重量：{{ prices.gramWeight }}吨</text>
 							</view>
 							<view class="" @click="close()"><image class="submit-popup-close-image" src="../../static/imgs/client/close-icon.png" mode=""></image></view>
 						</view>
 						<view>
 							<view class="">
-								<uni-easyinput :inputBorder="false" class="submit-popup-input" type="number" v-model="value" placeholder="请输入内容"></uni-easyinput>
+								<uni-easyinput
+									:inputBorder="false"
+									@blur="pricesUnutFee()"
+									class="submit-popup-input"
+									type="number"
+									v-model="prices.unitFee"
+									placeholder="请输入内容"
+								></uni-easyinput>
 							</view>
 						</view>
 					</view>
 					<view class="submit-number-box submit-price">
 						<view class="submit-popup-close"><view class="submit-popup-title">其他费用(元)</view></view>
-						<view class=""><uni-easyinput :inputBorder="false" class="submit-popup-input" type="number" v-model="value" placeholder="请输入内容"></uni-easyinput></view>
+						<view class="">
+							<uni-easyinput :inputBorder="false" class="submit-popup-input" type="number" v-model="prices.otherFee" placeholder="请输入内容"></uni-easyinput>
+						</view>
 					</view>
 					<view class="submit-price-total">
 						<view class="submit-price-text">合计：</view>
-						<view class="submit-price-total-text">¥ 0</view>
+						<view class="submit-price-total-text">¥ {{ prices.totalPrice }}</view>
 					</view>
-					<view class=""><button class="submit-btn submit-number-btn" type="primary">确认报价</button></view>
+					<view class=""><button class="submit-btn submit-number-btn" type="primary" @click="pricesSure()">确认报价</button></view>
 				</view>
 			</uni-popup>
 		</view>
@@ -180,7 +194,7 @@
 							<view class="item submit-check-text" v-for="(item, index) in years" :key="index">{{ item }}</view>
 						</picker-view-column>
 						<picker-view-column>
-							<view class="item submit-check-text" v-for="(item, index) in months" :key="index">{{ item }}小时</view>
+							<view class="item submit-check-text" v-for="(item, index) in months" :key="index">{{ item }}分钟</view>
 						</picker-view-column>
 					</picker-view>
 				</view>
@@ -193,7 +207,7 @@
 import { back, go2 } from '@/utils/hook.js'
 import qnHeader from '@/components/qn-header/qn-header.vue'
 import uGap from '@/components/u-gap/u-gap.vue'
-import { updataEnquiryReply } from '@/apis/trade'
+import { updataEnquiryReply, enquiryReplyDetail } from '@/apis/trade'
 
 export default {
 	components: {
@@ -202,15 +216,15 @@ export default {
 	},
 	data() {
 		const date = new Date()
-		const years = ['长期']
+		const years = []
 		const year = date.getFullYear()
 		const months = []
 		const month = date.getMonth() + 1
 		const day = date.getDate()
-		for (let i = 0; i <= 31; i++) {
-			years.push(i+'天')
+		for (let i = 1; i < 49; i++) {
+			years.push(i + '小时')
 		}
-		for (let i = 1; i <= 12; i++) {
+		for (let i = 1; i < 61; i++) {
 			months.push(i)
 		}
 		return {
@@ -224,79 +238,71 @@ export default {
 			year,
 			months,
 			month,
-			timeValue: [0, 1],
-			pickerValue:[],
-			upDataObj:{
-				belongEnterpriseName:'东莞市隆兴纸业有限公司',
-				deliveryArea:'广东省/广州市/天河区',
-				deliveryDay:'2021/12/29 12:30',
-				enquiryValidTime:[12,11,10],
-				itemList:[
-					{
-						brandName:'丽品白卡',
-						categoryName:"",
-						gramWeight:'200g',
-						length:'787',
-						quantity:'5000张',
-						width:'1092',
-						unitFee:'1000',
-						totalPrice:'1202'
-					},
-					{
-						brandName:'丽品白卡',
-						categoryName:"",
-						gramWeight:'200g',
-						length:'787',
-						quantity:'5000张',
-						width:'1092',
-						unitFee:'1000',
-						totalPrice:'1202'
-					}
-				]
+			timeValue: [0, 0],
+			pickerValue: [],
+			upDataObj: {
+				otherFee:0,
+				totalAllPrice:0,
+				enquiryValidTimeSplit:[]
 			},
-			items: [
-				{
-					text: '一年级',
-					value: '1-0'
-				},
-				{
-					text: '二年级',
-					value: '2-0'
-				},
-				{
-					text: '三年级',
-					value: '3-0'
-				},
-				{
-					text: '一年级',
-					value: '1-0'
-				},
-				{
-					text: '二年级',
-					value: '2-0'
-				},
-				{
-					text: '三年级',
-					value: '3-0'
-				}
-			]
+			addObj: {},
+			prices: {
+				totalPrice: 0
+			},
+			modifyIndex: 0,
+			pricesIndex: 0,
+			// items: []
 		}
 	},
 	onLoad(option) {
-	  if (option) {
-	    console.log(option)
-		this.title = option.title
-	  }
+		if (option) {
+			this.title = option.title
+			this.getDetail(option.id)
+		}
 	},
 	methods: {
 		back,
+		// 获取详情
+		getDetail(id) {
+			enquiryReplyDetail(id)
+				.then(res => {
+					if (res) {
+						this.upDataObj = res
+						var timeb = this.upDataObj.enquiryValidTime.split(' ')
+						var timeabs = timeb[1].split(':')
+						console.log('timeabs',timeabs)
+						this.$set(this.upDataObj,'enquiryValidTimeSplit',timeabs)
+						this.$set(this.upDataObj,'otherFee',0)
+						this.$set(this.upDataObj,'totalAllPrice',0)
+						console.log('this.upDataObj', res)
+					}
+				})
+				.catch(err => {
+					reject(err)
+				})
+		},
+		// 确认报价
+		surePrice() {
+			updateEnquiry(thids.upDataObj)
+				.then(res => {
+					if (res) {
+					}
+				})
+				.catch(err => {
+					reject(err)
+				})
+		},
 		// 商品操作按钮
-		commodityModify(item) {
-			console.log(111)
+		commodityModify(item, index) {
+			this.modifyIndex = index
+			this.addObj = JSON.parse(JSON.stringify(item))
+			console.log(this.addObj)
 			this.$refs.popup.open('bottom')
 		},
 		// 单价操作按钮
-		priceModify() {
+		priceModify(item, index) {
+			this.pricesIndex = index
+			this.prices = JSON.parse(JSON.stringify(item))
 			this.$refs.popupPrice.open('bottom')
 		},
 		// 事件设置
@@ -305,6 +311,7 @@ export default {
 		},
 		// 事件选择change事件
 		bindChange(e) {
+			this.timeValue = e.detail.value
 			console.log(e.detail.value)
 		},
 		close() {
@@ -317,31 +324,69 @@ export default {
 			this.pickerValue = e.detail.value
 		},
 		// 时间设置取消
-		pickerCancel(){
+		pickerCancel() {
 			this.$refs.popupTime.close()
 		},
 		// 时间设置确认
-		pickerSure(){
+		pickerSure() {
+			console.log('timeValue',this.timeValue)
 			this.$refs.popupTime.close()
 		},
+		// 确认修改纸品
+		sureModifyPaper() {
+			this.$refs.popup.close()
+			this.upDataObj.itemList[this.modifyIndex] = JSON.parse(JSON.stringify(this.addObj))
+			this.upDataObj = JSON.parse(JSON.stringify(this.upDataObj))
+			this.priceFree()
+		},
+		// 单价合计
+		pricesUnutFee(item) {
+			var abs = parseFloat(this.prices.unitFee) * parseFloat(this.prices.gramWeight)
+			this.prices.totalPrice = abs.toFixed(2)
+		},
+		// 单价确认报价
+		pricesSure() {
+			this.$set(this.upDataObj.itemList[this.pricesIndex], 'otherFee', this.prices.otherFee)
+			this.$set(this.upDataObj.itemList[this.pricesIndex], 'unitFee', this.prices.unitFee)
+			var abs = parseFloat(this.prices.gramWeight)  * parseFloat(this.prices.unitFee) 
+			this.$set(this.upDataObj.itemList[this.pricesIndex], 'totalPrice', abs.toFixed(2))
+			this.upDataObj = JSON.parse(JSON.stringify(this.upDataObj))
+			this.$refs.popupPrice.close()
+			console.log(this.upDataObj.itemList)
+			this.priceFree()
+		},
+		priceFree(){
+			for(let i = 0;i<this.upDataObj.itemList.length;i++){
+				var totalAllPrice = parseFloat(this.upDataObj.totalAllPrice)  + parseFloat( this.upDataObj.itemList[i].totalPrice)
+				this.upDataObj.totalAllPrice = totalAllPrice.toFixed(2)
+				var otherFee= parseFloat(this.upDataObj.otherFee)  + parseFloat( this.upDataObj.itemList[i].otherFee)
+				this.upDataObj.otherFee  = otherFee.toFixed(2)
+			}
+		},
 		//提交报价
-		updataQuery(){
-			var params = {}
+		updataQuery() {
+			var params = {
+				...this.upDataObj
+			}
 			return new Promise((resolve, reject) => {
-				updataEnquiryReply({ params })
+				updataEnquiryReply( params )
 					.then(res => {
 						if (res) {
-
-							resolve({ list: this.quotationData, total: res.total })
+							uni.showToast({
+								title: '添加成功',
+								icon: 'success'
+							})
+							setTimeout(()=>{
+									back()
+							},800)
+						
 						}
 					})
 					.catch(err => {
 						reject(err)
 					})
 			})
-
-		},
-
+		}
 	}
 }
 </script>

pages/trade/quotationList.vue

@@ -46,7 +46,7 @@
               <text>报价截止：</text>
               <text>{{ item.enquiryValidTime }}</text>
             </view>
-            <view><button type="primary" class="offer-btn" @click="offerClick()">报价</button></view>
+            <view><button type="primary" class="offer-btn" @click="offerClick(item)">报价</button></view>
           </view>
         </view>
         <uGap></uGap>
@@ -171,9 +171,10 @@ export default {
         })
     },
     // 报价按钮事件
-    offerClick() {
+    offerClick(item) {
       var params = {
-        title: '提交报价'
+		...item,
+        title: '提交报价',
       }
       go2('submit-quotation', params)
     },

utils/hook.js

@@ -141,6 +141,7 @@ export function uploadFile(path, type = 'image') {
         let result = JSON.parse(res.data)
         if (result.data) {
           resolve(result.data)
+		  return result.data
         } else {
           reject(result.message)
         }