productDev/dingyuannongji.git

			@@ -18,7 +18,21 @@
			<text v-if="info.orderStatus ==6" class="info-status grey">已退款</text>
			<template v-if="userType==1">
			<view class="info-desc" v-if="info.orderStatus ==0">
			剩余支付时间 08:32，过期将自动取消~
			剩余支付时间
			<u-count-down
			:time="info.countdown"
			format="HH:mm:ss"
			autoStart
			millisecond
			@change="onChange"
			>
			<view class="time">
			<text class="time__item">{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}:</text>
			<text class="time__item">{{ timeData.minutes }}:</text>
			<text class="time__item">{{ timeData.seconds }}</text>
			</view>
			</u-count-down>
			，过期将自动取消~
			</view>
			<view class="info-desc" v-if="info.orderStatus ==1">
			{{info.receiveType==1?'请等待客户自提购买的商品～':'等待平台发货'}}
			@@ -38,7 +52,21 @@
			</template>
			<view class="info-desc" v-if="userType==0">
			<view class="info-desc" v-if="info.orderStatus ==0">
			剩余支付时间 08:32，请尽快付款哦，过期将自动取消~
			剩余支付时间
			<u-count-down
			:time="info.countdown"
			format="HH:mm:ss"
			autoStart
			millisecond
			@change="onChange"
			>
			<view class="time">
			<text class="time__item">{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}:</text>
			<text class="time__item">{{ timeData.minutes }}:</text>
			<text class="time__item">{{ timeData.seconds }}</text>
			</view>
			</u-count-down>
			，请尽快付款哦，过期将自动取消~
			</view>
			<view class="info-desc" v-if="info.orderStatus ==1">
			{{info.receiveType==1?'请前往指定门店进行核销～':'商品已打包，等待发货～'}}
			@@ -58,32 +86,49 @@
			</view>
			</view>
			<view class="user" v-if="userType!=1">
			<view class="user-jxa">
			<view class="user-jxa-title">
			<image src="/static/icon/ic_address@2x1.png" mode="widthFix"></image>
			<text>{{info.shopInfo.name\|\|''}}</text>
			<template v-if="info.receiveType==1">
			<view class="user-jxa">
			<view class="user-jxa-title">
			<image src="/static/icon/ic_address@2x1.png" mode="widthFix"></image>
			<text>{{info.shopInfo.name\|\|''}}</text>
			</view>
			<view class="user-jxa-lx" @click="contact( info.shopInfo.phone)">
			<image src="/static/icon/ic_call@2x.png" mode="widthFix"></image>
			<text > 联系经销商</text>
			</view>
			</view>
			<view class="user-jxa-lx" @click="contact( info.shopInfo.phone)">
			<image src="/static/icon/ic_call@2x.png" mode="widthFix"></image>
			<text > 联系经销商</text>
			<view class="user-jxtime">
			<image class="user-jxtime-icon" src="/static/icon/ic_openinghours@2x.png" mode="widthFix"></image>
			<text>营业时间：{{info.shopInfo.startTime \|\| ''}}</text>
			</view>
			</view>
			<view class="user-jxtime">
			<image class="user-jxtime-icon" src="/static/icon/ic_openinghours@2x.png" mode="widthFix"></image>
			<text>营业时间：{{info.shopInfo.startTime \|\| ''}}</text>
			</view>
			<view class="user-jxtime" @click="jumpMap()">
			<image class="user-jxtime-icon" src="/static/icon/ic_shopaddress@2x.png" mode="widthFix"></image>
			<text>{{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">
			<view class="user-qrcode-image">
			<image v-if="qrCodeBase64" :src="qrCodeBase64" ></image>
			<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>
			<image class="user-jxtime-to" src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
			</view>
			<view class="user-qrcode-code">{{info.exchangeCode \|\| ''}}</view>
			<view class="user-qrcode-btn" @click="copyText(info.exchangeCode)">复制自提码</view>
			</view>
			<view class="user-qrcode" v-if="info.orderStatus ==1 &&info.receiveType==1">
			<view class="user-qrcode-image">
			<image v-if="qrCodeBase64" :src="qrCodeBase64" ></image>
			</view>
			<view class="user-qrcode-code">{{info.exchangeCode \|\| ''}}</view>
			<view class="user-qrcode-btn" @click="copyText(info.exchangeCode)">复制自提码</view>
			</view>
			</template>
			<template v-else>
			<view class="user-top">
			<view class="user-icon" style="width: 48rpx; height: 48rpx;">
			<image src="/static/icon/ic_location@2x.png" mode="widthFix"></image>
			</view>
			<view class="user-info">
			<view class="user-info-a">
			<text>{{info.linkName \|\| ''}} {{info.linkPhone \|\| ''}}</text>
			</view>
			<view class="user-info-b">
			<text>{{info.linkAddress \|\| ''}}</text>
			</view>
			</view>
			</view>
			</template>
			</view>
			<view class="user" v-if="userType==1">
			<view class="user-top">
			@@ -151,7 +196,7 @@
			<view class="shop">
			<view class="shop-top">
			<view :class="'shop-top-tips '+(info.receiveType==1?'shop-top-tips-a':'shop-top-tips-b' )">{{info.receiveType==1?'自提':'配送'}}</view>
			<text>{{info.shopInfo.name \|\| ''}}</text>
			<text>{{info.shopInfo.name \|\| '合肥鼎元官方配送'}}</text>
			</view>
			<view class="b" v-if="info.goodsorderDetailList && info.goodsorderDetailList.length">
			<view class="b-item" v-for="(item, index) in info.goodsorderDetailList" :key="index" @click="jumpGoodsDetail(item,index)" >
			@@ -263,7 +308,7 @@
			<text>{{info.doneDate \|\| ''}}</text>
			</view>
			</view>
			<view class="xinxi-list-item" v-if="1==2">
			<view class="xinxi-list-item">
			<view class="xinxi-list-item-label">订单备注：</view>
			<view class="xinxi-list-item-right">
			<text>{{info.memberInfo\|\|'-'}}</text>
			@@ -351,7 +396,8 @@
			id:null,
			userType:0,
			shop:{},
			info:{shopInfo:{}}
			info:{shopInfo:{}},
			timeData: {}
			};
			},
			onShow() {
			@@ -376,6 +422,9 @@
			this.qrCodeUrl=''
			},
			methods:{
			onChange(e) {
			this.timeData = e
			},
			payOrder() {
			var that = this;
			this.$u.api.replayPay({
			@@ -697,6 +746,7 @@
			color: #FFFFFF;
			}
			.info-desc {
			display: flex;
			font-weight: 400;
			font-size: 26rpx;
			color: #FFFFFF;