Merge branch 'master' of https://gitea.lihaink.cn/mkm/new_shop_app

components/popups/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<uni-popup ref="popup" type="bottom" safeArea backgroundColor="#fff" :animation="true">
+	<uni-popup ref="popup" type="bottom" safeArea backgroundColor="#fff" :animation="true" @maskClick="maskClick">
 		<view class="keyboard">
 			<view class="keyboard-left">
 				<block v-for="(item,indx) in keys" :key="indx">
@@ -7,7 +7,7 @@
 						{{item}}
 					</view>
 					<view class="keyboard-left-item active del" v-else @click="handleClick(item)">
-						<image style="width: 60rpx;height: 60rpx;" src="@/static/del.webp" />
+						<image style="width: 48rpx;height: 48rpx;" src="@/static/del.webp" />
 					</view>
 				</block>
 			</view>
@@ -68,6 +68,9 @@
 
 			// 付款
 			handlePay() {
+				if (this.value && this.value.lastIndexOf('.') + 1 == this.value.length) {
+					this.value = this.value.substring(0, this.value.length - 1);
+				}
 				this.$emit('confirm', this.value);
 				this.handleClose();
 			},
@@ -80,6 +83,12 @@
 			// 关闭
 			handleClose() {
 				this.$refs.popup.close();
+			},
+			maskClick() {
+				if (this.value && this.value.lastIndexOf('.') + 1 == this.value.length) {
+					this.value = this.value.substring(0, this.value.length - 1);
+				}
+				this.$emit('change', this.value);
 			}
 		}
 	}

components/uni-transition/uni-transition.vue

@@ -1,279 +0,0 @@
-<template>
-	<view v-if="isShow" ref="ani" class="uni-transition" :class="[ani.in]" :style="'transform:' +transform+';'+stylesObject"
-	 @click="change">
-		 <slot></slot>
-	</view>
-</template>
-
-<script>
-	// #ifdef APP-NVUE
-	const animation = uni.requireNativePlugin('animation');
-	// #endif
-	/**
-	 * Transition 过渡动画
-	 * @description 简单过渡动画组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=985
-	 * @property {Boolean} show = [false|true] 控制组件显示或隐藏
-     * @property {Array} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
-     *  @value fade 渐隐渐出过渡
-     *  @value slide-top 由上至下过渡
-     *  @value slide-right 由右至左过渡
-     *  @value slide-bottom 由下至上过渡
-     *  @value slide-left 由左至右过渡
-     *  @value zoom-in 由小到大过渡
-     *  @value zoom-out 由大到小过渡
-	 * @property {Number} duration 过渡动画持续时间
-	 * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
-	 */
-	export default {
-		name: 'uniTransition',
-		props: {
-			show: {
-				type: Boolean,
-				default: false
-			},
-			modeClass: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			duration: {
-				type: Number,
-				default: 300
-			},
-			styles: {
-				type: Object,
-				default () {
-					return {}
-				}
-			}
-		},
-		data() {
-			return {
-				isShow: false,
-				transform: '',
-				ani: { in: '',
-					active: ''
-				}
-			};
-		},
-		watch: {
-			show: {
-				handler(newVal) {
-					if (newVal) {
-						this.open()
-					} else {
-						this.close()
-					}
-				},
-				immediate: true
-			}
-		},
-		computed: {
-			stylesObject() {
-				let styles = {
-					...this.styles,
-					'transition-duration': this.duration / 1000 + 's'
-				}
-				let transfrom = ''
-				for (let i in styles) {
-					let line = this.toLine(i)
-					transfrom += line + ':' + styles[i] + ';'
-				}
-				return transfrom
-			}
-		},
-		created() {
-			// this.timer = null
-			// this.nextTick = (time = 50) => new Promise(resolve => {
-			// 	clearTimeout(this.timer)
-			// 	this.timer = setTimeout(resolve, time)
-			// 	return this.timer
-			// });
-		},
-		methods: {
-			change() {
-				this.$emit('click', {
-					detail: this.isShow
-				})
-			},
-			open() {
-				clearTimeout(this.timer)
-				this.isShow = true
-				this.transform = ''
-				this.ani.in = ''
-				for (let i in this.getTranfrom(false)) {
-					if (i === 'opacity') {
-						this.ani.in = 'fade-in'
-					} else {
-						this.transform += `${this.getTranfrom(false)[i]} `
-					}
-				}
-				this.$nextTick(() => {
-					setTimeout(() => {
-						this._animation(true)
-					}, 50)
-				})
-
-			},
-			close(type) {
-				clearTimeout(this.timer)
-				this._animation(false)
-			},
-			_animation(type) {
-				let styles = this.getTranfrom(type)
-				// #ifdef APP-NVUE
-				if(!this.$refs['ani']) return
-				animation.transition(this.$refs['ani'].ref, {
-					styles,
-					duration: this.duration, //ms
-					timingFunction: 'ease',
-					needLayout: false,
-					delay: 0 //ms
-				}, () => {
-					if (!type) {
-						this.isShow = false
-					}
-					this.$emit('change', {
-						detail: this.isShow
-					})
-				})
-				// #endif
-				// #ifndef APP-NVUE
-				this.transform = ''
-				for (let i in styles) {
-					if (i === 'opacity') {
-						this.ani.in = `fade-${type?'out':'in'}`
-					} else {
-						this.transform += `${styles[i]} `
-					}
-				}
-				this.timer = setTimeout(() => {
-					if (!type) {
-						this.isShow = false
-					}
-					this.$emit('change', {
-						detail: this.isShow
-					})
-
-				}, this.duration)
-				// #endif
-
-			},
-			getTranfrom(type) {
-				let styles = {
-					transform: ''
-				}
-				this.modeClass.forEach((mode) => {
-					switch (mode) {
-						case 'fade':
-							styles.opacity = type ? 1 : 0
-							break;
-						case 'slide-top':
-							styles.transform += `translateY(${type?'0':'-100%'}) `
-							break;
-						case 'slide-right':
-							styles.transform += `translateX(${type?'0':'100%'}) `
-							break;
-						case 'slide-bottom':
-							styles.transform += `translateY(${type?'0':'100%'}) `
-							break;
-						case 'slide-left':
-							styles.transform += `translateX(${type?'0':'-100%'}) `
-							break;
-						case 'zoom-in':
-							styles.transform += `scale(${type?1:0.8}) `
-							break;
-						case 'zoom-out':
-							styles.transform += `scale(${type?1:1.2}) `
-							break;
-					}
-				})
-				return styles
-			},
-			_modeClassArr(type) {
-				let mode = this.modeClass
-				if (typeof(mode) !== "string") {
-					let modestr = ''
-					mode.forEach((item) => {
-						modestr += (item + '-' + type + ',')
-					})
-					return modestr.substr(0, modestr.length - 1)
-				} else {
-					return mode + '-' + type
-				}
-			},
-			// getEl(el) {
-			// 	console.log(el || el.ref || null);
-			// 	return el || el.ref || null
-			// },
-			toLine(name) {
-				return name.replace(/([A-Z])/g, "-$1").toLowerCase();
-			}
-		}
-	}
-</script>
-
-<style>
-	.uni-transition {
-		transition-timing-function: ease;
-		transition-duration: 0.3s;
-		transition-property: transform, opacity;
-	}
-
-	.fade-in {
-		opacity: 0;
-	}
-
-	.fade-active {
-		opacity: 1;
-	}
-
-	.slide-top-in {
-		/* transition-property: transform, opacity; */
-		transform: translateY(-100%);
-	}
-
-	.slide-top-active {
-		transform: translateY(0);
-		/* opacity: 1; */
-	}
-
-	.slide-right-in {
-		transform: translateX(100%);
-	}
-
-	.slide-right-active {
-		transform: translateX(0);
-	}
-
-	.slide-bottom-in {
-		transform: translateY(100%);
-	}
-
-	.slide-bottom-active {
-		transform: translateY(0);
-	}
-
-	.slide-left-in {
-		transform: translateX(-100%);
-	}
-
-	.slide-left-active {
-		transform: translateX(0);
-		opacity: 1;
-	}
-
-	.zoom-in-in {
-		transform: scale(0.8);
-	}
-
-	.zoom-out-active {
-		transform: scale(1);
-	}
-
-	.zoom-out-in {
-		transform: scale(1.2);
-	}
-</style>

pages/index/index.vue

@@ -88,8 +88,11 @@
 						<!-- 首页推荐 -->
 						<view v-if="recommend_switch == 1" class="index-product-wrapper">
 							<!-- 首发新品 -->
-							<recommend ref="recommendRef" :hostProduct="hostProduct"  @changeRecommedTab="changeRecommedTab" showTab :indexP="true" :isLogin="isLogin"></recommend>
+							<recommend ref="recommendRef" :hostProduct="hostProduct"
-							<view class="loadingicon acea-row row-center-wrapper" v-if="hostProduct.length > 0 || hotLoading">
+								@changeRecommedTab="changeRecommedTab" showTab :indexP="true" :isLogin="isLogin">
+							</recommend>
+							<view class="loadingicon acea-row row-center-wrapper"
+								v-if="hostProduct.length > 0 || hotLoading">
 								<text class="loading iconfont icon-jiazai" :hidden="hotLoading == false"></text>
 								{{ hotTitle }}
 							</view>

pages/order_details/index.vue

@@ -252,8 +252,25 @@
 			<view v-if="orderInfo.order_extend" class='wrapper'>
 				<view v-for="(item,index) in orderInfo.order_extend" v-if="item" :key="index"
 					class='item acea-row row-between'>
-					<view>{{index}}：</view>
+					<!-- <view>{{index}}：</view> -->
-					<view v-if="!Array.isArray(item)" class='conter'>{{item}}</view>
+					<view v-if="!Array.isArray(item)" class='banks' style="width: 100%;">
+						<view class="conter-item">
+							<text class="conter-item-name">公司名称:</text>
+							<text>{{item.company_name}}</text>
+						</view>
+						<view class="conter-item">
+							<text class="conter-item-name">对公账号:</text>
+							<text>{{item.corporate_account}}</text>
+						</view>
+						<view class="conter-item">
+							<text class="conter-item-name">开户行:</text>
+							<text>{{item.corporate_bank}}</text>
+						</view>
+						<view class="conter-item">
+							<text class="conter-item-name">开户行地址:</text>
+							<text>{{item.corporate_bank_address}}</text>
+						</view>
+					</view>
 					<view v-else class='conter virtual_image'>
 						<image v-for="(pic,i) in item" :key="i" class="picture" :src="pic"
 							@click="getPhotoClickIdx(item,i)"></image>
@@ -286,12 +303,16 @@
 				v-if="isGoodsReturn==false && (orderInfo.status != 0 || (orderInfo.status == 0 && refundNum.length != cartInfo.length && orderInfo.refund_status && orderInfo.refund_switch))">
 			</view>
 			<view class='footer acea-row row-right row-middle' v-if="isGoodsReturn==false && orderInfo.status != 0">
-				<view v-if="!orderInfo.receipt && !isGoodsReturn && orderInfo.open_receipt == 1" class='bnt cancel'
+				<!-- <view v-if="!orderInfo.receipt && !isGoodsReturn && orderInfo.open_receipt == 1" class='bnt cancel'
-					@click="applyInvoice">申请开票</view>
+					@click="applyInvoice">申请开票</view> -->
+				<view v-if="!isGoodsReturn && (orderInfo.status == 0 || orderInfo.status == 1 || orderInfo.status == 2)"
+					class='bnt cancel' @click="applyInvoice">申请开票</view>
+
 				<view v-if="orderInfo.activity_type == 2 && (orderInfo.status == 10 || orderInfo.status == 11)"
 					class=" acea-row row-right row-middle" style="margin-left: 17rpx;">
 					<view v-if="orderInfo.presellOrder.activeStatus == 0" class='bnt b-color btn_auto'>
-						{{ orderInfo.presellOrder.final_start_time | filterDay }} 付尾款</view>
+						{{ orderInfo.presellOrder.final_start_time | filterDay }} 付尾款
+					</view>
 					<view v-if="orderInfo.presellOrder.activeStatus == 1" class='bnt b-color' @tap='pay_open'>立即付款
 					</view>
 					<view v-if="orderInfo.presellOrder.activeStatus == 2" class='bnt cancel' @click="cancelOrder">取消订单
@@ -323,9 +344,10 @@
 				</block>
 				<block v-if="orderInfo.status == 3">
 					<view class='bnt cancel' @click="delOrder">删除订单</view>
-					<view class="bnt cancel" @click="allRefund"
+					<!-- 已完成 不能退款 -->
+					<!-- <view class="bnt cancel" @click="allRefund"
 						v-if="refundNum.length != cartInfo.length && orderInfo.refund_status && orderInfo.refund_switch == 1">
-						批量退款</view>
+						批量退款</view> -->
 					<view class='bnt b-color' @click="goOrderConfirm"
 						v-if="orderInfo.activity_type!=1 && orderInfo.activity_type!=2 && orderInfo.activity_type!=3 && orderInfo.activity_type!=4 && orderInfo.activity_type!=10">
 						再次购买</view>
@@ -1297,6 +1319,29 @@
 		text-align: right;
 	}
 
+	.order-details .wrapper .item .bank {
+		color: #868686;
+	}
+
+	.order-details .wrapper .item .conter-item {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+
+		.conter-item-name {
+			width: 140rpx;
+			white-space: nowrap;
+		}
+
+		text {
+			&:nth-child(2) {
+				width: 80%;
+				text-align: right;
+				color: #868686;
+			}
+		}
+	}
+
 	.order-details .wrapper .item .virtual_image {
 		margin-left: 50rpx;
 	}

pages/order_details/stay.vue

@@ -190,6 +190,7 @@
 					<view>积分抵扣：</view>
 					<view class='conter'>-￥{{orderInfo.integral_price}}</view>
 				</view>
+
 				<view class='item acea-row row-between' v-if="orderInfo.pay_type != 10">
 					<view>实付款：</view>
 					<view class='conter'>￥{{orderInfo.pay_price}}</view>
@@ -197,14 +198,14 @@
 
 				<view class='item acea-row row-between' v-else>
 					<view>付款凭证：</view>
-					<view class='conter'>
+					<view class='conter'
+						v-if="orderInfo.orderList[0] && orderInfo.orderList[0].order_extend && orderInfo.orderList[0].order_extend.corporate_voucher">
 						<image style="width: 400rpx;height:340rpx"
-							src="http://lihai001.oss-cn-chengdu.aliyuncs.com/def/2023-12-05/202312051513438570.jpg">
+							:src="orderInfo.orderList[0].order_extend.corporate_voucher">
 						</image>
-						<!-- <image :src="orderInfo.orderList[0].order_extend.corporate_voucher"></image> -->
 					</view>
+					<text v-else style="color:#868686;">暂无凭证</text>
 				</view>
-				<!-- <view class='actualPay acea-row row-right'>实付款：<text class='money font-color'>￥{{orderInfo.pay_price}}</text></view> -->
 			</view>
 			<view class="content-clip"></view>
 			<view class='footer acea-row row-right row-middle'>

pages/payment/get_payment.vue

@@ -215,6 +215,9 @@
 					})
 				}
 
+				if (this.cartForm.total_amount.endsWith('.')) this.cartForm.cartForm.total_amount = this.cartForm
+					.cartForm.total_amount.replace('.', '');
+
 				// 循环加入购物车
 				for (var i = 0; i < that.merchantInfo.length; i++) {
 					let info = {
@@ -268,17 +271,14 @@
 			},
 
 			getProductInfoByMerid(merid, money) {
-				console.log(123123);
 				getProductInfo({
 					mer_id: that.mer_id,
 					money: that.cartForm.total_amount
 				}).then(res => {
-					console.log(res);
 					if (!that.cartForm.total_amount) {
 						this.mer_name = res.data.merchant;
 					} else {
 						that.merchantInfo = res.data.list;
-						// this.mer_name = res.data.merInfo;
 					}
 				}).catch((err) => {
 					that.tips = err.message || err.smg || err;
@@ -417,7 +417,6 @@
 
 		.v-con {
 			margin: 0 auto 150rpx;
-			box-shadow: 0 -4rpx 0px 0px #fff;
 
 			.v-con-text {
 				font-weight: 400;

pages/store/home/index.vue

@@ -30,7 +30,7 @@
 					</view>
 					<view class="shop-info-eva">
 						<view class="star">
-							<u-rate count="5" :value="score.star" size="12" activeColor="#FFBC21"
+							<u-rate readonly count="5" :value="score.star" size="12" activeColor="#FFBC21"
 								inactiveColor="transparent"></u-rate>
 							<text
 								style="color:#FFBC21;font-size: 12px;margin: 0 10rpx 0 4rpx;">{{ score.number.toFixed(1) }}</text>
@@ -1275,6 +1275,7 @@
 					color: #FFFFFF;
 					display: flex;
 					align-items: flex-end;
+
 					text {
 						max-width: 480rpx;
 						white-space: nowrap;
@@ -1319,6 +1320,7 @@
 					color: #FFFFFF;
 					display: flex;
 					align-items: center;
+
 					text {
 						max-width: 480rpx;
 						white-space: nowrap;

pages/users/order_list/index.vue

@@ -12,7 +12,7 @@
 						<view v-if="mer_info.mer_settlement_agree_status" class="tab_item"
 							:class="{'tab_item_active': sale_type==2}" @click="changeSaleType(2)">商户订单</view>
 					</view>
-					<view class="btn_car">
+					<view class="btn_car" @click="toGwc">
 						<text class="iconfont icon-gouwuche" style="font-size: 36rpx;"></text>
 					</view>
 				</view>
@@ -175,7 +175,7 @@
 													</view>
 
 													<!-- <text
-														style="font-size: 22rpx;background-color: #ecfaed;color: #40ae36;border-radius: 40rpx;padding: 5rpx 10rpx;">{{(item.merchant && item.merchant.cloud_warehouse) || ''}}</text> -->
+														style="">{{(item.merchant && item.merchant.cloud_warehouse) || ''}}</text> -->
 												</view>
 
 											</view>
@@ -262,11 +262,14 @@
 										</view>
 										<view class='text acea-row row-between'>
 											<view class='name '>
-												<view class='name line2'>
+												<view class='name line2' style="margin-bottom:12rpx;">
 													<text v-if="goods.product_type != 0 && goods.product_type != 10"
 														:class="'font_bg-red type'+goods.product_type">{{goods.product_type == 1 ? "秒杀" : goods.product_type == 2 ? "预售" : goods.product_type == 3 ? "助力" : goods.product_type == 4 ? "拼团" : ""}}</text>
 													<text>{{goods.cart_info.product.store_name}}</text>
 												</view>
+												<text
+													style="font-size: 22rpx;background-color: #ecfaed;color: #40ae36;border-radius: 40rpx;padding: 5rpx 10rpx;">
+													{{(item.merchant && item.merchant.cloud_warehouse) || ''}}</text>
 												<view style="margin-top: 10rpx;" class="t-color">
 													{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
 												</view>
@@ -480,6 +483,13 @@
 		onReady() {},
 		mounted: function() {},
 		methods: {
+			// 购物车
+			toGwc() {
+				uni.switchTab({
+					url: "/pages/order_addcart/order_addcart"
+				})
+			},
+
 			navBack() {
 				uni.navigateBack();
 			},