productDev/dingyuannongji.git

			@@ -103,7 +103,7 @@
			</view>
			<view class="user-jxtime" @click="jumpMap()">
			<image class="user-jxtime-icon" src="/static/icon/ic_shopaddress@2x.png" mode="widthFix"></image>
			<text>{{info.linkAddress \|\| ''}}</text>
			<text>{{(info.shopInfo.areas.provinceName \|\| '') + (info.shopInfo.areas.name \|\| '') + (info.shopInfo.areas.cityName \|\| '') + (info.shopInfo.addr \|\| '')}}</text>
			<image class="user-jxtime-to" src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
			</view>
			<view class="user-qrcode" v-if="info.orderStatus ==1 &&info.receiveType==1">
			@@ -242,7 +242,8 @@
			</view>
			</view>
			<view class="shop-info-item">
			<view class="shop-info-item-label" style="color: #222222; font-size: 30rpx; font-weight: 600;">需付款</view>
			<view class="shop-info-item-label" style="color: #222222; font-size: 30rpx; font-weight: 600;" v-if="[1,2,3,4]">实付款</view>
			<view class="shop-info-item-label" style="color: #222222; font-size: 30rpx; font-weight: 600;" v-else-if="[0]">需付款</view>
			<view class="shop-info-item-price xfk">
			<text>{{(info.price \|\| 0).toFixed(2)}}</text>
			<text></text>
			@@ -397,7 +398,8 @@
			userType:0,
			shop:{},
			info:{shopInfo:{}},
			timeData: {}
			timeData: {},
			loading: false,
			};
			},
			onShow() {
			@@ -427,9 +429,12 @@
			},
			payOrder() {
			var that = this;
			if (this.loading) return;
			this.loading = true
			this.$u.api.replayPay({
			orderId: this.id
			}).then(res => {
			this.loading = false
			if (res.code === 200) {
			wx.requestPayment({
			timeStamp: res.data.response.timeStamp,
			@@ -604,7 +609,7 @@
			},
			jumpGoodsDetail(item){
			uni.navigateTo({
			url: '/pages/details/details?id='+item.id
			url: '/pages/details/details?id='+item.goodsId
			})
			}
			}