采购

hdApp/src/components/module/app-cg-commodity.vue

@@ -6,7 +6,15 @@
 		<view class="cmd-info_bx">
 			<view class="tit" >{{ info.name || "" }}</view>
 			<view class="kc num-open_bx flex-end">
-				<view class="price csss">￥{{ parseFloat(info.price) }}</view>
+
+				<view class="price" style="position:absolute;top:60upx;color:#333333;">￥{{ parseFloat(info.price) }}</view>
+				<view style="position:absolute;top:15upx;left:0upx;color:#DDDDDD;">
+					<view class="kc">
+					<block v-if="info.ratioType == 0">{{info.ratio}}{{ info.smallUnit }}/{{info.bigUnit}}</block>
+					<block v-else>若干{{ info.smallUnit }}/{{info.bigUnit}}</block>
+					</view>
+				</view>
+
 				<view style="text-align: right;margin-right:20upx;" >
 					<view class="open-bx" >
 						<i class="iconfont iconjian" @click.stop="delItemFn()" v-if="bigCount > 0 || smallCount > 0"></i>
@@ -19,6 +27,7 @@
 					<text v-if="Number(info.stock) > Number(info.stockWarning)" style="padding-right: 55upx">还剩 {{ parseFloat(info.stock) }}</text>
 					<text v-else style="padding-right: 55upx;color:red;font-weight:450;">还剩 {{ parseFloat(info.stock) }}</text>
 				</view>
+
 			</view>
 		</view>
 	</view>
@@ -159,7 +168,7 @@ export default {
 			align-items: center;
 			& .price {
 				font-size: 28upx;
-				color: #ff2842;
+				color: rgb(87, 82, 83);
 				flex: 1;
 			}
 			& .open-bx {

hdApp/src/pagesPurchase/addCgConfirm.vue

@@ -57,8 +57,8 @@
 
 					<tui-list-cell class="line-cell" :arrow="true" v-if="payMode == 1">
 						<div class="tui-title">更多方式</div>
-						<picker mode="selector" :value="form.payWay" :range="payWayList" range-key="name" @change="payWayChange" class="tui-input" >
-						<input v-model="form.payWay" name="payWay" type="text" hidden />
+						<picker mode="selector" :value="payWay" :range="payWayList" range-key="name" @change="payWayChange" class="tui-input" >
+						<input v-model="payWay" name="payWay" type="text" hidden />
 						<div style="padding:6upx 0 6upx 0;">{{payWayList[payWayindex].name}}</div>
 						</picker>
 					</tui-list-cell>
@@ -137,6 +137,11 @@ export default {
 	},
 	methods: {
 		...mapActions(["initMerchantInfo"]),
+		payWayChange(e){
+			let index = e.detail.value
+			this.payWayindex = index
+      		this.payWay = this.payWayList[index].id
+		},
 		affirmFormSubmit(){
 			if(this.$util.isEmpty(this.selectList)){
 				this.$msg('请选择花材')
@@ -151,7 +156,7 @@ export default {
 				itemId:item.itemId,property:item.property,unitType:unitType,unitPrice:unitPrice,userPrice:unitPrice,bigUnit:item.bigUnit,smallUnit:item.smallUnit}
 				product.push(current)
 			})
-			let options = {sendCost:this.sendCost, ghsId:this.ghsId, modifyPrice: this.modifyPrice, product:JSON.stringify(product), payMode:this.payMode}
+			let options = {sendCost:this.sendCost, ghsId:this.ghsId, modifyPrice: this.modifyPrice, product:JSON.stringify(product), payMode:this.payMode,payWay:this.payWay}
 			let that = this;
 			uni.showModal({
 				title: '提示',