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

# Conflicts:
#	config/index.js

config/index.js

@@ -1,5 +1,5 @@
 const dev = {
-	// baseUrl: 'http://192.168.1.122:8080/',
+<<<<<<< HEAD
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrlNew: 'http://192.168.1.122:9100/',
 	baseUrlNew: 'http://api.eliangeyun.com/',

pageA/product/business_buy.vue

@@ -1,13 +1,12 @@
 <template>
-	<view class="center">
+	<view class="center Regular">
 		<view class="transaction">
-
-
 			<view class="c-row b-b">
 				<view class="title">卖方</view>
-				<view class="con-list">
+				<view class="con-list Medium">
 					<view v-if='goods.customerTypeFlag==2' class="title" @click="liang">
-						{{purchaseOrder.compName?purchaseOrder.compName:goods.compName}}&nbsp>
+						{{purchaseOrder.compName?purchaseOrder.compName:goods.compName}}
+						<u-icon name="arrow-right" color="#AFB3BF" :custom-style="{'marginLeft':'10px','marginRight':'0px'}" ></u-icon>
 					</view>
 					<view v-else class="title" @click="liang">
 						{{purchaseOrder.customer?purchaseOrder.customer:goods.customerName}}>
@@ -17,7 +16,7 @@
 			<view class="c-row">
 				<view class="title">买方</view>
 				<view class="con-list">
-					<view class="title">{{purchaseOrder.buyer}}</view>
+					<view class="title Medium">{{purchaseOrder.buyer}}</view>
 				</view>
 			</view>
 		</view>
@@ -25,7 +24,7 @@
 			<view class="c-row b-b margin-top">
 				<view class="title">收货地区</view>
 				<view class="con-list">
-					<view class="title">
+					<view class="title Medium">
 						{{purchaseOrder.receivePrivate}}{{purchaseOrder.receiveCity}}{{purchaseOrder.receiveArea}}
 					</view>
 				</view>
@@ -33,26 +32,26 @@
 			<view class="c-row b-b ">
 				<view class="title">收货库</view>
 				<view class="con-list">
-					<view class="title">{{purchaseOrder.receiveWarehouse}}</view>
+					<view class="title Medium">{{purchaseOrder.receiveWarehouse}}</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>
+					<text class="Medium">{{purchaseOrder.goodsName}}</text>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<view class="title">最小成交量（吨）</view>
 				<view class="con-list">
-					<text>{{purchaseOrder.minimumVolume}}</text>
+					<text class="NumberMedium">{{purchaseOrder.minimumVolume}}</text>
 				</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>
+						<text class="NumberMedium">{{purchaseOrder.basis}}</text>
 					</view>
 				</view>
 			</view>
@@ -61,7 +60,7 @@
 				<view class="title">采购单价（元/吨）</view>
 				<view class="con-list">
 					<view class="picker">
-						<text>{{purchaseOrder.procurementPrice}}</text>
+						<text class="NumberMedium">{{purchaseOrder.procurementPrice}}</text>
 					</view>
 				</view>
 			</view>
@@ -69,66 +68,70 @@
 		<view class="transaction">
 			<view class="c-row b-b margin-top">
 				<view class="title">发票类型</view>
-				<view class="con-list">
+				<view class="con-list Medium">
 					<picker @change="invoiceChange" :value="invoiceIndex" :range="invoiceType">
 						<view class="picker">
 							{{invoiceIndex>-1?invoiceType[invoiceIndex]:'请选择'}}
 						</view>
 					</picker>
 				</view>
+				<u-icon name="arrow-right" color="#AFB3BF" :custom-style="{'marginLeft':'10px','marginRight':'0px'}" ></u-icon>
 			</view>
 			<view class="c-row b-b">
 				<view class="title">出售数量（吨）</view>
-				<view class="con-list">
+				<view class="con-list NumberMedium">
 					<input v-model='purchaseOrder.transactionsNumber' type="number" placeholder="请填写出售数量"
 						placeholder-style="font-size: 12px;" name="input"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<view class="title">包装方式</view>
-				<view class="con-list">
+				<view class="con-list Medium">
 					<picker @change="packingChange" :value="packingIndex" :range="packingType">
 						<view class="picker">
 							{{packingIndex>-1?packingType[packingIndex]:'请选择'}}
 						</view>
 					</picker>
 				</view>
+				<u-icon name="arrow-right" color="#AFB3BF" :custom-style="{'marginLeft':'10px','marginRight':'0px'}" ></u-icon>
 			</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>
+						class="textareas Medium"></textarea>
 				</view>
 			</view>
 			<view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
 				<view class="title">点价（元/吨）</view>
-				<view class="con-list">
+				<view class="con-list NumberMedium">
 					<input placeholder="请填写点价" name="input" type="number" placeholder-style="font-size: 12px;"
 						@input='someprice' v-model="purchaseOrder.pointPrice"></input>
 				</view>
 			</view>
 			<view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
 				<view class="title">发票费用（元/吨）</view>
-				<view class="con-list">
+				<view class="con-list NumberMedium">
 					<input disabled placeholder="请填写发票费用" name="input" @input='someprice'
 						v-model="purchaseOrder.invoiceFee"></input>
 				</view>
 			</view>
-			<!-- <view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
+			<view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
 				<view class="title">包装费（元/吨）</view>
-				<view class="con-list">
+				<view class="con-list NumberMedium">
 					<input placeholder="请填写包装费" name="input" placeholder-style="font-size: 12px;" @input='someprice' v-model="packingFee"></input>
 					
 				</view>
-			</view> -->
+			</view>
 			<view v-if="purchaseOrder.procurementPlanType=='期货'" class=" align-start ">
 				<view class="titles">结算价格</view>
-				<!-- <text class="textA">结算价格=点价+基差+发票费用+包装费</text> -->
-				<text class="textA">结算价格=点价+基差+发票费用</text>
-				<text
-					style="font-size: 18px;color: #FD714F;margin-left: 25px;">￥{{purchaseOrder.settlementPrice}}</text>
+				<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
+				<text style="color:#FD714F;margin-left: 25px;">
+					<text  style="font-size:26rpx;">￥</text>
+					<text style="font-size:42rpx;" class="NumberMedium">{{purchaseOrder.settlementPrice}}</text>
+				</text>
+				
 				<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
 			</view>
 		</view>
@@ -310,12 +313,12 @@
 					}
 				}
 
-				// this.purchaseOrder.packingFee = -Math.abs(packingFee)
+				this.purchaseOrder.packingFee = -this.packingFee
 
-				// if (this.purchaseOrder.packingFee > 0 || this.purchaseOrder.packingFee < -2000) {
-				// 	this.$api.msg('包装费输入错误')
-				// 	return
-				// }
+				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
@@ -531,14 +534,13 @@
 		color: #303133;
 		line-height: 40rpx;
 		text-align: right;
-		padding-right: 20rpx;
 	}
 
 	.transaction {
 		background-color: #FFFFFF;
 		margin-top: 10px;
 		padding-bottom: 10px;
-		border-radius: 20px;
+		border-radius: 20rpx;
 	}
 
 	.btn {

pageA/product/lookup.vue

@@ -6,10 +6,10 @@
 				<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
 				<input type="text" maxlength="20" :focus="true" v-model="searchKeyWord" @confirm="doSearch()"
 					@input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
-
 			</view>
 			<view @click='doSearch()' class="Regular" style="width:4%;flex:1;">搜索</view>
-			<text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text>
+			<u-icon @click='emptysearch' class="cuIcon" v-if='searchKeyWord.length>0' size="34" name="close-circle-fill" color="#D6D9E0"></u-icon>
+			<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
 		</view>
 		<!-- mSearch组件 如果使用原样式，删除组件元素-->
 		<!-- <mSearch class="mSearch-input-box" :mode="2" button="inside" :placeholder="defaultKeyword" @search="doSearch(false)" @input="inputChange" @confirm="doSearch(false)" v-model="keyword"></mSearch> -->
@@ -748,7 +748,7 @@
 		color: #6b6b6b;
 	}
 
-	.cuIcon-roundclosefill {
+	.cuIcon {
 		position: absolute;
 		right: 80px;
 	}

pages/public/login_account_number.vue

@@ -11,7 +11,7 @@
 					<u-input class="phone-number" :custom-style='{"fontSize":"16px"}'  maxlength='11' v-model='phone' placeholder="请输入手机号码" type="number"/>
 					<!-- <input style='padding-left:10px;' maxlength='11' v-model='phone' placeholder="请输入手机号码" type="number"> -->
 					</view>
-			<image v-if='phone!=""' @click='phone=""' class='close' src='../../static/img/login/guanbi@2x.png'></image>
+			<!-- <image v-if='phone!=""' @click='phone=""' class='close' src='../../static/img/login/guanbi@2x.png'></image> -->
 			</view>
 			<view style='margin-top:20px;border-bottom:1px solid #E8E9ED;position:relative;'>
 				<u-input class='password' style='height:40px;' :custom-style='{"fontSize":"16px"}' v-model='password' placeholder="请输入密码，6-16位字符" :type="type" value="" />