Pārlūkot izejas kodu

前端小程序 sdy

zhongtianhaoyuan 3 gadi atpakaļ
vecāks
revīzija
b7e59aec12

+ 2 - 2
config/index.js

@@ -1,8 +1,8 @@
 const dev = {
 	// baseUrlNew: 'http://192.168.1.122:9100/',
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://192.168.1.120:8090/',
-	  // baseUrlNew: 'http://api.eliangeyun.com/',
+	// baseUrlNew: 'http://192.168.1.120:8090/',
+	  baseUrlNew: 'http://api.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 1 - 1
pageA/product/Identity_switching.vue

@@ -143,7 +143,7 @@
 						if(res.data.code==200){
 							// this.lists = res.data.data.records
 							
-							wx.navigateBack({
+							uni.navigateBack({
 							 
 							  delta: 1
 							 

+ 457 - 422
pageA/product/business_buy.vue

@@ -1,452 +1,475 @@
 <template>
 	<view class="center">
 		<view class="transaction">
-			
-		
-		<view  class="c-row b-b">
-			<view class="title">卖方</view>
-			<view class="con-list">
-				<view v-if='goods.customerTypeFlag==2' class="title" @click="liang">{{purchaseOrder.compName?purchaseOrder.compName:goods.compName}}&nbsp></view>
-				<view v-else class="title" @click="liang">{{purchaseOrder.customer?purchaseOrder.customer:goods.customerName}}></view>
+
+
+			<view class="c-row b-b">
+				<view class="title">卖方</view>
+				<view class="con-list">
+					<view v-if='goods.customerTypeFlag==2' class="title" @click="liang">
+						{{purchaseOrder.compName?purchaseOrder.compName:goods.compName}}&nbsp>
+					</view>
+					<view v-else class="title" @click="liang">
+						{{purchaseOrder.customer?purchaseOrder.customer:goods.customerName}}>
+					</view>
+				</view>
 			</view>
-		</view>
-		<view  class="c-row">
-			<view class="title">买方</view>
-			<view class="con-list">
-			<view class="title">{{purchaseOrder.buyer}}</view>
+			<view class="c-row">
+				<view class="title">买方</view>
+				<view class="con-list">
+					<view class="title">{{purchaseOrder.buyer}}</view>
+				</view>
 			</view>
 		</view>
-		</view>
 		<view class="transaction">
-		<view   class="c-row b-b margin-top">
-			<view class="title">收货地区</view>
-			<view class="con-list">
-				<view class="title">{{purchaseOrder.receivePrivate}}{{purchaseOrder.receiveCity}}{{purchaseOrder.receiveArea}}</view>
+			<view class="c-row b-b margin-top">
+				<view class="title">收货地区</view>
+				<view class="con-list">
+					<view class="title">
+						{{purchaseOrder.receivePrivate}}{{purchaseOrder.receiveCity}}{{purchaseOrder.receiveArea}}
+					</view>
+				</view>
 			</view>
-		</view>
-		<view   class="c-row b-b ">
-			<view class="title">收货库</view>
-			<view class="con-list">
-				<view class="title">{{purchaseOrder.receiveWarehouse}}</view>
+			<view class="c-row b-b ">
+				<view class="title">收货库</view>
+				<view class="con-list">
+					<view class="title">{{purchaseOrder.receiveWarehouse}}</view>
+				</view>
 			</view>
-		</view>
-		<view v-if='companyId!=2' class="c-row b-b">
-			<view class="title">货名</view>
-			<view class="con-list">
-			<text>{{purchaseOrder.goodsName}}</text>
+			<view v-if='companyId!=2' class="c-row b-b">
+				<view class="title">货名</view>
+				<view class="con-list">
+					<text>{{purchaseOrder.goodsName}}</text>
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<view class="title">最小成交量(吨)</view>
-			<view class="con-list">
-			<text>{{purchaseOrder.minimumVolume}}</text>
+			<view class="c-row b-b">
+				<view class="title">最小成交量(吨)</view>
+				<view class="con-list">
+					<text>{{purchaseOrder.minimumVolume}}</text>
+				</view>
 			</view>
-		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row">
-			<view  class="title">今日基差(元/吨)</view>
-			<view class="con-list">
-				<view class="picker">
-					<text>{{purchaseOrder.basis}}</text>
+			<view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row">
+				<view class="title">今日基差(元/吨)</view>
+				<view class="con-list">
+					<view class="picker">
+						<text>{{purchaseOrder.basis}}</text>
+					</view>
 				</view>
+			</view>
+
+			<view v-else class="c-row ">
+				<view class="title">采购单价(元/吨)</view>
+				<view class="con-list">
+					<view class="picker">
+						<text>{{purchaseOrder.procurementPrice}}</text>
+					</view>
 				</view>
+			</view>
 		</view>
-	
-		<view v-else class="c-row ">
-			<view   class="title">采购单价(元/吨)</view>
-			<view class="con-list">
-				<view class="picker">
-					<text>{{purchaseOrder.procurementPrice}}</text>
+		<view class="transaction">
+			<view class="c-row b-b margin-top">
+				<view class="title">发票类型</view>
+				<view class="con-list">
+					<picker @change="invoiceChange" :value="invoiceIndex" :range="invoiceType">
+						<view class="picker">
+							{{invoiceIndex>-1?invoiceType[invoiceIndex]:'请选择'}}
+						</view>
+					</picker>
 				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">出售数量(吨)</view>
+				<view class="con-list">
+					<input v-model='purchaseOrder.transactionsNumber' type="number" placeholder="请填写出售数量"
+						placeholder-style="font-size: 12px;" name="input"></input>
 				</view>
-		</view>
-			</view >
-				<view class="transaction">
-		<view class="c-row b-b margin-top">
-			<view class="title">发票类型</view>
-			<view class="con-list">
-			<picker @change="invoiceChange" :value="invoiceIndex" :range="invoiceType">
-				<view class="picker">
-					{{invoiceIndex>-1?invoiceType[invoiceIndex]:'请选择'}}
+			</view>
+			<view class="c-row b-b">
+				<view class="title">包装方式</view>
+				<view class="con-list">
+					<picker @change="packingChange" :value="packingIndex" :range="packingType">
+						<view class="picker">
+							{{packingIndex>-1?packingType[packingIndex]:'请选择'}}
+						</view>
+					</picker>
 				</view>
-			</picker>
 			</view>
-		</view>
-		<view  class="c-row b-b">
-			<view class="title">出售数量(吨)</view>
-			<view class="con-list">
-			<input v-model='purchaseOrder.transactionsNumber' placeholder="请填写出售数量" placeholder-style="font-size: 12px;" name="input"></input>
+			<view v-if='packingIndex!=0' class=" beizhu align-start">
+				<view class="title">袋装备注</view>
+				<view>
+					<textarea maxlength="-1" v-model='purchaseOrder.baggingNotes'
+						placeholder="请填写包装规格、质量、包装物要求。例:50kg袋装、大粒、彩包" placeholder-style="font-size: 12px;"
+						class="textareas"></textarea>
+				</view>
 			</view>
-		</view>
-		<view  class="c-row b-b">
-			<view class="title">包装方式</view>
-			<view class="con-list">
-			<picker @change="packingChange" :value="packingIndex" :range="packingType">
-				<view class="picker">
-					{{packingIndex>-1?packingType[packingIndex]:'请选择'}}
+			<view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
+				<view class="title">点价(元/吨)</view>
+				<view class="con-list">
+					<input placeholder="请填写点价" name="input" type="number" placeholder-style="font-size: 12px;"
+						@input='someprice' v-model="purchaseOrder.pointPrice"></input>
 				</view>
-			</picker>
 			</view>
-		</view>
-		<view v-if='packingIndex!=0' class=" beizhu align-start">
-			<view class="title">袋装备注</view>
-			<view >
-			<textarea maxlength="-1" v-model='purchaseOrder.baggingNotes' placeholder="请填写包装规格、质量、包装物要求。例:50kg袋装、大粒、彩包" placeholder-style="font-size: 12px;" class="textareas"></textarea>
+			<view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
+				<view class="title">发票费用(元/吨)</view>
+				<view class="con-list">
+					<input disabled placeholder="请填写发票费用" name="input" @input='someprice'
+						v-model="purchaseOrder.invoiceFee"></input>
+				</view>
 			</view>
-		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
-			<view class="title">点价(元/吨)</view>
-			<view class="con-list">
-			<input placeholder="请填写点价" name="input" placeholder-style="font-size: 12px;" @input='someprice' v-model="purchaseOrder.pointPrice"></input>
+			<view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
+				<view class="title">包装费(元/吨)</view>
+				<view class="con-list">
+					<input placeholder="请填写包装费" name="input" @input='someprice' v-model="packingFee"></input>
+					
+				</view>
 			</view>
-		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
-			<view class="title">发票费用(元/吨)</view>
-			<view class="con-list">
-			<input disabled placeholder="请填写发票费用" name="input" @input='someprice' v-model="purchaseOrder.invoiceFee"></input>
+			<view v-if="purchaseOrder.procurementPlanType=='期货'" class=" align-start ">
+				<view class="titles">结算价格</view>
+				<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
+				<text
+					style="font-size: 18px;color: #FD714F;margin-left: 25px;">¥{{purchaseOrder.settlementPrice}}</text>
+				<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
 			</view>
 		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
-			<view class="title">包装费(元/吨)</view>
-			<view class="con-list">
-		<input placeholder="请填写包装费" name="input" @input='someprice' v-model="packingFee"></input>
-		</view>
-		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'"  class=" align-start ">
-			<view class="titles">结算价格</view>
-			<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
-			<text style="font-size: 18px;color: #FD714F;margin-left: 25px;">¥{{purchaseOrder.settlementPrice}}</text>
-			<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
-		</view>
-		</view>
-			<button class="btn" @click="commit()">提交</button>
+		<button class="btn" @click="commit()">提交</button>
 	</view>
 </template>
 
 <script>
 	import {
-	    mapState 
+		mapState
 	} from 'vuex';
 	export default {
-			data() {
-				return {
-					tradeInfo:{
-						salebuyId:0,
-						packing:'',
-						memo:'',
-						buyer:'',
-						buyerPhone:'',
-						procurementPrice:0,
-						address:'',
-						count:0,
-						province:'',
-						area:'',
-						priceType:'',
-						invoiceType:'',
-						acceptType:'',
-						seller:'',
-						sellerPhone:'',
-						packingMoney:0,
-						type:0,
-						modalName:"",
-					},
-					purchaseOrder: {
-						invoiceFee:0,
-						packingFee:0,
-						packingType:"散装",
-						packingTypeKey:1,
-						type:'不开发票',
-						typeKey:1
-					},
-					invoiceTypeIndex:0,
-					invoiceTypeIndex1:0,
-					acceptTypeIndex:0,
-					priceTypeIndex:0,
-					bankNameIndex:0,
-					packingIndex:0,
-					invoiceIndex:0,
-					packingType: ['散粮','大袋','小袋'],
-					// invoiceType: ['不开发票', '普通发票', '增值税发票'],
-					invoiceType: ['不开发票','增值税发票'],
-					acceptType: ['第三方检验(国家检验资质)', '交收地库或港出具的检验', '现场看货','其他'],
-					priceType: ['库内价', '到库价', '到港价'],
-					priceTypeIndex1:'库内价',
-					region: [],
-					salebuyId:0,
-					memo:'',
-					buyer:'',
-					buyerPhone:'',
-					procurementPrice:0,
-					address:'',
-					count:0,
-					id:0,
-					price:'库内价',
-					invoice:'不开发票',
-					accept:'',
-					seller:'',
-					sellerPhone:'',
-					minSale:'',
-					province:'',
-					city:'',
-					area:'',
-					storeName:'',
-					exsitCount:0,
-					isFutures:'',
-					bankNameList:'',
-					Company:[],
-					goods:{},
-					companyId:'',
-					tradeCompanyId:'',
-					basis:0,
-					basisBig:0,
-					basisSmall:0,
-					invoiceMoney:0,
-					unloadingFee:0,
-					packingMoney:0,
-					packing:'散装',
-					packingFee:0
-				};
-			},
-			onLoad(options) {
-				this.id=options.id
-				this.purchaseOrder.planId=options.id
-				this.purchaseOrder.seller = options.seller
-				this.purchaseOrder.goodsName = options.goodsName
-				this.purchaseOrder.receivePrivate = options.receivePrivate
-				this.purchaseOrder.receiveCity = options.receiveCity
-				this.purchaseOrder.receiveArea = options.receiveArea
-				this.purchaseOrder.minimumVolume = options.minimumVolume
-				this.purchaseOrder.buyer = options.buyer
-				this.purchaseOrder.customer = options.customerName
-				this.purchaseOrder.basis = options.basisPrice
-				this.purchaseOrder.procurementPrice = options.procurementPrice
-				this.purchaseOrder.receiveWarehouse = options.receiveWarehouse
-				this.purchaseOrder.settlementPrice = options.basisPrice
-				this.purchaseOrder.procurementPlanType = options.procurementPlanType
-				this.purchaseOrder.procurementPlan=options.procurementPlan
-				this.purchaseOrder.compId=options.compId
-			},
-			computed: {
-				...mapState(['hasLogin','userInfo']),
-			},
-			onShow() {
-				this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo',{commonId:this.userInfo.id}).then(res => {
-					if(res.data.code==200){
-						this.goods=res.data.data
-						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.invoiceFee=-20
-							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)-Number(this.purchaseOrder.invoiceFee)
-						}else{
-							this.purchaseOrder.invoiceFee=0
-							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)-Number(this.purchaseOrder.invoiceFee)
-						}
+		data() {
+			return {
+				tradeInfo: {
+					salebuyId: 0,
+					packing: '',
+					memo: '',
+					buyer: '',
+					buyerPhone: '',
+					procurementPrice: 0,
+					address: '',
+					count: 0,
+					province: '',
+					area: '',
+					priceType: '',
+					invoiceType: '',
+					acceptType: '',
+					seller: '',
+					sellerPhone: '',
+					packingMoney: 0,
+					type: 0,
+					modalName: "",
+				},
+				purchaseOrder: {
+					invoiceFee: 0,
+					packingFee: null,
+					packingType: "散装",
+					packingTypeKey: 1,
+					type: '不开发票',
+					typeKey: 1
+				},
+				invoiceTypeIndex: 0,
+				invoiceTypeIndex1: 0,
+				acceptTypeIndex: 0,
+				priceTypeIndex: 0,
+				bankNameIndex: 0,
+				packingIndex: 0,
+				invoiceIndex: 0,
+				packingType: ['散粮', '大袋', '小袋'],
+				// invoiceType: ['不开发票', '普通发票', '增值税发票'],
+				invoiceType: ['不开发票', '增值税发票'],
+				acceptType: ['第三方检验(国家检验资质)', '交收地库或港出具的检验', '现场看货', '其他'],
+				priceType: ['库内价', '到库价', '到港价'],
+				priceTypeIndex1: '库内价',
+				region: [],
+				salebuyId: 0,
+				memo: '',
+				buyer: '',
+				buyerPhone: '',
+				procurementPrice: 0,
+				address: '',
+				count: 0,
+				id: 0,
+				price: '库内价',
+				invoice: '不开发票',
+				accept: '',
+				seller: '',
+				sellerPhone: '',
+				minSale: '',
+				province: '',
+				city: '',
+				area: '',
+				storeName: '',
+				exsitCount: 0,
+				isFutures: '',
+				bankNameList: '',
+				Company: [],
+				goods: {},
+				companyId: '',
+				tradeCompanyId: '',
+				basis: 0,
+				basisBig: 0,
+				basisSmall: 0,
+				invoiceMoney: 0,
+				unloadingFee: 0,
+				packingMoney: 0,
+				packing: '散装',
+				packingFee: 0
+			};
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.purchaseOrder.planId = options.id
+			this.purchaseOrder.seller = options.seller
+			this.purchaseOrder.goodsName = options.goodsName
+			this.purchaseOrder.receivePrivate = options.receivePrivate
+			this.purchaseOrder.receiveCity = options.receiveCity
+			this.purchaseOrder.receiveArea = options.receiveArea
+			this.purchaseOrder.minimumVolume = options.minimumVolume
+			this.purchaseOrder.buyer = options.buyer
+			this.purchaseOrder.customer = options.customerName
+			this.purchaseOrder.basis = options.basisPrice
+			this.purchaseOrder.procurementPrice = options.procurementPrice
+			this.purchaseOrder.receiveWarehouse = options.receiveWarehouse
+			this.purchaseOrder.settlementPrice = options.basisPrice
+			this.purchaseOrder.procurementPlanType = options.procurementPlanType
+			this.purchaseOrder.procurementPlan = options.procurementPlan
+			this.purchaseOrder.compId = options.compId
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		onShow() {
+			this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo', {
+				commonId: this.userInfo.id
+			}).then(res => {
+				if (res.data.code == 200) {
+					this.goods = res.data.data
+					if (this.goods.customerTypeFlag == 1) {
+						this.purchaseOrder.invoiceFee = -20
+						this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) - Number(this
+							.purchaseOrder.invoiceFee)
+					} else {
+						this.purchaseOrder.invoiceFee = 0
+						this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) - Number(this
+							.purchaseOrder.invoiceFee)
 					}
-					uni.hideLoading()
-				})
-			},
-			methods: {
-				liang(){
-					uni.navigateTo({
-						url: `/pageA/product/Identity_switching?goodsName=${this.purchaseOrder.goodsName}
+				}
+				uni.hideLoading()
+			})
+		},
+		methods: {
+			liang() {
+				uni.navigateTo({
+					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}&procurementPrice=${this.purchaseOrder.procurementPrice}
 						&receiveWarehouse=${this.purchaseOrder.receiveWarehouse}&procurementPlanType=${this.purchaseOrder.procurementPlanType}
 						&procurementPlanNo=${this.purchaseOrder.procurementPlan}`
-					})
-				},
-				commit(){
-					if(!this.purchaseOrder.transactionsNumber){
-						this.$api.msg('出售数量不能为空')
-						return
-					}
-					if(this.purchaseOrder.transactionsNumber>10000||this.purchaseOrder.transactionsNumber<1){
-						this.$api.msg('出售数量输入错误')
-						return
-					}
-					if(this.purchaseOrder.procurementPlanType=='期货'&&!this.purchaseOrder.pointPrice){
-						this.$api.msg('点价不能为空')
-						return
-					}
-					if(this.purchaseOrder.procurementPlanType=='期货'&&this.purchaseOrder.pointPrice>10000){
+				})
+			},
+			commit() {
+				if (!this.purchaseOrder.transactionsNumber) {
+					this.$api.msg('出售数量不能为空')
+					return
+				}
+				if (this.purchaseOrder.transactionsNumber > 10000 || this.purchaseOrder.transactionsNumber < 1) {
+					this.$api.msg('出售数量输入错误')
+					return
+				}
+				if (this.purchaseOrder.procurementPlanType == '期货' && !this.purchaseOrder.pointPrice) {
+					this.$api.msg('点价不能为空')
+					return
+				}
+				if (this.purchaseOrder.procurementPlanType == '期货' && this.purchaseOrder.pointPrice > 10000) {
+					this.$api.msg('点价输入错误')
+					return
+				}
+				if (this.purchaseOrder.procurementPlanType == '期货' && this.purchaseOrder.pointPrice.indexOf('.') != -1) {
+					if (this.purchaseOrder.pointPrice.split(".")[1].length > 2) {
 						this.$api.msg('点价输入错误')
 						return
 					}
-					if(this.purchaseOrder.procurementPlanType=='期货'&&this.purchaseOrder.pointPrice.indexOf('.')!=-1){
-						if(this.purchaseOrder.pointPrice.split(".")[1].length>2){
-							this.$api.msg('点价输入错误')
-							return
-						}
-					}
-					
-					this.purchaseOrder.packingFee=-this.packingFee
-					
-					if(this.purchaseOrder.packingFee>0||this.purchaseOrder.packingFee<-2000){
-						this.$api.msg('包装费输入错误')
-						return
-					}
-					if(!this.purchaseOrder.customer){
-						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.customer=this.goods.customerName
-						}else{
-							this.purchaseOrder.customer=this.goods.compName
-						}
+				}
+
+				this.purchaseOrder.packingFee = -this.packingFee
+
+				if (this.purchaseOrder.packingFee > 0 || this.purchaseOrder.packingFee < -2000) {
+					this.$api.msg('包装费输入错误')
+					return
+				}
+				if (!this.purchaseOrder.customer) {
+					if (this.goods.customerTypeFlag == 1) {
+						this.purchaseOrder.customer = this.goods.customerName
+					} else {
+						this.purchaseOrder.customer = this.goods.compName
 					}
-					if(!this.purchaseOrder.seller){
-						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.seller=this.goods.customerName
-							this.purchaseOrder.sellerPhone=this.goods.customerPhone
-						}else{
-							this.purchaseOrder.seller=this.goods.compName
-							this.purchaseOrder.sellerPhone=this.goods.customerPhone
-						}
+				}
+				if (!this.purchaseOrder.seller) {
+					if (this.goods.customerTypeFlag == 1) {
+						this.purchaseOrder.seller = this.goods.customerName
+						this.purchaseOrder.sellerPhone = this.goods.customerPhone
+					} else {
+						this.purchaseOrder.seller = this.goods.compName
+						this.purchaseOrder.sellerPhone = this.goods.customerPhone
 					}
-					var that=this
-					this.purchaseOrder.commonId=that.userInfo.id
-					this.purchaseOrder.pcFlag=0
-					if(this.purchaseOrder.procurementPlanType == "期货"){
+				}
+				var that = this
+				this.purchaseOrder.commonId = that.userInfo.id
+				this.purchaseOrder.pcFlag = 0
+				if (this.purchaseOrder.procurementPlanType == "期货") {
 					this.purchaseOrder.unitPrice = this.purchaseOrder.settlementPrice
-					}
-					uni.showModal({
-						content: '订单提交后将发送给买方,是否确定提交?',
-						success: function (res) {
-							if (res.confirm) {
-								that.$api.doRequest('post','/purchaseOrder/api/insertPurchaseOrder', that.purchaseOrder).then(res => {
-									if(res.data.code==200){
-										that.$api.doRequest('post','/purchaseOrder/api/submitPurchaseOrder', {id:res.data.data}).then(res1 => {
-											if(res1.data.code==200){
-												uni.showToast({
-													title: '提交成功,等待买方回复',
-													icon: 'none',
-													duration: 2000,
-													success() {
-														setTimeout(()=>{
-															uni.navigateBack({
-																delta:1
-															})
-														},2000)
-													}
-												})	
-											}else{
-												uni.showToast({
-													title: res.data.message,
-													icon: 'none',
-													duration: 2000
-												})
-											}
-										}).catch(res => {
+				}
+				uni.showModal({
+					content: '订单提交后将发送给买方,是否确定提交?',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/purchaseOrder/api/insertPurchaseOrder', that
+								.purchaseOrder).then(res => {
+								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: `/pageA/product/detail`
+											// })
+											uni.showToast({
+												title: '提交成功,等待买方回复',
+												icon: 'none',
+												duration: 2000,
+												success() {
+													uni.navigateBack(1)
+												}
+											})
+										} else {
 											uni.showToast({
 												title: res.data.message,
 												icon: 'none',
 												duration: 2000
 											})
-										})
-										// uni.navigateBack();
-									}else{
+										}
+									}).catch(res => {
 										uni.showToast({
-											title: '提交失败:'+res.data.message,
+											title: res.data.message,
 											icon: 'none',
 											duration: 2000
 										})
-									}
-								}).catch(res => {
-									if(res.errmsg){
-										uni.showToast({
-											title: res.errmsg,
-											icon: 'none',
-											duration: 2000
-										})
-									}
-									else{
-										uni.showToast({
-											title: "系统异常,请联系管理员",
-											icon: 'none',
-											duration: 2000
-										})
-									}
-								})
-							}
-						}
-					})
-				},
-				someprice(e){
-					
-					if(this.purchaseOrder.pointPrice&&this.purchaseOrder.invoiceFee&&this.packingFee){
-						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.pointPrice)+Number(this.purchaseOrder.invoiceFee)+Number(-this.packingFee)
-					}else if(this.purchaseOrder.pointPrice&&this.purchaseOrder.invoiceFee){
-						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.pointPrice)+Number(this.purchaseOrder.invoiceFee)
-					}else if(this.purchaseOrder.pointPrice&&this.packingFee){
-						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.pointPrice)+Number(-this.packingFee)
-					}else if(this.purchaseOrder.pointPrice){
-						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.pointPrice)
-					}else if(this.packingFee){
-						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(-this.packingFee)
-					}else if(this.purchaseOrder.invoiceFee){
-						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
-					}else{
-						this.purchaseOrder.settlementPrice=this.purchaseOrder.basis
-					}
-				},
-				bankNameChange(e){
-					this.bankNameIndex=e.detail.value
-					this.buyer =this.Company[e.detail.value].companyName
-					this.buyerPhone=this.Company[e.detail.value].companyPhone
-					this.tradeCompanyId=this.Company[e.detail.value].id
-				},
-				AcceptTypeChange(e) {
-					this.acceptTypeIndex = e.detail.value
-					this.accept = this.acceptType[this.acceptTypeIndex];
-				},
-				packingChange(e){
-					this.packingIndex = e.detail.value
-					this.purchaseOrder.packingTypeKey=e.detail.value+1
-					this.purchaseOrder.packingType = this.packingType[this.packingIndex];
-				},
-				invoiceChange(e){
-					this.invoiceIndex = e.detail.value
-					this.purchaseOrder.typeKey=e.detail.value+1
-					this.purchaseOrder.type = this.invoiceType[this.invoiceIndex];
-					if(this.invoiceIndex == 0){
-						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.invoiceFee=-20
-						}else{
-							this.purchaseOrder.invoiceFee=0
+									})
+									// uni.navigateBack();
+								} else {
+									uni.showToast({
+										title: '提交失败:' + res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								}
+							}).catch(res => {
+								if (res.errmsg) {
+									uni.showToast({
+										title: res.errmsg,
+										icon: 'none',
+										duration: 2000
+									})
+								} else {
+									uni.showToast({
+										title: "系统异常,请联系管理员",
+										icon: 'none',
+										duration: 2000
+									})
+								}
+							})
 						}
 					}
-					else{
-						this.purchaseOrder.invoiceFee=0
+				})
+			},
+			someprice(e) {
+
+				if (this.purchaseOrder.pointPrice && this.purchaseOrder.invoiceFee && this.packingFee) {
+					this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(this.purchaseOrder
+						.pointPrice) + Number(this.purchaseOrder.invoiceFee) + Number(-this.packingFee)
+				} else if (this.purchaseOrder.pointPrice && this.purchaseOrder.invoiceFee) {
+					this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(this.purchaseOrder
+						.pointPrice) + Number(this.purchaseOrder.invoiceFee)
+				} else if (this.purchaseOrder.pointPrice && this.packingFee) {
+					this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(this.purchaseOrder
+						.pointPrice) + Number(-this.packingFee)
+				} else if (this.purchaseOrder.pointPrice) {
+					this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(this.purchaseOrder
+						.pointPrice)
+				} else if (this.packingFee) {
+					this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(-this.packingFee)
+				} else if (this.purchaseOrder.invoiceFee) {
+					this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(this.purchaseOrder
+						.invoiceFee)
+				} else {
+					this.purchaseOrder.settlementPrice = this.purchaseOrder.basis
+				}
+			},
+			bankNameChange(e) {
+				this.bankNameIndex = e.detail.value
+				this.buyer = this.Company[e.detail.value].companyName
+				this.buyerPhone = this.Company[e.detail.value].companyPhone
+				this.tradeCompanyId = this.Company[e.detail.value].id
+			},
+			AcceptTypeChange(e) {
+				this.acceptTypeIndex = e.detail.value
+				this.accept = this.acceptType[this.acceptTypeIndex];
+			},
+			packingChange(e) {
+				this.packingIndex = e.detail.value
+				this.purchaseOrder.packingTypeKey = e.detail.value + 1
+				this.purchaseOrder.packingType = this.packingType[this.packingIndex];
+			},
+			invoiceChange(e) {
+				this.invoiceIndex = e.detail.value
+				this.purchaseOrder.typeKey = e.detail.value + 1
+				this.purchaseOrder.type = this.invoiceType[this.invoiceIndex];
+				if (this.invoiceIndex == 0) {
+					if (this.goods.customerTypeFlag == 1) {
+						this.purchaseOrder.invoiceFee = -20
+					} else {
+						this.purchaseOrder.invoiceFee = 0
 					}
-				},
-				changeZhihang(){
-					uni.navigateTo({
-						url: '/pageA/pages/newcompany'
-					})
-				},
-				PriceTypeChange(e) {
-					this.priceTypeIndex = e.detail.value
-					this.price = this.priceType[this.priceTypeIndex]
-				},
-				RegionChange(e) {
-					this.region = e.detail.value
-					this.province = this.region[0];
-					this.area = this.region[0]+this.region[1]+this.region[2];
-				},
-				textareaInput(e) {
-					this.memo = e.detail.value
-				},
-				buyerInput(e){
-					this.buyer = e.detail.value
-				},
-				buyerPhoneInput(e){
-					this.buyerPhone = e.detail.value
-				},
-				addressInput(e){
-					this.address = e.detail.value
-				},
-				countInput(e){
-					this.count = e.detail.value
-				},
-			}
+				} else {
+					this.purchaseOrder.invoiceFee = 0
+				}
+			},
+			changeZhihang() {
+				uni.navigateTo({
+					url: '/pageA/pages/newcompany'
+				})
+			},
+			PriceTypeChange(e) {
+				this.priceTypeIndex = e.detail.value
+				this.price = this.priceType[this.priceTypeIndex]
+			},
+			RegionChange(e) {
+				this.region = e.detail.value
+				this.province = this.region[0];
+				this.area = this.region[0] + this.region[1] + this.region[2];
+			},
+			textareaInput(e) {
+				this.memo = e.detail.value
+			},
+			buyerInput(e) {
+				this.buyer = e.detail.value
+			},
+			buyerPhoneInput(e) {
+				this.buyerPhone = e.detail.value
+			},
+			addressInput(e) {
+				this.address = e.detail.value
+			},
+			countInput(e) {
+				this.count = e.detail.value
+			},
 		}
+	}
 </script>
 
 <style scoped>
@@ -454,70 +477,82 @@
 		padding: 10px 20px;
 		background-color: #F5F6FA;
 	}
+
 	.cu-form-group input {
 		text-align: right;
 	}
+
 	.cu-form-group textarea {
 		text-align: right;
 	}
-	.margin-bottom{
-		margin-bottom:30px;
+
+	.margin-bottom {
+		margin-bottom: 30px;
 	}
+
 	.c-row {
-	    display: -webkit-box;
-	    display: -webkit-flex;
-	    display: flex;
-	    -webkit-box-align: center;
-	    -webkit-align-items: center;
-	    align-items: center;
-	    padding: 20rpx 30rpx;
-	    position: relative;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
 	}
+
 	.con-list {
-	    -webkit-box-flex: 1;
-	    -webkit-flex: 1;
-	    flex: 1;
-	    display: -webkit-box;
-	    display: -webkit-flex;
-	    display: flex;
-	    -webkit-box-orient: vertical;
-	    -webkit-box-direction: normal;
-	    -webkit-flex-direction: column;
-	    flex-direction: column;
-	    color: #303133;
-	    line-height: 40rpx;
-	    text-align: right;
-	    padding-right: 20rpx;
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
 	}
-	.transaction{
+
+	.transaction {
 		background-color: #FFFFFF;
 		margin-top: 10px;
 		padding-bottom: 10px;
 		border-radius: 20px;
 	}
-	.btn{
+
+	.btn {
 		width: 100%;
 		background-color: #22C572;
 		border-radius: 20px;
 		margin-top: 10px;
+		color: white;
 	}
-	.textareas{
+
+	.textareas {
 		width: 95%;
 		background-color: #F9F9FA;
 		padding: 10px 20px 0px 20px;
 		border-radius: 10px;
 	}
-	.beizhu{
+
+	.beizhu {
 		margin-left: 15px;
 		margin-bottom: 20px;
 		/* margin: 10px; */
 		margin-top: 10px;
 	}
-	.titles{
+
+	.titles {
 		margin-left: 20px;
 		margin-top: 10px;
 	}
-	.textA{
+
+	.textA {
 		margin-left: 20px;
 		color: #AFB3BF;
 		font-size: 10px;

+ 20 - 10
pageA/product/business_sale.vue

@@ -74,7 +74,7 @@
 		<view  class="c-row b-b">
 			<view class="title">采购数量(吨)</view>
 			<view class="con-list">
-			<input v-model='purchaseOrder.transactionsNumber' placeholder="请填写采购数量" name="input"></input>
+			<input v-model='purchaseOrder.transactionsNumber' type="number" placeholder-style="font-size: 12px;" placeholder="请填写采购数量" name="input"></input>
 			</view>
 		</view>
 		<view  class="c-row b-b">
@@ -90,25 +90,25 @@
 		<view v-if='purchaseOrder.packingType =="大袋" || purchaseOrder.packingType =="小袋"' class="beizhu align-start">
 			<view class="title">袋装备注</view>
 			<view >
-			<textarea maxlength="-1" v-model='purchaseOrder.baggingNotes' placeholder="请填写包装规格、质量、包装物要求。例:50kg袋装、大粒、彩包" class="textareas"></textarea>
+			<textarea maxlength="-1" v-model='purchaseOrder.baggingNotes' placeholder-style="font-size: 12px;" placeholder="请填写包装规格、质量、包装物要求。例:50kg袋装、大粒、彩包" class="textareas"></textarea>
 			</view>
 		</view>
 		<view  v-if="purchaseOrder.salePlanType=='期货'" class="c-row b-b align-start">
 			<view class="title">点价(元/吨)</view>
 			<view class="con-list">
-			<input placeholder="请填写点价" name="input" @input='someprice' v-model="purchaseOrder.pointPrice"></input>
+			<input placeholder="请填写点价"  type="number" placeholder-style="font-size: 12px;" name="input" @input='someprice' v-model="purchaseOrder.pointPrice"></input>
 			</view>
 		</view>
 		<view  v-if="purchaseOrder.salePlanType=='期货'" class="c-row b-b align-start">
 			<view class="title">发票费用(元/吨)</view>
 			<view class="con-list">
-			<input disabled placeholder="请填写发票费用" name="input" @input='someprice' v-model="purchaseOrder.invoiceFee"></input>
+			<input disabled placeholder="请填写发票费用" placeholder-style="font-size: 12px;" name="input" @input='someprice' v-model="purchaseOrder.invoiceFee"></input>
 			</view>
 		</view>
 		<view  v-if="purchaseOrder.salePlanType=='期货'" class="c-row b-b align-start">
 			<view class="title">包装费(元/吨)</view>
 			<view class="con-list">
-		<input placeholder="请填写包装费" name="input" @input='someprice' v-model="purchaseOrder.packingFee"></input>
+		<input placeholder="请填写包装费" name="input" type="number" placeholder-style="font-size: 12px;" @input='someprice' v-model="purchaseOrder.packingFee"></input>
 		</view>
 		</view>
 		<view  v-if="purchaseOrder.salePlanType=='期货'" class=" align-start ">
@@ -321,12 +321,21 @@
 										uni.showToast({
 											title: '提交成功,等待卖方回复',
 											icon: 'none',
-											duration: 2000
-										})
-										uni.navigateTo({
-											url: `/pages/business/business`
+											duration: 2000,
+											success() {
+												uni.showToast({
+													title: '提交成功,等待买方回复',
+													icon: 'none',
+													duration: 2000,
+													success() {
+														uni.navigateBack(1)
+													}
+												})
+											}
 										})
-										// uni.navigateBack();
+										// uni.navigateTo({
+										// 	url: `/pages/business/business`
+										// })
 									}else{
 										uni.showToast({
 											title: '提交失败:'+res.data.message,
@@ -443,6 +452,7 @@
 		background-color: #22C572;
 		border-radius: 20px;
 		margin-top: 10px;
+		color: white;
 	}
 	.textareas{
 		width: 260px;

+ 26 - 11
pageA/product/detail.vue

@@ -129,67 +129,67 @@
 				<text>货物要求</text>
 			</view>
 			<view class="c-list">
-				<view class="c-row">
+				<view class="c-row"  v-if="goods.waterContent!=null">
 					<text class="tit">水分(%){{'<='}} </text>
 					<view class="con-list">
 						<text>{{goods.waterContent}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.bulkDensity!=null">
 					<text class="tit">容重(g/L){{'>='}}</text>
 					<view class="con-list">
 						<text>{{goods.bulkDensity}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.jiaorenli!=null">
 					<text class="tit">热损伤(%){{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.jiaorenli}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.impurity!=null">
 					<text class="tit">杂质(%){{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.impurity}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.mildewGrain!=null">
 					<text class="tit">霉变粒(%){{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.mildewGrain}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.imperfectGrain!=null">
 					<text class="tit">不完善粒(%){{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.imperfectGrain}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.protein!=null">
 					<text class="tit">蛋白(%){{'>='}} </text>
 					<view class="con-list">
 						<text>{{goods.protein}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.grain!=null">
 					<text class="tit">粒型</text>
 					<view class="con-list">
 						<text>{{goods.grain}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.grade!=null">
 					<text class="tit">品级</text>
 					<view class="con-list">
 						<text>{{goods.grade}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.outputPrivate!=null">
 					<text class="tit">产地</text>
 					<view class="con-list">
 						<text>{{goods.outputPrivate}}{{goods.outputCity}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.outputYear!=null">
 					<text class="tit">产出年份</text>
 					<view class="con-list">
 						<text>{{goods.outputYear}}</text>
@@ -495,6 +495,21 @@
 				uni.navigateBack();
 			},
 			tradeNow(){
+					uni.showModal({
+						title: '立即发车',
+						content: '是否立即发车?',
+						showCancel: true,
+						confirmText: '确认',
+						success: (e) => {
+							if (e.confirm) {
+								uni.navigateTo({
+									url: '../freightTransport/addsendgoods'
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					})
 				// this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo',{commonId:options.id}).then(res => {
 				// 	uni.hideLoading()
 				// 	this.goods=res.data.data

+ 11 - 11
pageA/product/sales_detail.vue

@@ -129,67 +129,67 @@
 				<text>货物要求</text>
 			</view>
 			<view class="c-list">
-				<view class="c-row">
+				<view class="c-row" v-if="goods.waterContent!=null">
 					<text class="tit">水分(%){{'<='}} </text>
 					<view class="con-list">
 						<text>{{goods.waterContent}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.bulkDensity!=null">
 					<text class="tit">容重(g/L){{'>='}}</text>
 					<view class="con-list">
 						<text>{{goods.bulkDensity}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.jiaorenli!=null">
 					<text class="tit">热损伤(%){{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.jiaorenli}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.impurity!=null">
 					<text class="tit">杂质(%){{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.impurity}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.mildewGrain!=null">
 					<text class="tit">霉变粒(%){{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.mildewGrain}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.imperfectGrain!=null">
 					<text class="tit">不完善粒(%){{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.imperfectGrain}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.protein!=null">
 					<text class="tit">蛋白(%){{'>='}} </text>
 					<view class="con-list">
 						<text>{{goods.protein}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.grain!=null">
 					<text class="tit">粒型</text>
 					<view class="con-list">
 						<text>{{goods.grain}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.grade!=null">
 					<text class="tit">品级</text>
 					<view class="con-list">
 						<text>{{goods.grade}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.outputPrivate!=null||goods.outputCity!=null">
 					<text class="tit">产地</text>
 					<view class="con-list">
 						<text>{{goods.outputPrivate}}{{goods.outputCity}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.outputYear!=null">
 					<text class="tit">产出年份</text>
 					<view class="con-list">
 						<text>{{goods.outputYear}}</text>

+ 4 - 0
pageB/contract/contract.vue

@@ -172,6 +172,10 @@
 		onLoad() {
 			this.getList()
 		},
+		onPullDownRefresh() {
+			this.getList()
+			uni.stopPullDownRefresh()
+		},
 		methods: {
 			amendprice() {
 				this.$api.doRequest('post', '/purchaseOrder/api/pointPrice', {

+ 1 - 0
pageD/identity/companyIdentity.vue

@@ -345,6 +345,7 @@
 
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 
 	.switchs1 {

+ 10 - 10
pageD/identity/companyIdentityEdit.vue

@@ -264,9 +264,9 @@
 				},
 				license() {
 					var that = this
-					wx.chooseImage({
+					uni.chooseImage({
 						success: function(res) {
-							wx.uploadFile({
+							uni.uploadFile({
 								url: 'https://www.zthymaoyi.com/upload/admin',
 								filePath: res.tempFilePaths[0],
 								name: 'file',
@@ -282,9 +282,9 @@
 				},
 				idUp(){
 					var that = this
-					wx.chooseImage({
+					uni.chooseImage({
 						success: function(res) {
-							wx.uploadFile({
+							uni.uploadFile({
 								url: 'https://www.zthymaoyi.com/upload/admin',
 								filePath: res.tempFilePaths[0],
 								name: 'file',
@@ -300,9 +300,9 @@
 				},
 				idLow(){
 					var that = this
-					wx.chooseImage({
+					uni.chooseImage({
 						success: function(res) {
-							wx.uploadFile({
+							uni.uploadFile({
 								url: 'https://www.zthymaoyi.com/upload/admin',
 								filePath: res.tempFilePaths[0],
 								name: 'file',
@@ -318,9 +318,9 @@
 				},
 				bankUp(){
 					var that = this
-					wx.chooseImage({
+					uni.chooseImage({
 						success: function(res) {
-							wx.uploadFile({
+							uni.uploadFile({
 								url: 'https://www.zthymaoyi.com/upload/admin',
 								filePath: res.tempFilePaths[0],
 								name: 'file',
@@ -336,9 +336,9 @@
 				},
 				bankLow(){
 					var that = this
-					wx.chooseImage({
+					uni.chooseImage({
 						success: function(res) {
-							wx.uploadFile({
+							uni.uploadFile({
 								url: 'https://www.zthymaoyi.com/upload/admin',
 								filePath: res.tempFilePaths[0],
 								name: 'file',

+ 4 - 4
pageD/identity/companyIdentityThree.vue

@@ -139,9 +139,9 @@
 			},
 			bankUp() {
 				var that = this
-				wx.chooseImage({
+				uni.chooseImage({
 					success: function(res) {
-						wx.uploadFile({
+						uni.uploadFile({
 							url: 'https://www.zthymaoyi.com/upload/admin',
 							filePath: res.tempFilePaths[0],
 							name: 'file',
@@ -183,9 +183,9 @@
 			},
 			bankLow() {
 				var that = this
-				wx.chooseImage({
+				uni.chooseImage({
 					success: function(res) {
-						wx.uploadFile({
+						uni.uploadFile({
 							url: 'https://www.zthymaoyi.com/upload/admin',
 							filePath: res.tempFilePaths[0],
 							name: 'file',

+ 4 - 4
pageD/identity/companyIdentityTwo.vue

@@ -95,9 +95,9 @@
 			},
 			idUp(){
 				var that = this
-				wx.chooseImage({
+				uni.chooseImage({
 					success: function(res) {
-						wx.uploadFile({
+						uni.uploadFile({
 							url: 'https://www.zthymaoyi.com/upload/admin',
 							filePath: res.tempFilePaths[0],
 							name: 'file',
@@ -133,9 +133,9 @@
 			},
 			idLow(){
 				var that = this
-				wx.chooseImage({
+				uni.chooseImage({
 					success: function(res) {
-						wx.uploadFile({
+						uni.uploadFile({
 							url: 'https://www.zthymaoyi.com/upload/admin',
 							filePath: res.tempFilePaths[0],
 							name: 'file',

+ 4 - 4
pageD/identity/driverIdentity.vue

@@ -259,9 +259,9 @@
 			},
 			idUp() {
 				var that = this
-				wx.chooseImage({
+				uni.chooseImage({
 					success: function(res) {
-						wx.uploadFile({
+						uni.uploadFile({
 							url: 'https://www.zthymaoyi.com/upload/admin',
 							filePath: res.tempFilePaths[0],
 							name: 'file',
@@ -297,9 +297,9 @@
 			},
 			idLow() {
 				var that = this
-				wx.chooseImage({
+				uni.chooseImage({
 					success: function(res) {
-						wx.uploadFile({
+						uni.uploadFile({
 							url: 'https://www.zthymaoyi.com/upload/admin',
 							filePath: res.tempFilePaths[0],
 							name: 'file',

+ 22 - 22
pageD/identity/driverIdentityEdit.vue

@@ -440,9 +440,9 @@
 			bankimgs(items) {
 				console.log(items)
 				var that = this
-				wx.chooseImage({
+				uni.chooseImage({
 					success: function(res) {
-						wx.uploadFile({
+						uni.uploadFile({
 							url: 'https://www.zthymaoyi.com/upload/admin',
 							filePath: res.tempFilePaths[0],
 							name: 'file',
@@ -476,9 +476,9 @@
 			},
 			idUp() {
 				var that = this
-				wx.chooseImage({
+				uni.chooseImage({
 					success: function(res) {
-						wx.uploadFile({
+						uni.uploadFile({
 							url: 'https://www.zthymaoyi.com/upload/admin',
 							filePath: res.tempFilePaths[0],
 							name: 'file',
@@ -494,9 +494,9 @@
 			},
 			idLow() {
 				var that = this
-				wx.chooseImage({
+				uni.chooseImage({
 					success: function(res) {
-						wx.uploadFile({
+						uni.uploadFile({
 							url: 'https://www.zthymaoyi.com/upload/admin',
 							filePath: res.tempFilePaths[0],
 							name: 'file',
@@ -512,9 +512,9 @@
 			},
 			travel() {
 				var that = this
-				wx.chooseImage({
+				uni.chooseImage({
 					success: function(res) {
-						wx.uploadFile({
+						uni.uploadFile({
 							url: 'https://www.zthymaoyi.com/upload/admin',
 							filePath: res.tempFilePaths[0],
 							name: 'file',
@@ -529,36 +529,36 @@
 					}
 				})
 			},
-			drive() {
+			drive(){
 				var that = this
-				wx.chooseImage({
+				uni.chooseImage({
 					success: function(res) {
-						wx.uploadFile({
+						uni.uploadFile({
 							url: 'https://www.zthymaoyi.com/upload/admin',
 							filePath: res.tempFilePaths[0],
 							name: 'file',
 							success(res) {
 								var data = res.data
-								var strToObj = JSON.parse(data)
+								var strToObj = JSON.parse(data)			
 								that.drives = strToObj.url
 								that.addressUrl[1] = strToObj.url
-								console.log(that.addressUrl)
+									console.log(that.addressUrl)
 							}
 						})
 					}
 				})
 			},
-			operate() {
+			operate(){
 				var that = this
-				wx.chooseImage({
+				uni.chooseImage({
 					success: function(res) {
-						wx.uploadFile({
+						uni.uploadFile({
 							url: 'https://www.zthymaoyi.com/upload/admin',
 							filePath: res.tempFilePaths[0],
 							name: 'file',
 							success(res) {
 								var data = res.data
-								var strToObj = JSON.parse(data)
+								var strToObj = JSON.parse(data)			
 								that.operates = strToObj.url
 								that.addressUrl[2] = strToObj.url
 								console.log(that.addressUrl)
@@ -567,23 +567,23 @@
 					}
 				})
 			},
-			practice() {
+			practice(){
 				var that = this
-				wx.chooseImage({
+				uni.chooseImage({
 					success: function(res) {
-						wx.uploadFile({
+						uni.uploadFile({
 							url: 'https://www.zthymaoyi.com/upload/admin',
 							filePath: res.tempFilePaths[0],
 							name: 'file',
 							success(res) {
 								var data = res.data
-								var strToObj = JSON.parse(data)
+								var strToObj = JSON.parse(data)			
 								that.practices = strToObj.url
 								that.addressUrl[3] = strToObj.url
 								console.log(that.addressUrl)
 							}
 						})
-					}
+					},
 				})
 			},
 			getcode() {

+ 10 - 8
pageD/identity/driverIdentityThree.vue

@@ -281,9 +281,9 @@
 					},
 					travel() {
 						var that = this
-						wx.chooseImage({
+						uni.chooseImage({
 							success: function(res) {
-								wx.uploadFile({
+								uni.uploadFile({
 									url: 'https://www.zthymaoyi.com/upload/admin',
 									filePath: res.tempFilePaths[0],
 									name: 'file',
@@ -300,9 +300,9 @@
 					},
 					drive() {
 						var that = this
-						wx.chooseImage({
+						uni.chooseImage({
 							success: function(res) {
-								wx.uploadFile({
+								uni.uploadFile({
 									url: 'https://www.zthymaoyi.com/upload/admin',
 									filePath: res.tempFilePaths[0],
 									name: 'file',
@@ -319,9 +319,9 @@
 					},
 					practice() {
 						var that = this
-						wx.chooseImage({
+						uni.chooseImage({
 							success: function(res) {
-								wx.uploadFile({
+								uni.uploadFile({
 									url: 'https://www.zthymaoyi.com/upload/admin',
 									filePath: res.tempFilePaths[0],
 									name: 'file',
@@ -338,9 +338,9 @@
 					},
 					operate() {
 						var that = this
-						wx.chooseImage({
+						uni.chooseImage({
 							success: function(res) {
-								wx.uploadFile({
+								uni.uploadFile({
 									url: 'https://www.zthymaoyi.com/upload/admin',
 									filePath: res.tempFilePaths[0],
 									name: 'file',
@@ -384,6 +384,8 @@
 
 	.btns {
 		background-color: #22C572;
+		margin-bottom: 30rpx;
+		color: white;
 	}
 
 	.words {

+ 2 - 2
pageD/identity/driverIdentityTwo.vue

@@ -250,9 +250,9 @@
 			},
 			bankimgs(items) {
 				var that = this
-				wx.chooseImage({
+				uni.chooseImage({
 					success: function(res) {
-						wx.uploadFile({
+						uni.uploadFile({
 							url: 'https://www.zthymaoyi.com/upload/admin',
 							filePath: res.tempFilePaths[0],
 							name: 'file',

+ 2 - 2
pages/attestation/index.vue

@@ -24,7 +24,7 @@
 			<image src="../../static/img/authentication/siji@3x.png" class="portrait1"></image>
 		</view>
 		
-		 <view class="homePage2">
+		 <!-- <view class="homePage2">
 			<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
 			<view class="title">
 				粮农身份
@@ -33,7 +33,7 @@
 				<view style="margin-right: 30px;">{{changes}}</view>
 			</view>
 			<image src="../../static/img/authentication/farmer@2x.png" class="portrait1"></image>
-		</view> 
+		</view> -->
 	</view>
 </template>
 

+ 2 - 2
pages/public/login_account_number.vue

@@ -17,7 +17,7 @@
 			</view>
 			<button :class='phone!=""&&password!=""?"active":""' @click='passlogin' class='verificationCode'>登录</button>
 			<view class='flex' style='color:#6A6A6A;margin-top:10px;'>
-				<view style='flex:1;text-align:center;border-right:1px solid #E8E9ED;'>忘记密码</view>
+				<view style='flex:1;text-align:center;border-right:1px solid #E8E9ED;' @click="forgetpass()">忘记密码</view>
 				<view @click='gocode' style='flex:1;text-align:center;'>验证码登录</view>
 			</view>
 		    <button @click='goregister' class='register'>手机号一键注册</button>
@@ -54,7 +54,7 @@
 					gender:'',
 					phone:''
 				},
-				type:'text',
+				type:'password',
 				inputStatus:'none',
 				verifyCode:null,
 				sendText:'获取验证码',

+ 2 - 2
pages/release/release.vue

@@ -28,8 +28,8 @@
 				<hr style="margin: 16px 0; color: #EEEEEE;">
 				<view class="flex" style="right: 10px;">
 					<view @click='edit(item)' v-if='item.status!="待审核"' class='anniu'>编辑</view>
-					<view class='anniu' @click="switch1(item)" v-if='item.showFlag == 0&&item.status!="待审核"'>显示</view>
-					<view class='anniu' @click="switch1(item)" v-if='item.showFlag == 1&&item.status!="待审核"'>隐藏</view>
+					<!-- <view class='anniu' @click="switch1(item)" v-if='item.showFlag == 0&&item.status!="待审核"'>显示</view> -->
+					<!-- <view class='anniu' @click="switch1(item)" v-if='item.showFlag == 1&&item.status!="待审核"'>隐藏</view> -->
 					<view class='anniu' @click="deleteRelease(item)">删除</view>
 				</view>
 			</view>

+ 7 - 2
pages/user/user.vue

@@ -19,7 +19,7 @@
 			<image v-bind:src="headUrl" class="headPortrait"></image>
 			<view class="personal">
 				<view @click="toLogin" class="information">{{hasLogin? username : '立即登录' }}</view>
-				<view class="information">{{userphone}}</view>
+				<view class="information">{{starUserphone}}</view>
 			</view>
 
 		</view>
@@ -257,7 +257,12 @@
 		},
 		// #endif
 		computed: {
-			...mapState(['hasLogin', 'userInfo'])
+			...mapState(['hasLogin', 'userInfo']),
+			// 手机号中间4位加*
+			starUserphone(){
+				let reg = /^(\d{3})\d{4}(\d{4})$/;
+				return this.userphone.replace(reg, "$1****$2");
+			}
 		},
 		onShow() {
 			uni.showTabBar()

+ 13 - 9
websocket_sdk.js

@@ -138,15 +138,19 @@ export default class Websocket {
                         console.log('网络已断开');
                         _this._netWork = false;
                         // 网络断开后显示model
-                        uni.showModal({
-                            title: '网络错误',
-                            content: '请重新打开网络',
-                            success: function(res) {
-                                if (res.confirm) {
-                                    console.log('用户点击确定')
-                                }
-                            }
-                        })
+                        // uni.showModal({
+                        //     title: '网络错误',
+                        //     content: '请重新打开网络',
+                        //     success: function(res) {
+                        //         if (res.confirm) {
+                        //             console.log('用户点击确定')
+                        //         }
+                        //     }
+                        // })
+						uni.showToast({
+							title: "网络错误 请重新打开网络",
+							icon: 'none'
+						})
                     }
                 }
             })