hmy_farmer-main.git

			@@ -17,9 +17,48 @@
			cache_goods: state => {
			return state.cache.goods \|\| []
			},
			cache_coupon_select_cancel: state => {
			return state.cache.cache_coupon_select_cancel==1?1:0
			},
			}),
			coupon_fee() {
			//优惠券
			// 查看当前有没有优惠券
			if(!this.dto.couponRecordId \|\| !this.cache_coupon ){
			// 根据优惠券的列表，查找到最合适的优惠券
			// 遍历优惠券的使用金额大于当前金额的，获取面值最大的优惠券取最大值couponDiscountValue
			var total = (this.dto.totalMemberAmount \|\| this.dto.totalAmount \|\| 0).toFixed(2)
			if(total && total>0){
			// 获取当前用户最合适的优惠券
			let res= this.$http.request('get', '/api/v2/coupon/app/mine/unused/fit', {
			params: {orderAmount:total}
			}).then(async res => {
			let tmpCoupon = res.data;
			if (tmpCoupon) {
			if(this.cache_coupon_select_cancel==0){
			await this.$store.dispatch('cache_coupon_select', tmpCoupon);
			this.dto.couponRecordId = tmpCoupon.id;
			this.dto.couponRecordStr = tmpCoupon.couponName;
			setTimeout(() => {
			this.$message.showToast('自动为您选择优惠最大的优惠券')
			}, 1000)

			}else{
			await this.$store.dispatch('cache_coupon_select', {});
			this.dto.couponRecordId ="";
			this.dto.couponRecordStr = "";
			}

			}

			}).catch(error => {
			console.error('获取优惠券失败:', error);
			});

			}

			}

			if (this.dto.couponRecordId && this.cache_coupon) {
			//计算优惠券
			if (this.cache_coupon.couponDiscountType === 'zero') {
			@@ -44,9 +83,14 @@
			return 0
			},
			order_fee() {

			// 如果订单-优惠券<0,就等于0 +打包+运费，如果还等于0，那么就0.01
			var m1 = parseFloat(this.dto.totalMemberAmount \|\| this.dto.totalAmount \|\| 0)
			var m2 = parseFloat((this.dto.packing \|\| 0) + (this.current_transport.fee \|\| 0))

			// 统一处理 Promise 和普通值
			// var couponFee = await this.coupon_fee;


			if (m1 <= parseFloat(this.coupon_fee)) {
			if (m2 > 0) {
			@@ -64,49 +108,22 @@
			async beforeDestroy() {
			await this.$store.dispatch('cache_coupon_select', {})
			await this.$store.dispatch('cache_goods_select', [])
			await this.$store.dispatch('cache_coupon_select_cancel', 0)

			},
			async onShow() {
			// 支付回调
			// #ifdef PUB_CUSTOMER
			if (this.sign['cache_topay']) {
			let options = wx.getEnterOptionsSync();
			if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3') {
			// 代表从收银台小程序返回
			let extraData = options.referrerInfo.extraData;
			// if (!extraData) {
			// // "当前通过物理按键返回，未接收到返参，建议自行查询交易结果";
			// } else {
			// if (extraData.code == 'success') {
			// // "支付成功";
			// } else if (extraData.code == 'cancel') {
			// // "支付已取消";
			// this.$message.showToast("支付已取消" + extraData.errmsg)
			// } else {
			// // "支付失败：" + extraData.errmsg;
			// this.$message.showToast("支付失败：" + extraData.errmsg)
			// }
			// }
			//
			//只要是进入了这个支付页面，都算是支付了，不管成功与否都返回
			console.log('pay success options.referrerInfo', options.referrerInfo)
			//返回上一页
			let tmp = this
			await tmp.$store.dispatch('sign_add', 'shopping')
			//清空优惠券
			tmp.$store.dispatch('cache_coupon_select', {})
			tmp.$store.dispatch('cache_goods_select', [])

			// await tmp.$message.showToast('支付操作', {
			// duration: 500
			// })
			uni.navigateBack()
			await tmp.$store.dispatch('sign_clear', 'cache_topay')
			return
			}
			// 查看当前合伙人
			await this.getPartnerInfo()

			// 根据地址获取运输方式
			if (this.address.id) {
			await this.loadTransportList()
			this.cacheAddressId = this.address.id
			}

			// #endif
			// 获取当前用户为使用的优惠券
			// this.getSuitableCouponAuto()
			//优惠券
			if (this.cache_coupon && this.cache_coupon.id) {
			this.dto.couponRecordId = this.cache_coupon.id
			@@ -125,6 +142,11 @@
			}
			this.dto.goodsRecordIdListStr = names.join(',')
			}





			},
			onLoad(options) {
			// console.log('dto',options)
			@@ -147,10 +169,7 @@
			value: ''
			})
			})
			if (this.address.id) {
			this.loadTransportList()
			this.cacheAddressId = this.address.id
			}

			//
			//先获取直接的全部地址
			// @ApiModelProperty(value = "订单商品")
			@@ -158,27 +177,7 @@
			// @ApiModelProperty(value = "打包费")
			// private BigDecimal packing;

			// 两种情况,我合伙人是A,我进入页面前改成了B,我进去后还是获取了A——可以通过

			if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
			// 考虑一下，由后台实时获取，如果获取的合伙人id不一样，那么就刷新当前用户信息。

			this.$http.request('get', '/api/current/customer/partner', {
			params: {
			// id: this.currentInfo.customerDTO.partnerId
			}
			}).then(async res => {
			if (res.code == 0) {
			this.partnerInfo = res.data \|\| {}
			if (this.partnerInfo.id !== this.currentInfo.customerDTO.partnerId) {
			//刷新用户信息
			await this.$store.dispatch('getCurrentInfo')
			}
			}
			})


			}


			},
			data() {
			@@ -193,6 +192,7 @@
			couponRecordId: '',
			couponRecordStr: '',
			goodsRecordIdListStr: '',
			unusedCouponList:[],
			},
			current_transport: {},
			cacheAddressId: '',
			@@ -202,6 +202,9 @@
			[]
			],
			partnerInfo: {},
			isShowFlag:true,

			transportExistsFlag:true,

			}
			},
			@@ -221,6 +224,42 @@
			}
			},
			methods: {

			getPartnerInfo(){
			// 两种情况,我合伙人是A,我进入页面前改成了B,我进去后还是获取了A——可以通过
			// console.log(this.currentInfo.customerDTO.partnerId)
			// if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
			// 考虑一下，由后台实时获取，如果获取的合伙人id不一样，那么就刷新当前用户信息。

			this.$http.request('get', '/api/current/customer/partner', {
			params: {
			// id: this.currentInfo.customerDTO.partnerId
			}
			}).then(async res => {
			if (res.code == 0) {
			this.partnerInfo = res.data \|\| {}
			if (this.partnerInfo.id !== this.currentInfo.customerDTO.partnerId) {
			//刷新用户信息
			await this.$store.dispatch('getCurrentInfo')
			}
			}
			})
			// }
			},

			async getSuitableCouponAuto(){
			//1.提交订单后，根据订单的商品金额，判断是否达到优惠券使用条件，如果达到，自动选择面值最大的优惠券，用户也可以在优惠券自己切换优惠券或不使用优惠券
			await this.$http.request('get', '/api/v2/coupon/app/mine/unused/list', {
			params: {}
			}).then(res => {
			var data = res.data
			this.unusedCouponList = data.list \|\| []

			})


			},

			toSelectCoupon() {
			//跳转去列表页面进行选择
			var total = ((this.dto.totalMemberAmount \|\| this.dto.totalAmount \|\| 0) + (this.dto.packing \|\| 0) + (this
			@@ -247,12 +286,12 @@
			this.dto.specialNeeds = e.value[0].value
			},
			async loadTransportList() {
			if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
			return
			}
			// debugger;
			// if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
			// return
			// }
			let that = this;
			// console.log('address', that.address, that.cacheAddressId)
			if (that.address && that.address.id && that.cacheAddressId !== that.address.id) {
			// if (that.address && that.address.id && that.cacheAddressId !== that.address.id) {
			that.$message.showLoading()
			const {
			code,
			@@ -264,11 +303,18 @@
			}
			})
			that.$message.hideLoading()
			that.transportList = []
			this.transportList = []
			if (code === 0) {
			that.transportList = data \|\| []
			this.transportList = data \|\| []
			console.log("this.transportList")
			console.log(this.transportList)
			if(this.transportList && this.transportList.length>0){
			this.transportExistsFlag=true
			}else{
			this.transportExistsFlag=false
			}
			}
			}
			// }

			},
			async submitOrder() {
			@@ -337,7 +383,6 @@
			await tmp.$store.dispatch('sign_add', 'shopping')
			uni.navigateBack()
			} else if (data) {
			// #ifndef PUB_CUSTOMER
			wx.requestPayment({
			...data,
			async success(res) {
			@@ -365,35 +410,6 @@
			// uni.navigateBack()
			}
			})
			// #endif
			// openEmbeddedMiniProgram，需要小程序基础库版本不低于 2.26.2

			// #ifdef PUB_CUSTOMER
			var param = {
			// cusid: "平台分配的商户号",
			// appid: "平台分配的appid",
			// orgid: "平台分配的机构号",
			// version: "12",
			// trxamt: "1",
			// reqsn: "商户唯一订单号",
			// notify_url: "服务器异步通知页面路径",
			// body: "标题",
			// remark: "备注",
			// validtime: "订单有效时间",
			// limit_pay: "no_credit",
			// randomstr: "随机字符串",
			// paytype: "W06",
			// signtype: "签名方式",
			// sign: "签名，参考2.1",
			...data,
			}
			await tmp.$store.dispatch('sign_add', 'cache_topay')

			wx.openEmbeddedMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})
			// #endif

			}
			}
			@@ -481,42 +497,53 @@

			<!-- 查看商品列表，和选择运费 -->
			<view class="br-4 transform-container m-t-12 p10"
			v-if="!currentInfo.customerDTO\|\|!currentInfo.customerDTO.partnerId">
			<view class="title">
			<view>运输方式：</view>
			<view class="flex transform-list flex-wrap-normal">
			<view v-for="(transform,index) of transportList"
			:class="[transform.id===dto.transportId?'cur':'']" :key="index" class="transform-item"
			@click="()=>{
			dto.transportId = transform.id;
			current_transport = transform
			}">
			<view class="title">{{ transform.name }}</view>
			<view class="price">￥{{ transform.fee }}</view>
			v-if="!(partnerInfo&&partnerInfo.id)&&(!currentInfo.customerDTO\|\|!currentInfo.customerDTO.partnerId)">
			<view v-if="(address.id \|\| cacheAddressId)&& transportExistsFlag" >
			<view class="title">
			<view>运输方式：</view>
			<view class="flex transform-list flex-wrap-normal">
			<view v-for="(transform,index) of transportList"
			:class="[transform.id===dto.transportId?'cur':'']" :key="index" class="transform-item"
			@click="()=>{
			dto.transportId = transform.id;
			current_transport = transform
			}">
			<view class="title">{{ transform.name }}</view>
			<view class="price">￥{{ transform.fee }}</view>
			</view>
			</view>
			</view>
			<view class="m-t-20" v-if="true">
			<view class="desc-red">
			10kg以下的零买订单将收取打包费，花店建议购满20kg，可选冷链物流
			</view>
			<view class="desc">
			<!-- 预计装1Mini件，运费约18.00元(5公斤内18元，不满5公斤按5公斤计费，每件货不能超过5公斤)， -->
			第一次下单预计次日凌晨发货，备货高峰期除外，冷链汽车运输，发货后72小时左右到货，三线城市会推迟6-12小时送货到店。
			<!-- 优势:价格便宜，顺丰配送 -->
			<!-- 弊端:订单必须是5kg以内 -->
			</view>
			</view>
			</view>
			<view class="m-t-20" v-if="true">
			<view class="desc-red">
			10kg以下的零买订单将收取打包费，花店建议购满20kg，可选冷链物流
			<view v-else>
			<view class="title">
			<view>运输方式：</view>
			<view style="text-align:center;color:gray;">
			平台没有运输方式
			</view>
			</view>
			<view class="desc">
			<!-- 预计装1Mini件，运费约18.00元(5公斤内18元，不满5公斤按5公斤计费，每件货不能超过5公斤)， -->
			第一次下单预计次日凌晨发货，备货高峰期除外，冷链汽车运输，发货后72小时左右到货，三线城市会推迟6-12小时送货到店。
			<!-- 优势:价格便宜，顺丰配送 -->
			<!-- 弊端:订单必须是5kg以内 -->
			</view>

			</view>
			</view>

			<view class="p10 bg-white m-t-20 br-4">
			<view class="form-item flex ">
			<view class="label">优惠券</view>
			<view class="label t-red">优惠券</view>

			<view class="m-l-a m-r-0 flex " :class="[!dto.couponRecordId?'desc-gray':'']"
			<view class="m-l-a m-r-0 flex t-red" :class="[!dto.couponRecordId?'desc-gray':'']"
			@click="toSelectCoupon">
			<view>{{dto.couponRecordStr\|\|dto.couponRecordId \|\| '请选择'}}</view>
			<u-icon class="m-l-a" name="arrow-right"></u-icon>
			<u-icon class="m-l-a t-red" name="arrow-right"></u-icon>
			</view>
			</view>

			@@ -577,10 +604,10 @@
			</view>
			</view>
			<view class="desc flex" v-if="cache_coupon&&cache_coupon.id">
			<view>
			<view class="t-red">
			优惠({{cache_coupon.couponDiscountType=='zero'?'无门槛':(cache_coupon.minOrderAmount?(`满￥${cache_coupon.minOrderAmount}可用`):'无门槛')}},优惠￥{{cache_coupon.couponDiscountValue\|\|'0'}}):
			</view>
			<view class="m-l-a m-r-0 text-right">
			<view class="m-l-a m-r-0 text-right t-red">
			-{{ coupon_fee \|\| 0 }}
			</view>
			</view>
			@@ -609,6 +636,10 @@
			.page-confirm {
			padding: 20rpx 30rpx;

			.border-red {
			border: 1px solid red;
			}

			.bottom-price {
			position: fixed;
			background-color: #ffffff;