zhengjinyi преди 2 години
родител
ревизия
e7b3f455ab

+ 7 - 2
pages/goods/goods-classify.vue

@@ -731,9 +731,11 @@ export default {
 			// 选择品牌
 			brand.isChecked = !brand.isChecked
 			if (brand.isChecked) {
-				this.checkedBrandList.push(brand.id)
+				if(!this.contains(this.checkedBrandList,brand.id)){
+					this.checkedBrandList.push(brand.id)
+				}
 			} else {
-				this.checkedBrandList.splice(index, 1)
+				this.checkedBrandList.splice(this.checkedBrandList.indexOf(brand.id), 1)
 			}
 			this.isAllcheckedBrand = false
 			this.checkedBrandLength = this.checkedBrandList.length
@@ -741,6 +743,9 @@ export default {
 			this.listQuery.brandIds = this.checkedBrandList.join(',')
 			console.log('this.listQuery.brandIds', this.listQuery.brandIds)
 		},
+		contains(arr, val) {// 校验
+			return arr.some(item => item === val)
+		},
 		choiceBrandAll() {
 			// 点击选择全部品牌
 			this.isAllcheckedBrand = true

+ 1 - 1
pages/seller/order/components/cm-invice-popup.vue

@@ -271,7 +271,7 @@ export default {
 		async updateInvoiceFn() {
 			try {
 				const resolve = await this.$api.getComStorage('orderUserInfo')
-				const res = await this.OrderService.updateOrganize({ ...this.invoiceData,...{userId: resolve.userId }})
+				const res = await this.OrderService.UpdateInvoice({ ...this.invoiceData,...{userId: resolve.userId }})
 				this.invoiceText = this.setInvoiceText(this.invoiceData)
 				this.$emit('handleChoiceaInvoice', this.invoiceData)
 				this.popupShow = false

+ 1 - 1
pages/seller/order/order-historylist.vue

@@ -110,7 +110,7 @@
 									<view class="goods-pros-t">
 										<view class="pros-img tui-skeleton-fillet">
 											<image :src="pros.image" alt="" />
-											<text class="tips" v-if="pros.productType == 2 || pros.productType == 1"
+											<text class="tips" v-if="pros.giftType == 2 || pros.giftType == 1"
 												>赠品</text
 											>
 										</view>

+ 1 - 1
pages/seller/order/order-list.vue

@@ -139,7 +139,7 @@
 												<image :src="pros.image" alt="" />
 												<text
 													class="tips"
-													v-if="pros.productType == 2 || pros.productType == 1"
+													v-if="pros.giftType == 2 || pros.giftType == 1"
 													>赠品</text
 												>
 											</view>

+ 1 - 1
pages/seller/order/search-order.vue

@@ -104,7 +104,7 @@
 								<view class="goods-pros-t">
 									<view class="pros-img tui-skeleton-fillet">
 										<image :src="pros.image" alt="" />
-										<text class="tips" v-if="pros.productType == 2 || pros.productType == 1"
+										<text class="tips" v-if="pros.giftType == 2 || pros.giftType == 1"
 											>赠品</text
 										>
 									</view>

+ 200 - 158
pages/user/order/components/cm-freight-popup.vue

@@ -1,83 +1,116 @@
 <template name="freight">
-<!-- 运费信息 -->
-<view>
-	<view class="goods-pros-m">
-		<template v-if="supplier.postageFlag === 0">
-			<view class="freight-main">
-				<view class="freight-left">运费</view>
-				<view class="freight-right"> <view class="freight-text">包邮</view> </view>
-			</view>
-		</template>
-		<template v-if="supplier.postageFlag === 1">
-			<view class="freight-main">
-				<view class="freight-left">运费</view>
-				<view class="freight-right" @click.stop="handlePupShow">
-					<view class="freight-text" v-if="handlePostageFlag === 1">¥{{ handleTotalPostage | NumFormat }}</view>
-					<view class="freight-text" v-if="handlePostageFlag === 2">到付</view>
-					<view class="select"><text class="iconfont icon-xiayibu"></text></view>
+	<!-- 运费信息 -->
+	<view>
+		<view class="goods-pros-m">
+			<template v-if="supplier.postageFlag === 0">
+				<view class="freight-main">
+					<view class="freight-left">运费</view>
+					<view class="freight-right"> <view class="freight-text">包邮</view> </view>
 				</view>
-			</view>
-		</template>
-		<template v-if="supplier.postageFlag === 2">
-			<view class="freight-main">
-				<view class="freight-left">运费</view>
-				<view class="freight-right"> <view class="freight-text">到付</view> </view>
-			</view>
-		</template>
-		<tui-bottom-popup :radius="true" :show="popupShow" @close="hidePopup">
-			<view class="freight-title">运费设置</view>
-			<view class="freight-content">
-				<radio-group @change="radioChange">
-					<label v-for="(item, index) in radioItems" :key="index">
-						<radio
-							style="transform:scale(0.7)"
-							color="#FF5B00"
-							:id="item.value"
-							:value="item.value"
-							:checked="item.checked"
-						></radio>
-						<label :for="item.value" class="label">
-							<text>{{ item.name }}</text>
+			</template>
+			<template v-if="supplier.postageFlag === 1 && supplier.designatedFlag === 1">
+				<view class="freight-main">
+					<view class="freight-left">运费</view>
+					<view class="freight-right">
+						<view class="freight-text">¥{{ handleTotalPostage | NumFormat }}</view>
+					</view>
+				</view>
+			</template>
+			<template
+				v-if="
+					(supplier.postageFlag === 1 && supplier.designatedFlag === 2) ||
+						(supplier.postageFlag === 1 && supplier.designatedFlag === 3)
+				"
+			>
+				<view class="freight-main">
+					<view class="freight-left">运费</view>
+					<view class="freight-right" @click.stop="handlePupShow">
+						<view class="freight-text" v-if="handlePostageFlag === 1"
+							>¥{{ handleTotalPostage | NumFormat }}</view
+						>
+						<view class="freight-text" v-if="handlePostageFlag === 2">到付</view>
+						<view class="select"><text class="iconfont icon-xiayibu"></text></view>
+					</view>
+				</view>
+			</template>
+			<template v-if="supplier.postageFlag === 2">
+				<view class="freight-main">
+					<view class="freight-left">运费</view>
+					<view class="freight-right"> <view class="freight-text">到付</view> </view>
+				</view>
+			</template>
+			<tui-bottom-popup :radius="true" :show="popupShow" @close="hidePopup">
+				<view class="freight-title">运费设置</view>
+				<view class="freight-content">
+					<radio-group @change="radioChange">
+						<label v-for="(item, index) in radioItems" :key="index">
+							<radio
+								style="transform:scale(0.7)"
+								color="#FF5B00"
+								:id="item.value"
+								:value="item.value"
+								:checked="item.checked"
+							></radio>
+							<label :for="item.value" class="label">
+								<text>{{ item.name }}</text>
+							</label>
 						</label>
-					</label>
-				</radio-group>
-				<template v-if="handlePostageFlag === 1">
-					<view class="freight-form">
-						<view class="freight-form-item" v-if="handleSupplier.coldChain > 0">
-							<view class="label">冷链运输费</view>
-							<view class="texts">
-								<text>¥{{ handleSupplier.coldChain | NumFormat }}</text>
-								<text 
-									class="iconfont" 
-									:class="[isColdChina ? 'icon-yixuanze' : 'icon-weixuanze']"
-									@click.stop="handleChangeColdChina"
-								>
-								</text>
+					</radio-group>
+					<template v-if="handlePostageFlag === 1">
+						<view class="freight-form">
+							<view class="freight-form-item" v-if="handleSupplier.coldChain > 0">
+								<view class="label">冷链运输费</view>
+								<view class="texts">
+									<text>¥{{ handleSupplier.coldChain | NumFormat }}</text>
+									<text
+										class="iconfont"
+										:class="[isColdChina ? 'icon-yixuanze' : 'icon-weixuanze']"
+										@click.stop="handleChangeColdChina"
+									>
+									</text>
+								</view>
+							</view>
+							<view class="freight-form-item">
+								<view class="label">其他运费 </view>
+								<view class="texts red">¥{{ handleSupplier.postage | NumFormat }} </view>
+							</view>
+							<view class="freight-form-item">
+								<view class="label">总运费 </view>
+								<view class="texts red">¥{{ handleTotalPostage | NumFormat }} </view>
 							</view>
 						</view>
-						<view class="freight-form-item"> 
-							<view class="label">其他运费 </view> 
-							<view class="texts">¥{{ handleSupplier.postage | NumFormat }} </view> 
-						</view>
-						<view class="freight-form-item">
-							<view class="label">总运费 </view> 
-							<view class="texts red">¥{{ handleTotalPostage  | NumFormat }} </view>
-						</view>
-					</view>
-				</template>
-				<template v-if="handlePostageFlag === 2">
-					<view class="freight-form">
-						<view class="freight-form-item">
-							<view class="label">总运费</view> 
-							<view class="texts red">到付</view>
+					</template>
+					<template v-if="handlePostageFlag === 2">
+						<view class="freight-form">
+							<view class="freight-form-item" v-if="handleSupplier.coldChain > 0">
+								<view class="label">冷链运输费</view>
+								<view class="texts">
+									<text>¥{{ handleSupplier.coldChain | NumFormat }}</text>
+									<text
+										class="iconfont"
+										:class="[isColdChina ? 'icon-yixuanze' : 'icon-weixuanze']"
+										@click.stop="handleChangeColdChina"
+									>
+									</text>
+								</view>
+							</view>
+							<view class="freight-form-item">
+								<view class="label">其他运费 </view><view class="texts red">到付</view>
+							</view>
+							<view class="freight-form-item">
+								<view class="label">总运费</view>
+								<view class="texts red" v-if="handleSupplier.isColdChina"
+									>¥{{ handleSupplier.coldChain | NumFormat }}</view
+								>
+								<view class="texts red" v-else>到付</view>
+							</view>
 						</view>
-					</view>
-				</template>
-				<view class="freight-btn" @click="popupShow = false"> 确定 </view>
-			</view>
-		</tui-bottom-popup>
+					</template>
+					<view class="freight-btn" @click="popupShow = false"> 确定 </view>
+				</view>
+			</tui-bottom-popup>
+		</view>
 	</view>
-</view>
 </template>
 
 <script>
@@ -87,27 +120,27 @@ export default {
 		supplier: {
 			type: Object
 		},
-		index:{
-			type:Number
+		index: {
+			type: Number
 		}
 	},
 	data() {
 		return {
 			popupShow: false,
-			isColdChina:false,
-			handlePostageFlag:1,
+			isColdChina: false,
+			handlePostageFlag: 1,
 			radioItems: [
-			 {
+				{
 					name: '不包邮',
 					value: 1,
 					checked: true
 				},
 				{
 					name: '到付',
-					value: 2,
+					value: 2
 				}
 			],
-			handleSupplier:{}
+			handleSupplier: {}
 		}
 	},
 	filters: {
@@ -121,10 +154,10 @@ export default {
 	},
 	computed: {
 		// 计算总运费
-		handleTotalPostage(){
-			if(this.handleSupplier.isColdChina){
-				return (this.handleSupplier.postage*100 + this.handleSupplier.coldChain*100)/100
-			}else{
+		handleTotalPostage() {
+			if (this.handleSupplier.isColdChina) {
+				return (this.handleSupplier.postage * 100 + this.handleSupplier.coldChain * 100) / 100
+			} else {
 				return this.handleSupplier.postage
 			}
 		}
@@ -140,54 +173,63 @@ export default {
 	},
 	methods: {
 		// 初始化
-		infoSupplier(data){
+		infoSupplier(data) {
 			this.handleSupplier = data
-			this.isColdChina  = data.isColdChina
-			this.handlePostageFlag  = data.handlePostageFlag
+			this.isColdChina = data.isColdChina
+			this.handlePostageFlag = data.handlePostageFlag
 		},
 		// 勾选冷链费
-		handleChangeColdChina(){
+		handleChangeColdChina() {
 			this.isColdChina = !this.isColdChina
 			this.handleSupplier.isColdChina = this.isColdChina
-			if(this.isColdChina){
-				this.handleSupplier.totalPrice = Number((this.handleSupplier.totalPrice*100 + this.handleSupplier.coldChain*100)/100)
-				this.$emit('changeColdChina', this.handleSupplier,this.index)
-			}else{
-				this.handleSupplier.totalPrice = Number(this.repiceNumSub(this.handleSupplier.totalPrice,this.handleSupplier.coldChain))
-				this.$emit('changeColdChina', this.handleSupplier,this.index)
+			if (this.isColdChina) {
+				this.handleSupplier.totalPrice = Number(
+					(this.handleSupplier.totalPrice * 100 + this.handleSupplier.coldChain * 100) / 100
+				)
+				this.$emit('changeColdChina', this.handleSupplier, this.index)
+			} else {
+				this.handleSupplier.totalPrice = Number(
+					this.repiceNumSub(this.handleSupplier.totalPrice, this.handleSupplier.coldChain)
+				)
+				this.$emit('changeColdChina', this.handleSupplier, this.index)
 			}
 		},
 		// 切换运费类型 1 不包邮 2 到付
 		radioChange($event) {
-			const postage = this.isColdChina ? ( this.handleSupplier.postage + this.handleSupplier.coldChain ) : this.handleSupplier.postage 
-			this.handlePostageFlag = this.handleSupplier.handlePostageFlag = $event.detail.value*1
-			if(this.handlePostageFlag === 1){
-				this.handleSupplier.totalPrice = Number((this.handleSupplier.totalPrice*100 + postage*100)/100)
-				this.$emit('changePostage', this.handleSupplier,this.index)
-			}else{
-				this.handleSupplier.totalPrice = Number(this.repiceNumSub(this.handleSupplier.totalPrice,postage))
-				this.$emit('changePostage', this.handleSupplier,this.index)
+			// const postage = this.isColdChina ? ( this.handleSupplier.postage + this.handleSupplier.coldChain ) : this.handleSupplier.postage
+			this.handlePostageFlag = this.handleSupplier.handlePostageFlag = $event.detail.value * 1
+			if (this.handlePostageFlag === 1) {
+				this.handleSupplier.totalPrice = Number(
+					(this.handleSupplier.totalPrice * 100 + this.handleSupplier.postage * 100) / 100
+				)
+				this.$emit('changePostage', this.handleSupplier, this.index)
+			} else {
+				this.handleSupplier.totalPrice = Number(
+					this.repiceNumSub(this.handleSupplier.totalPrice, this.handleSupplier.postage)
+				)
+				this.$emit('changePostage', this.handleSupplier, this.index)
 			}
 		},
-		repiceNumSub(arg1, arg2) {//减法精确,arg2:被减数,arg1:减数
-			var r1,r2,m,n;
-			try{
-				r1=arg1.toString().split(".")[1].length
-			}catch(e){
-				r1=0
+		repiceNumSub(arg1, arg2) {
+			//减法精确,arg2:被减数,arg1:减数
+			var r1, r2, m, n
+			try {
+				r1 = arg1.toString().split('.')[1].length
+			} catch (e) {
+				r1 = 0
 			}
-			try{
-				r2=arg2.toString().split(".")[1].length
-			}catch(e){
-				r2=0
+			try {
+				r2 = arg2.toString().split('.')[1].length
+			} catch (e) {
+				r2 = 0
 			}
-			m=Math.pow(10,Math.max(r1,r2));
+			m = Math.pow(10, Math.max(r1, r2))
 			// last modify by deeka
 			// 动态控制精度长度
-			n=(r1>=r2)?r1:r2;
-			return ((arg1*m-arg2*m)/m).toFixed(n);
+			n = r1 >= r2 ? r1 : r2
+			return ((arg1 * m - arg2 * m) / m).toFixed(n)
 		},
-		handlePupShow(){
+		handlePupShow() {
 			this.popupShow = true
 		},
 		hidePopup() {
@@ -244,7 +286,7 @@ export default {
 					right: 0;
 					top: 0;
 					font-size: $font-size-28;
-					color: #B2B2B2;
+					color: #b2b2b2;
 				}
 			}
 		}
@@ -287,67 +329,67 @@ export default {
 	}
 }
 .freight-title {
-    color: #333333;
-    font-size: 32rpx;
-    text-align: center;
-    margin: 40rpx 0;
+	color: #333333;
+	font-size: 32rpx;
+	text-align: center;
+	margin: 40rpx 0;
 }
 .freight-content {
-    box-sizing: border-box;
-    padding: 0 24rpx;
+	box-sizing: border-box;
+	padding: 0 24rpx;
 	font-weight: normal;
-    radio{
-        margin-right: 8rpx;
-    }
-    .label {
-        color: #666666;
-        font-size: 28rpx;
-        margin-right: 102rpx;
-    }
-    .freight-btn {
-        height: 90rpx;
-        background: $btn-confirm;
-        border-radius: 45rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        color: #FFFFFF;
-        width: 100%;
-        margin: 100rpx 0 0 0;
-    }
+	radio {
+		margin-right: 8rpx;
+	}
+	.label {
+		color: #666666;
+		font-size: 28rpx;
+		margin-right: 102rpx;
+	}
+	.freight-btn {
+		height: 90rpx;
+		background: $btn-confirm;
+		border-radius: 45rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #ffffff;
+		width: 100%;
+		margin: 100rpx 0 0 0;
+	}
 }
 .freight-form {
-    margin-top: 50rpx;
-    width: 100%;
-    .freight-form-item {
-        width: 100%;
+	margin-top: 50rpx;
+	width: 100%;
+	.freight-form-item {
+		width: 100%;
 		height: 48rpx;
 		line-height: 48rpx;
-        margin-bottom: 24rpx;
-        color: #666666;
-        font-size: 28rpx;
-		.label{
+		margin-bottom: 24rpx;
+		color: #666666;
+		font-size: 28rpx;
+		.label {
 			width: 50%;
 			float: left;
 			margin-right: 0;
 		}
-		.texts{
+		.texts {
 			width: 50%;
 			float: right;
 			text-align: right;
-			&.red{
-				color: #F94B4B;
+			&.red {
+				color: #f94b4b;
 			}
-			.iconfont{
+			.iconfont {
 				margin-left: 20rpx;
 				color: $color-system;
 			}
 		}
-    }
+	}
 }
 .freight-pay {
-    position: absolute;
-    right: -60%;
-    transform:scale(0.7);
+	position: absolute;
+	right: -60%;
+	transform: scale(0.7);
 }
 </style>

+ 1 - 1
pages/user/order/components/details/cm-goods-temp.vue

@@ -107,7 +107,7 @@
 						<view class="price-view-le">运费:</view>
 						<view class="price-view-ri">{{ orderInfo.postageInfo }}</view>
 					</view>
-					<view class="pros-price-view">
+					<view class="pros-price-view" v-if="orderInfo.eachDiscount > 0">
 						<view class="price-view-le">优惠:</view>
 						<view class="price-view-ri">¥{{ orderInfo.eachDiscount | NumFormat }}</view>
 					</view>

+ 461 - 447
pages/user/order/order-payunder.vue

@@ -8,540 +8,554 @@
 			:loadingType="5"
 		></tui-skeleton>
 		<view class="container-cash clearfix" v-else>
-			<view class="pay-bring-title" v-if="onlinePay == 2">{{payBringTitle}}</view>
+			<view class="pay-bring-title" v-if="onlinePay == 2">{{ payBringTitle }}</view>
 			<view class="container-wrapper">
 				<view class="pay-content">
 					<view class="pay-p"><text>待付金额</text></view>
 					<view class="pay-money">
-						<text class="pay-sm">¥</text>
-						<text class="pay-bg">{{payableAmount | NumFormat}}</text>
+						<text class="pay-sm">¥</text> <text class="pay-bg">{{ payableAmount | NumFormat }}</text>
 					</view>
 				</view>
 			</view>
 			<view class="pay-bring-wrapper clearfix">
 				<view class="pay-bring-content">
 					<view class="text-title">
-						<image src="https://static.caimei365.com/app/img/icon/icon-vxkecode.png" mode="" @click="previewImg"></image>
+						<image
+							src="https://static.caimei365.com/app/img/icon/icon-vxkecode.png"
+							mode=""
+							@click="previewImg"
+						></image>
 					</view>
-					<view class="text-v">订单标识:{{payOrderId}} <text class="clipboard" @click.stop="clipboard(payOrderId)">复制</text></view>
-					<view class="text-content">请点击上方二维码,长按保存后,使用微信扫码添加采美客服,将订单标识告知客服,客服会为您推荐最合适的线下转账方式。</view>
+					<view class="text-v"
+						>订单标识:{{ payOrderId }}
+						<text class="clipboard" @click.stop="clipboard(payOrderId)">复制</text></view
+					>
+					<view class="text-content"
+						>请点击上方二维码,长按保存后,使用微信扫码添加采美客服,将订单标识告知客服,客服会为您推荐最合适的线下转账方式。</view
+					>
 				</view>
 			</view>
-		</view>		
+		</view>
 	</view>
 </template>
 
 <script>
-	const thorui = require('@/components/clipboard/clipboard.thorui.js')
-	import bankMixins from '@/mixins/bankMixins.js'
-	export default{
-		mixins: [bankMixins],
-		data(){
-			return{
-				orderId:'',
-				payableAmount:0,
-				emptyWrapperH: '',
-				bankNumber:'6230 2100 9221 2400',
-				payOrderId:'',
-				isIphoneX:this.$store.state.isIphoneX,
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				tabCurrentIndex:0,
-				isReceiptStatus:false,
-				buttonText:'使用微信支付',
-				btnColor:'#09BB07',
-				receiptStatus:'',
-				onlinePay:1,
-				optionType:'',
-				onlinePayFlag:'',
-				payBringTitle:'本次交易暂不支持线上支付,请使用线下转账方式付款',
-				payStatusText:'使用任何一种线上支付方式支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。',
-				pageType:'',
-				skeletonShow:true,
-				productImage:['https://static.caimei365.com/app/img/icon/icon-vxkecode.png'],
-			}
-		},
-		onLoad(option) {
-			this.initData(option)
-		},
-		filters: {
-			NumFormat(value) {
-				if(!value) return '0.00'
-				/*原来用的是Number(value).toFixed(0),这样取整时有问题,例如0.51取整之后为1,感谢Nils指正*/
-				/*后来改成了 Number(value)|0,但是输入超过十一位就为负数了,具体见评论 */
-				var intPart = Number(value) - Number(value)%1 //获取整数部分(这里是windy93的方法)
-				var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') //将整数部分逢三一断
-				var floatPart = '.00' //预定义小数部分
-				var value2Array = value.toString().split('.')
-				//=2表示数据有小数位
-				if(value2Array.length == 2) {
-					floatPart = value2Array[1].toString() //拿到小数部分
+const thorui = require('@/components/clipboard/clipboard.thorui.js')
+import bankMixins from '@/mixins/bankMixins.js'
+export default {
+	mixins: [bankMixins],
+	data() {
+		return {
+			orderId: '',
+			payableAmount: 0,
+			emptyWrapperH: '',
+			bankNumber: '6230 2100 9221 2400',
+			payOrderId: '',
+			isIphoneX: this.$store.state.isIphoneX,
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			tabCurrentIndex: 0,
+			isReceiptStatus: false,
+			buttonText: '使用微信支付',
+			btnColor: '#09BB07',
+			receiptStatus: '',
+			onlinePay: 1,
+			optionType: '',
+			onlinePayFlag: '',
+			payBringTitle: '本次交易暂不支持线上支付,请使用线下转账方式付款',
+			payStatusText: '使用任何一种线上支付方式支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。',
+			pageType: '',
+			skeletonShow: true,
+			productImage: ['https://static.caimei365.com/app/img/icon/icon-vxkecode.png']
+		}
+	},
+	onLoad(option) {
+		this.initData(option)
+	},
+	filters: {
+		NumFormat(value) {
+			if (!value) return '0.00'
+			/*原来用的是Number(value).toFixed(0),这样取整时有问题,例如0.51取整之后为1,感谢Nils指正*/
+			/*后来改成了 Number(value)|0,但是输入超过十一位就为负数了,具体见评论 */
+			var intPart = Number(value) - (Number(value) % 1) //获取整数部分(这里是windy93的方法)
+			var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') //将整数部分逢三一断
+			var floatPart = '.00' //预定义小数部分
+			var value2Array = value.toString().split('.')
+			//=2表示数据有小数位
+			if (value2Array.length == 2) {
+				floatPart = value2Array[1].toString() //拿到小数部分
 
-					if(floatPart.length == 1) { //补0,实际上用不着
-						return intPartFormat + '.' + floatPart + '0'
-					} else {
-						return intPartFormat + '.' + floatPart
-					}
+				if (floatPart.length == 1) {
+					//补0,实际上用不着
+					return intPartFormat + '.' + floatPart + '0'
 				} else {
-					return intPartFormat + floatPart
+					return intPartFormat + '.' + floatPart
 				}
+			} else {
+				return intPartFormat + floatPart
 			}
+		}
+	},
+	methods: {
+		initData(e) {
+			console.log(e)
+			this.shopOrderId = e.shopOrderId
+			this.payOrderId = '#' + e.shopOrderId + '#'
+			this.cmGetBankTypeLists()
+			this.PayOrderCheckoutCounter(this.shopOrderId)
 		},
-		methods:{
-			initData(e){
-				console.log(e)
-				this.shopOrderId = e.shopOrderId
-				this.payOrderId ='#'+e.shopOrderId+'#'
-				this.cmGetBankTypeLists()	
-				this.PayOrderCheckoutCounter(this.shopOrderId)
-			},
-			PayOrderCheckoutCounter(shopOrderId){
-				this.PayService.PayOrderCheckoutCounter({shopOrderId:shopOrderId}).then(response =>{
+		PayOrderCheckoutCounter(shopOrderId) {
+			this.PayService.PayOrderCheckoutCounter({ shopOrderId: shopOrderId })
+				.then(response => {
 					let data = response.data.order
-					this.payableAmount = data.payableAmount - data.receiptAmount  //待付金额
-					this.receiptStatus =  data.receiptStatus
-					this.onlinePayFlag = data.onlinePayFlag			
+					this.payableAmount = data.payableAmount - data.receiptAmount //待付金额
+					this.receiptStatus = data.receiptStatus
+					this.onlinePayFlag = data.onlinePayFlag
 					//判断线上线下显示
-					if(this.optionType == 'onlinePay'){
+					if (this.optionType == 'onlinePay') {
 						this.onlinePay = 2
-					}else{
+					} else {
 						this.onlinePay = response.data.onlinePay
 					}
-					setTimeout(()=>{
+					setTimeout(() => {
 						this.skeletonShow = false
-					},500)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			clipboard(data) {
-				thorui.getClipboardData(data, (res) => {
-					if (res) {
-						this.$util.msg('复制成功',2000,true,'success')
-					} else {
-						this.$util.msg('复制失败',2000,true,'none')
-					}
+					}, 500)
 				})
-			},
-			previewImg (index) {//顶部商品图片预览
-				let previewUrls = this.productImage
-				uni.previewImage({
-					current: 0, 	//图片索引
-					urls: previewUrls, //必须是http图片,本地图片无效
-					longPressActions:''
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
-			}
 		},
-		onShow() {
-
+		clipboard(data) {
+			thorui.getClipboardData(data, res => {
+				if (res) {
+					this.$util.msg('复制成功', 2000, true, 'success')
+				} else {
+					this.$util.msg('复制失败', 2000, true, 'none')
+				}
+			})
+		},
+		previewImg(index) {
+			//顶部商品图片预览
+			let previewUrls = this.productImage
+			uni.previewImage({
+				current: 0, //图片索引
+				urls: previewUrls, //必须是http图片,本地图片无效
+				longPressActions: ''
+			})
 		}
-	}
+	},
+	onShow() {}
+}
 </script>
 
 <style lang="scss">
-	page{
-		height: auto !important;
-		background-color: #FFFFFF;
-	}
-	.container-cash{
+page {
+	height: auto !important;
+	background-color: #ffffff;
+}
+.container-cash {
+	width: 100%;
+	padding-bottom: 250rpx;
+	.pay-bring-title {
+		box-sizing: border-box;
 		width: 100%;
-		padding-bottom: 250rpx;
-		.pay-bring-title{
-			box-sizing: border-box;
+		min-height: 96rpx;
+		padding: 20rpx 24rpx;
+		line-height: 48rpx;
+		text-align: left;
+		font-size: $font-size-24;
+		background: rgba(255, 234, 221, 1);
+		color: $color-system;
+	}
+	.container-wrapper {
+		width: 662rpx;
+		margin: 0 auto;
+		.pay-title {
+			font-size: $font-size-32;
+			line-height: 44rpx;
+			text-align: center;
+			color: #2a86ff;
+			margin: 40rpx 0 0 0;
 			width: 100%;
-			min-height: 96rpx;
-			padding: 20rpx 24rpx;
-			line-height: 48rpx;
-			text-align: left;
-			font-size: $font-size-24;
-			background:rgba(255,234,221,1);
-			color: $color-system;
+			float: left;
 		}
-		.container-wrapper{
-			width:662rpx;
-			margin: 0 auto;
-			.pay-title{
-				font-size: $font-size-32;
-				line-height: 44rpx;
-				text-align: center;
-				color: #2A86FF;
-				margin: 40rpx 0 0 0;
-				width: 100%;
-				float: left;
+		.pay-content {
+			width: 574rpx;
+			height: 136rpx;
+			padding: 52rpx 44rpx;
+			background: url(https://static.caimei365.com/app/img/icon/icon-paybg.png) no-repeat;
+			background-size: cover;
+			float: left;
+			margin-top: 40rpx;
+			.pay-p {
+				font-size: $font-size-26;
+				color: #ffffff;
+				line-height: 36rpx;
 			}
-			.pay-content{
-				width: 574rpx;
-				height: 136rpx;
-				padding: 52rpx 44rpx;
-				background: url(https://static.caimei365.com/app/img/icon/icon-paybg.png) no-repeat;
-				background-size: cover;
-				float: left;
-				margin-top: 40rpx;
-				.pay-p{
+			.pay-money {
+				color: #ffffff;
+				line-height: 84rpx;
+				font-weight: bold;
+				.pay-sm {
 					font-size: $font-size-26;
-					color: #FFFFFF;
-					line-height: 36rpx;
 				}
-				.pay-money{
-					color: #FFFFFF;
-					line-height: 84rpx;
-					font-weight: bold;
-					.pay-sm{
-						font-size: $font-size-26;
-					}
-					.pay-bg{
-						font-size: 50rpx;
-					}
+				.pay-bg {
+					font-size: 50rpx;
 				}
 			}
-			.pay-check{
-				width: 100%;
-				height: auto;
-				float: left;
-				.check-title{
-					width: 622rpx;
+		}
+		.pay-check {
+			width: 100%;
+			height: auto;
+			float: left;
+			.check-title {
+				width: 622rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				padding: 0 20rpx;
+				margin-top: 24rpx;
+				.text {
+					font-size: $font-size-28;
+					color: $text-color;
+					text-align: left;
+					float: left;
+				}
+				.icon {
+					width: 40rpx;
 					height: 40rpx;
+					border-radius: 50%;
 					line-height: 40rpx;
-					padding: 0 20rpx;
-					margin-top: 24rpx;
-					.text{
-						font-size: $font-size-28;
-						color: $text-color;
-						text-align: left;
-						float: left;
-					}
-					.icon{
-						width: 40rpx;
-						height: 40rpx;
-						border-radius: 50%;
-						line-height: 40rpx;
-						text-align: center;
-						color: #FFFFFF;
-						font-size: $font-size-24;
-						background: radial-gradient(circle,rgba(225,86,22,1) 0%,rgba(255,170,0,1) 67%,rgba(249,185,156,1) 100%);
-						float: right;
-					}
+					text-align: center;
+					color: #ffffff;
+					font-size: $font-size-24;
+					background: radial-gradient(
+						circle,
+						rgba(225, 86, 22, 1) 0%,
+						rgba(255, 170, 0, 1) 67%,
+						rgba(249, 185, 156, 1) 100%
+					);
+					float: right;
 				}
-				.pay-checked{
-					width: 100%;
-					height: auto;
-					.pay-item{
-						width: 618rpx;
-						height: 96rpx;
-						border: 2px solid #F5F5F5;
-						border-radius: 30rpx;
-						padding: 20rpx;
-						margin: 24rpx 0;
-						display: flex;
-						background-color: #FFFFFF;
-						&.current{
-							border-color:$color-system;
-							.item-r{
-								.icon-duigou{
-									color: $color-system;
-								}
+			}
+			.pay-checked {
+				width: 100%;
+				height: auto;
+				.pay-item {
+					width: 618rpx;
+					height: 96rpx;
+					border: 2px solid #f5f5f5;
+					border-radius: 30rpx;
+					padding: 20rpx;
+					margin: 24rpx 0;
+					display: flex;
+					background-color: #ffffff;
+					&.current {
+						border-color: $color-system;
+						.item-r {
+							.icon-duigou {
+								color: $color-system;
 							}
 						}
-						.item-l{
-							flex: 8;
-							.item-icon{
-								width: 96rpx;
-								height: 96rpx;
-								float: left;
-								text-align: center;
-								line-height: 96rpx;
-								margin-right: 20rpx;
-								.iconfont{
-									font-size:88rpx;
-								}
-								.icon-weixinzhifu{
-									color: #09BB07;
-								}
-								.icon-gerenwangyinzhifu{
-									color: #034582;
-								}
-								.icon-daewangyinzhuanzhang{
-									font-size: 68rpx;
-									color: #034582;
-								}
-								.icon-qiyewangyinzhifu{
-									color: #004889;
-								}
+					}
+					.item-l {
+						flex: 8;
+						.item-icon {
+							width: 96rpx;
+							height: 96rpx;
+							float: left;
+							text-align: center;
+							line-height: 96rpx;
+							margin-right: 20rpx;
+							.iconfont {
+								font-size: 88rpx;
 							}
-							.item-texts{
-								line-height: 96rpx;
-								font-size:$font-size-26;
-								color: $text-color;
+							.icon-weixinzhifu {
+								color: #09bb07;
 							}
-							.item-text{
-								line-height: 48rpx;
-								font-size:$font-size-26;
-								.txt-p{
-									color: $text-color;
-								}
-								.txt-t{
-									font-size: $font-size-24;
-									color: #999999;
-								}
+							.icon-gerenwangyinzhifu {
+								color: #034582;
+							}
+							.icon-daewangyinzhuanzhang {
+								font-size: 68rpx;
+								color: #034582;
+							}
+							.icon-qiyewangyinzhifu {
+								color: #004889;
 							}
 						}
-						.item-r{
-							flex: 2;
-							text-align: center;
+						.item-texts {
 							line-height: 96rpx;
-							.icon-duigou{
-								font-size: 60rpx;
-								color: #FFFFFF;
+							font-size: $font-size-26;
+							color: $text-color;
+						}
+						.item-text {
+							line-height: 48rpx;
+							font-size: $font-size-26;
+							.txt-p {
+								color: $text-color;
+							}
+							.txt-t {
+								font-size: $font-size-24;
+								color: #999999;
 							}
 						}
 					}
+					.item-r {
+						flex: 2;
+						text-align: center;
+						line-height: 96rpx;
+						.icon-duigou {
+							font-size: 60rpx;
+							color: #ffffff;
+						}
+					}
 				}
 			}
 		}
-		.pay-button{
-			width: 100%;
-			float: left;
-			margin-top:30rpx;
-			.btn{
-				width: 662rpx;
-				height: 88rpx;
-				border-radius: 44rpx;
-				font-size: $font-size-28;
-				line-height: 88rpx;
-				color: #FFFFFF;
-				margin: 0 auto;
-				text-align: center;
-				background:$btn-confirm;
-			}
+	}
+	.pay-button {
+		width: 100%;
+		float: left;
+		margin-top: 30rpx;
+		.btn {
+			width: 662rpx;
+			height: 88rpx;
+			border-radius: 44rpx;
+			font-size: $font-size-28;
+			line-height: 88rpx;
+			color: #ffffff;
+			margin: 0 auto;
+			text-align: center;
+			background: $btn-confirm;
 		}
-		.pay-statustext{
-			width: 100%;
-			height: auto;
-			float: left;
-			margin-top:40rpx;
-			.pay-statustext-inner{
-				width: 662rpx;
+	}
+	.pay-statustext {
+		width: 100%;
+		height: auto;
+		float: left;
+		margin-top: 40rpx;
+		.pay-statustext-inner {
+			width: 662rpx;
+			height: 100%;
+			margin: 0 auto;
+			.pay-icon {
+				width: 62rpx;
 				height: 100%;
-				margin: 0 auto;
-				.pay-icon{
-					width: 62rpx;
-					height: 100%;
-					float: left;
-					text-align: center;
-					.iconfont{
-						color: #FF2A2A;
-						font-size:$font-size-36;
-						line-height: 20rpx;
-					}
-				}
-				.pay-text{
-					width: 560rpx;
-					height: 100%;
-					float: left;
-					line-height: 40rpx;
-					font-size: $font-size-24;
-					color: #FF2A2A;
-					text-align: justify;
+				float: left;
+				text-align: center;
+				.iconfont {
+					color: #ff2a2a;
+					font-size: $font-size-36;
+					line-height: 20rpx;
 				}
 			}
+			.pay-text {
+				width: 560rpx;
+				height: 100%;
+				float: left;
+				line-height: 40rpx;
+				font-size: $font-size-24;
+				color: #ff2a2a;
+				text-align: justify;
+			}
 		}
-		.pay-bring{
-			width: 100%;
-			min-height: 190rpx;
-			padding: 24rpx 0;
-			background-color: #FFFFFF;
-			box-shadow:0px 3px 6px rgba(0,0,0,0.16);
-			position: fixed;
-			bottom: 0;
-			left: 0;
-			border-radius: 30rpx 30rpx 0 0;
+	}
+	.pay-bring {
+		width: 100%;
+		min-height: 190rpx;
+		padding: 24rpx 0;
+		background-color: #ffffff;
+		box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		border-radius: 30rpx 30rpx 0 0;
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		.pay-bring-line {
 			display: flex;
 			align-items: center;
-			flex-direction: column;
-			.pay-bring-line{
-				display: flex;
-				align-items: center;
-				.line{
-					display: inline-block;
-					width: 48rpx;
-					height: 2px;
-					background-color: #707070;
+			.line {
+				display: inline-block;
+				width: 48rpx;
+				height: 2px;
+				background-color: #707070;
+			}
+		}
+		.pay-bring-content {
+			width: 654rpx;
+			height: auto;
+			padding: 0 24rpx;
+
+			.text {
+				font-size: $font-size-24;
+				color: #666;
+				line-height: 44rpx;
+				text-align: center;
+				&.bg-color {
+					color: $color-system;
+					line-height: 88rpx;
 				}
 			}
-			.pay-bring-content{
-				width: 654rpx;
-				height: auto;
-				padding: 0 24rpx;
-				
-				.text{
-					font-size: $font-size-24;
-					color: #666;
+			.text-v {
+				font-size: $font-size-28;
+				color: #4a4f58;
+				line-height: 70rpx;
+				text-align: left;
+				&.bg-color {
 					line-height: 44rpx;
-					text-align: center;
-					&.bg-color{
-						color: $color-system;
-						line-height: 88rpx;
-					}
+					color: $color-system;
 				}
-				.text-v{
-					font-size: $font-size-28;
-					color: #4A4F58;
-					line-height: 70rpx;
-					text-align: left;
-					&.bg-color{
-						line-height: 44rpx;
-						color: $color-system;
-					}
-					.clipboard{
-						width: 84rpx;
-						height: 36rpx;
-						background:linear-gradient(34deg,rgba(255,41,41,1) 0%,rgba(255,109,27,1) 100%);
-						text-align: center;
-						font-size: $font-size-24;
-						color: #FFFFFF;
-						border-radius: 18rpx;
-						line-height: 36rpx;
-						display: inline-block;
-						margin-left: 10rpx;
-					}
+				.clipboard {
+					width: 84rpx;
+					height: 36rpx;
+					background: linear-gradient(34deg, rgba(255, 41, 41, 1) 0%, rgba(255, 109, 27, 1) 100%);
+					text-align: center;
+					font-size: $font-size-24;
+					color: #ffffff;
+					border-radius: 18rpx;
+					line-height: 36rpx;
+					display: inline-block;
+					margin-left: 10rpx;
 				}
-				
 			}
 		}
-		.pay-bring-wrapper{
-			width: 100%;
-			padding: 24rpx 0;
-			background-color: #FFFFFF;
-			display: flex;
-			align-items: center;
-			flex-direction: column;
-			.pay-bring-content{
-				width: 654rpx;
-				height: auto;
-				padding: 0 24rpx;
-				margin-top: 60rpx;
-				.text-title{
-					width: 100%;
+	}
+	.pay-bring-wrapper {
+		width: 100%;
+		padding: 24rpx 0;
+		background-color: #ffffff;
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		.pay-bring-content {
+			width: 654rpx;
+			height: auto;
+			padding: 0 24rpx;
+			margin-top: 60rpx;
+			.text-title {
+				width: 100%;
+				height: 320rpx;
+				margin-bottom: 20rpx;
+				image {
+					width: 320rpx;
 					height: 320rpx;
-					margin-bottom: 20rpx;
-					image{
-						width: 320rpx;
-						height: 320rpx;
-						display: block;
-						margin: 0 auto;
-					}
+					display: block;
+					margin: 0 auto;
 				}
-				.text{
-					font-size: $font-size-24;
-					color: #666;
+			}
+			.text {
+				font-size: $font-size-24;
+				color: #666;
+				line-height: 44rpx;
+				text-align: center;
+				&.bg-color {
+					color: $color-system;
+					line-height: 88rpx;
+				}
+			}
+			.text-v {
+				font-size: $font-size-32;
+				color: #4a4f58;
+				line-height: 70rpx;
+				text-align: center;
+				margin-bottom: 30rpx;
+				&.bg-color {
 					line-height: 44rpx;
-					text-align: center;
-					&.bg-color{
-						color: $color-system;
-						line-height: 88rpx;
-					}
+					color: $color-system;
 				}
-				.text-v{
-					font-size: $font-size-32;
-					color: #4A4F58;
-					line-height: 70rpx;
+				.clipboard {
+					width: 128rpx;
+					height: 48rpx;
+					background: linear-gradient(34deg, #ff2929 0%, #ff6d1b 100%);
 					text-align: center;
-					margin-bottom: 30rpx;
-					&.bg-color{
-						line-height: 44rpx;
-						color: $color-system;
-					}
-					.clipboard{
-						width: 128rpx;
-						height: 48rpx;
-						background:linear-gradient(34deg, #FF2929 0%, #FF6D1B 100%);
-						text-align: center;
-						font-size: $font-size-24;
-						color: #FFFFFF;
-						border-radius: 24rpx;
-						line-height: 48rpx;
-						display: inline-block;
-						margin-left: 10rpx;
-					}
-				}
-				.text-content{
-					width: 100%;
-					height: 160rpx;
-					background-color: #F5F5F5;
-					box-sizing: border-box;
-					padding: 24rpx;
-					line-height: 40rpx;
-					font-size: $font-size-28;
-					color: #666666;
-					text-align: justify;
-					margin-top: 60rpx;
+					font-size: $font-size-24;
+					color: #ffffff;
+					border-radius: 24rpx;
+					line-height: 48rpx;
+					display: inline-block;
+					margin-left: 10rpx;
 				}
 			}
+			.text-content {
+				width: 100%;
+				height: 160rpx;
+				background-color: #f5f5f5;
+				box-sizing: border-box;
+				padding: 24rpx;
+				line-height: 40rpx;
+				font-size: $font-size-28;
+				color: #666666;
+				text-align: justify;
+				margin-top: 60rpx;
+			}
 		}
 	}
-	.freight-alert{
-		width: 100%;
-		height: 100%;
-		background: rgba(0,0,0,.5);
-		position: fixed;
-		top: 0;
+}
+.freight-alert {
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, 0.5);
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 8888;
+	transition: all 0.4s;
+	&.none {
+		display: none;
+	}
+	&.show {
+		display: block;
+	}
+	.content {
+		width: 422rpx;
+		height: 434rpx;
+		position: absolute;
+		background: $bg-color;
 		left: 0;
-		z-index: 8888;
-		transition: all 0.4s;
-		&.none{
-			display: none;
-		}
-		&.show{
-			display: block;
-		}
-		.content{
-			width: 422rpx;
-			height:434rpx;
-			position: absolute;
-			background: $bg-color;
-			left: 0;
-			right: 0;
-			bottom: 0;
-			top: 0;
-			margin: auto;
-			padding: 20rpx 32rpx;
-			border-radius: 12rpx;
-			.title{
-				width: 100%;
+		right: 0;
+		bottom: 0;
+		top: 0;
+		margin: auto;
+		padding: 20rpx 32rpx;
+		border-radius: 12rpx;
+		.title {
+			width: 100%;
+			height: 68rpx;
+			line-height: 68rpx;
+			font-size: $font-size-28;
+			color: $text-color;
+			text-align: center;
+			position: relative;
+			.icon-iconfontguanbi {
+				width: 68rpx;
 				height: 68rpx;
-				line-height: 68rpx;
-				font-size: $font-size-28;
-				color: $text-color;
 				text-align: center;
-				position: relative;
-				.icon-iconfontguanbi{
-					width: 68rpx;
-					height: 68rpx;
-					text-align: center;
-					line-height: 68rpx;
-					position: absolute;
-					right: 0;
-					top: 0;
-					font-size: $font-size-36;
-					color: #999999;
-				}
+				line-height: 68rpx;
+				position: absolute;
+				right: 0;
+				top: 0;
+				font-size: $font-size-36;
+				color: #999999;
 			}
-			.text-content{
-				width: 100%;
-				height: auto;
-				.text{
-					padding: 20rpx 0;
-					line-height: 44rpx;
-					font-size: $font-size-26;
-					color:#666666;
-					text-align: justify;
-				}
-				.text-p{
-					line-height: 44rpx;
-					font-size: $font-size-26;
-					color:$color-system;
-					text-align: left;
-				}
+		}
+		.text-content {
+			width: 100%;
+			height: auto;
+			.text {
+				padding: 20rpx 0;
+				line-height: 44rpx;
+				font-size: $font-size-26;
+				color: #666666;
+				text-align: justify;
+			}
+			.text-p {
+				line-height: 44rpx;
+				font-size: $font-size-26;
+				color: $color-system;
+				text-align: left;
 			}
 		}
 	}
+}
 </style>

+ 1 - 1
pages/user/order/search-order.vue

@@ -107,7 +107,7 @@
 									<view class="goods-pros-t">
 										<view class="pros-img tui-skeleton-fillet">
 											<image :src="pros.image" alt="" />
-											<text class="tips" v-if="pros.productType == 2 || pros.productType == 1"
+											<text class="tips" v-if="pros.giftType == 2 || pros.giftType == 1"
 												>赠品</text
 											>
 										</view>

+ 26 - 3
pages/user/pay/card-under.vue

@@ -16,7 +16,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="pay-bring-wrapper clearfix">
+			<view class="pay-bring-wrapper clearfix" v-if="bankInfo.bankAccount">
 				<view class="pay-bring-content">
 					<view class="text-v title"
 						><text class="label">转账信息</text>
@@ -32,6 +32,20 @@
 					>
 				</view>
 			</view>
+			<view class="pay-bring-wrapper clearfix" v-else>
+				<view class="pay-bring-content">
+					<view class="text-title">
+						<image
+							src="https://static.caimei365.com/app/img/icon/icon-vxkecode.png"
+							mode=""
+							@click="previewImg"
+						></image>
+					</view>
+					<view class="text-content"
+						>请点击上方二维码,长按保存后,使用微信扫码添加采美客服,客服会为您推荐最合适的线下转账方式。</view
+					>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -95,7 +109,6 @@ export default {
 		},
 		//获取供应商线下转账账号
 		async getShopBank(shopId){
-			console.log('shopId', shopId)
 			try {
 				const res = await this.PayService.getShopBank({ shopId: shopId })
 				const data = res.data
@@ -107,6 +120,7 @@ export default {
 				console.log('error', error)
 			}
 		},
+		//复制
 		clipboard() {
 			const data = `开户行:${this.bankInfo.bankName},银行卡号:${this.bankInfo.bankAccount},公司名称:${this.bankInfo.bankAccountName}`
 			thorui.getClipboardData(data, res => {
@@ -116,7 +130,16 @@ export default {
 					this.$util.msg('复制失败', 2000, true, 'none')
 				}
 			}) 
-		}
+		},
+		//顶部商品图片预览
+		previewImg (index) {
+			let previewUrls = this.productImage
+			uni.previewImage({
+				current: 0, 	//图片索引
+				urls: previewUrls, //必须是http图片,本地图片无效
+				longPressActions:''
+			})
+		}				
 	},
 	onShow() {}
 }

+ 1 - 1
services/public.js

@@ -33,7 +33,7 @@ export function uploadFileImage() {
         uni.chooseImage({
             count: 1, //默认1
             sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
-            sourceType: ['album'], //从相册选择
+            sourceType: ['camera','album'], //从相册选择
             success: (res) => {
                 const tempFilePaths = res.tempFilePaths
                 wx.showLoading({ title: '上传中~' })