Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

.hbuilderx/launch.json

@@ -2,10 +2,19 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
-            "type": "uniCloud",
-            "default": {
-                "launchtype": "remote"
-            }
-        }
+     	"app-plus" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"default" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"h5" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"type" : "uniCloud"
+     }
     ]
 }

pageA/product/business_buy.vue

@@ -311,6 +311,9 @@
 									if(res.data.code==200){
 										that.$api.doRequest('post','/purchaseOrder/api/submitPurchaseOrder', {id:res.data.data}).then(res1 => {
 											if(res1.data.code==200){
+												uni.navigateTo({
+													url: `/pages/business/business`
+												})
 												uni.showToast({
 													title: '提交成功，等待买方回复',
 													icon: 'none',

pageA/product/business_sale.vue

@@ -55,7 +55,7 @@
 			<view   class="title">销售单价（元/吨）</view>
 			<view class="con-list">
 				<view class="picker">
-					<text>{{purchaseOrder.unitPrice}}</text>
+					<text>{{purchaseOrder.salePrice}}</text>
 				</view>
 				</view>
 		</view>
@@ -140,7 +140,7 @@
 						memo:'',
 						buyer:'',
 						buyerPhone:'',
-						unitPrice:0,
+						salePrice:0,
 						address:'',
 						count:0,
 						province:'',
@@ -180,7 +180,7 @@
 					memo:'',
 					buyer:'',
 					buyerPhone:'',
-					unitPrice:0,
+					salePrice:0,
 					address:'',
 					count:0,
 					id:0,
@@ -222,7 +222,7 @@
 				this.purchaseOrder.buyer = options.buyer
 				this.purchaseOrder.customer = options.customerName
 				this.purchaseOrder.basis = options.basisPrice
-				this.purchaseOrder.unitPrice = options.unitPrice
+				this.purchaseOrder.salePrice = options.salePrice
 				this.purchaseOrder.receiveWarehouse = options.receiveWarehouse
 				this.purchaseOrder.settlementPrice = options.basisPrice
 				this.purchaseOrder.salePlanType = options.salePlanType
@@ -255,7 +255,7 @@
 						url: `/pageA/product/Identity_switching?goodsName=${this.purchaseOrder.goodsName}
 						&receivePrivate=${this.purchaseOrder.receivePrivate}&receiveCity=${this.purchaseOrder.receiveCity}
 						&receiveArea=${this.purchaseOrder.receiveArea}&minimumVolume=${this.purchaseOrder.minimumVolume}
-						&buyer=${this.purchaseOrder.buyer}&basisPrice=${this.purchaseOrder.basis}&unitPrice=${this.purchaseOrder.unitPrice}
+						&buyer=${this.purchaseOrder.buyer}&basisPrice=${this.purchaseOrder.basis}&salePrice=${this.purchaseOrder.salePrice}
 						&receiveWarehouse=${this.purchaseOrder.receiveWarehouse}&salePlanType=${this.purchaseOrder.salePlanType}
 						&salePlanNo=${this.purchaseOrder.salePlan}`
 					})
@@ -323,6 +323,9 @@
 											icon: 'none',
 											duration: 2000
 										})
+										uni.navigateTo({
+											url: `/pages/business/business`
+										})
 										// uni.navigateBack();
 									}else{
 										uni.showToast({

pageB/contract/contract.vue

@@ -228,9 +228,27 @@
 				}
 			},
 			commit(item) {
-				uni.navigateTo({
-					url: `/pageB/contract/enclosures?id=${item.id}`
-				})
+				console.log(item)
+				var list = item.addressUrl.toString().split(',')
+				if(list.length > 0){
+					uni.downloadFile({
+					  url: list[0],
+					  success: function (res) {
+					    var filePath = res.tempFilePath;
+					    uni.openDocument({
+					      filePath: filePath,
+					      success: function (res) {
+							  uni.hideLoading()
+					        console.log('打开文档成功');
+					      }
+					    });
+					  },
+					})
+				}
+				
+				// uni.navigateTo({
+				// 	url: `/pageB/contract/enclosures?addressUrl=${item.addressUrl}`
+				// })
 			},
 			commit1(item) {
 				uni.navigateTo({

pageB/contract/enclosures.vue

@@ -1,12 +1,47 @@
 <template>
 	<view class="center">
-		<view class="">
-			
+		<view class="c-list">
+			<view class="xinxiup">
+				<view class="c-row b-b">
+					<text class="tit">合同编号:</text>
+					<view class="con-list">
+						<text>{{goods.contractNo}}({{goods.goodsName}})</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">买方名称:</text>
+					<view class="con-list">
+						<text>{{goods.contracter}}</text>
+					</view>
+				</view>
+				<view class="c-row">
+					<text class="tit">累计收发:</text>
+					<view class="con-list">
+						<text style="font-size: 18px">{{sendout}}<text class="hair">发</text>{{collect}}<text
+								class="collect">收</text></text>
+						<!-- <text>{{goods.level}}收</text> -->
+					</view>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	export default {
+			name: "trust",
+			data() {
+				return {
+					list:[]
+				};
+			},
+			onLoad(addressUrl) {
+				if(addressUrl){
+					this.list = addressUrl.toString().split(',')
+					console.log(this.list)
+				}
+			},
+		}
 </script>
 
 <style>

pageD/myRelease/buyEdit.vue

@@ -201,10 +201,10 @@
 					freightPayerKey:-1,
 					priceType: "定价采购",
 					procurementPlanType:"现货",
-					grain:"不限",
-					grade:"不限",
+					grain:"塔粮",
+					grade:"一等品",
 					outputYear:"2020",
-					packingType:"不限",
+					packingType:"散装",
 					freightPayer:"",
 				},
 				params:{

pageD/myRelease/sellDetails.vue

@@ -179,9 +179,9 @@
 					priceType: "定价采购",
 					procurementPlanType: "现货",
 					grain: "塔粮",
-					grade: "不限（默认）",
+					grade: "一等品",
 					outputYear: "2020",
-					packingType: "不限（默认）",
+					packingType: "散装",
 					freightPayer: "",
 				},
 				params: {
@@ -198,7 +198,7 @@
 				liIndex: 0,
 				liType: ['塔粮', '筛粮', '中粒', '大粒'],
 				pinIndex: 0,
-				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
+				pinType: ['一等品', '二等品', '三等品', '等外'],
 				nianIndex: 3,
 				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
 					'2011'
@@ -208,7 +208,7 @@
 				region: '请选择收货地区',
 				region1: '请选择产地',
 				baoIndex: 0,
-				baoType: ['不限（默认）', '散装', '大袋', '小袋'],
+				baoType: ['散装', '大袋', '小袋'],
 				chengIndex: -1,
 				chengType: ['可议', '买方承担', '卖方承担']
 			}

pageD/myRelease/sellEdit.vue

@@ -205,9 +205,9 @@
 					priceType: "定价采购",
 					procurementPlanType: "现货",
 					grain: "塔粮",
-					grade: "不限（默认）",
+					grade: "一等品",
 					outputYear: "2020",
-					packingType: "不限（默认）",
+					packingType: "可议",
 					freightPayer: "",
 				},
 				params: {

pageD/myRelease/sellGrain.vue

@@ -209,8 +209,8 @@
 					freightPayerKey: -1,
 					priceType: "定价销售",
 					grain: "塔粮",
-					grade: "不限（默认）",
-					packingType: "不限（默认）",
+					grade: "一等品",
+					packingType: "散装",
 					freightPayer: "",
 				},
 				params: {

pageD/warehousings/ex_warehouse.vue

@@ -227,7 +227,7 @@
 				},
 				pinIndex: 0,
 				pinTypes: '',
-				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
+				pinType: ['一等品', '二等品', '三等品', '等外'],
 				ruIndex: 0,
 				rutypes: '',
 				ruType: ['销售出库', '移库出库', '暂存出库', '贸易服务出库', '采购出库'],

pageD/warehousings/warehousings.vue

@@ -215,9 +215,9 @@ import upload from '@/components/upload.vue';
 					contractNo: {},
 					carNo: {},
 				},
-				pinIndex: '不限（默认）',
+				//pinIndex: '不限（默认）',
 				pinTypes: '',
-				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
+				pinType: ['一等品', '二等品', '三等品', '等外'],
 				ruIndex: '采购入库',
 				rutypes: '',
 				warehouse:[],

pages/user/user.vue

@@ -225,23 +225,9 @@
 				current: 4
 			}
 		},
-		onShow() {
-			uni.showTabBar()
-			this.loadData()
-		},
+		
 		onLoad() {
-			if(this.userInfo.avatarUrl == "" || this.userInfo.avatarUrl == null){
-					this.headUrl = "../../static/img/myimg/YongHu@3x.png"
-			}else if(this.userInfo.avatarUrl != "" || this.userInfo.avatarUrl != null){
-				this.headUrl = this.userInfo.avatarUrl
-			}
-			this.username = this.userInfo.userName
-			if(	this.username == null || this.username == ""){
-				this.username = "请更改昵称"
-			}
-			if(this.userInfo.phone != null || this.userInfo.phone != ""){
-				this.userphone = this.userInfo.phone
-			}
+			
 		},
 		// #ifndef MP
 		onNavigationBarButtonTap(e) {
@@ -266,6 +252,22 @@
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
+		onShow() {
+			uni.showTabBar()
+			this.loadData()
+			if(this.userInfo.avatarUrl == "" || this.userInfo.avatarUrl == null){
+					this.headUrl = "../../static/img/myimg/YongHu@3x.png"
+			}else if(this.userInfo.avatarUrl != "" || this.userInfo.avatarUrl != null){
+				this.headUrl = this.userInfo.avatarUrl
+			}
+			this.username = this.userInfo.userName
+			if(	this.username == null || this.username == ""){
+				this.username = "请更改昵称"
+			}
+			if(this.userInfo.phone != null || this.userInfo.phone != ""){
+				this.userphone = this.userInfo.phone
+			}
+		},
 		methods: {
 			zhibo() {
 				uni.navigateTo({
@@ -700,7 +702,7 @@
 		
 	   background-color: #F5F6FA;
 	/* 	border-radius: 20px; */
-		margin-top: 60px;
+		margin-top: 60upx;
 
 		.arc {
 			position: absolute;