订单

components/cm-module/cm-cart-temp/cm-unit-popup.vue

@@ -7,45 +7,8 @@
 					<view class="tui-sku-image"> <image :src="skuProduct.image" mode=""></image> </view>
 					<view class="tui-sku-price">
 						<view class="sku-price-viw">
-							<view class="sku-price-text"
-								  :class="PromotionsFormat(skuProduct.promotions) || skuProduct.svipProductFlag == 1 ? 'none' : ''"
-							>
-								￥{{
-									(PromotionsFormat(skuProduct.promotions) || skuProduct.svipProductFlag == 1
-										? skuProduct.originalPrice
-										: skuProduct.price) | NumFormat
-								}}
-							</view>
-						</view>
-						<view class="sku-price-vip">
-							<view class="floor-item-act">
-								<view class="coupon-tags" v-if="skuProduct.couponsLogo">优惠券</view>
-								<template v-if="skuProduct.actStatus == 1 && skuProduct.promotions">
-									<view v-if="PromotionsFormat(skuProduct.promotions)" class="floor-tags">
-										{{ skuProduct.promotions.name }}
-										<text v-if="skuProduct.promotions != null && skuProduct.promotions.type != 3">
-											:￥{{
-												skuProduct.promotions == null
-													? '0.00'
-													: skuProduct.promotions.touchPrice | NumFormat
-											}}
-										</text>
-									</view>
-									<view v-else-if="skuProduct.promotions.type != 3" class="floor-tags">
-										{{ skuProduct.promotions.name }}
-									</view>
-								</template>
-								<template v-if="skuProduct.actStatus == null && skuProduct.ladderFlag == 1">
-									<view class="floor-tags">阶梯价格</view>
-								</template>
-								<template v-if="skuProduct.svipProductFlag == 1">
-									<view class="svip-tags">
-										<view class="tags" :class="{ none: vipFlag != 1 }">SVIP</view>
-										<view class="price" v-if="isShowVipFlag(skuProduct)">{{
-											skuProduct.svipPriceTag
-										}}</view>
-									</view>
-								</template>
+							<view class="sku-price-text">
+								￥{{ skuProduct.price }}
 							</view>
 						</view>
 					</view>
@@ -60,14 +23,11 @@
 							:key="index"
 							:class="skuIndex === index ? 'active' : ''"
 						>
-							{{ sku.unit }} <text class="tips" v-if="sku.stock === 0">缺货</text>
+							{{ sku.unit }} 
 						</view>
 					</view>
 				</view>
 				<view class="sku-unit-nunbox">
-					<view class="sku-unit-nunbox" v-if="skuProduct.step === 2">
-						<view class="text">*该商品只能以起订量的整数倍购买</view>
-					</view>
 					<view class="sku-unit-nunbox-t">
 						<view class="sku-unit-nunbox-text">购买数量:</view>
 						<view class="sku-unit-nunbox-num">
@@ -167,7 +127,6 @@ export default {
 	methods: {
 		async initData(data) {
 			const userInfo = await this.$api.getStorage()
-			this.vipFlag = userInfo.vipFlag ? userInfo.vipFlag : 0
 			this.addParams.userId = userInfo.userId ? userInfo.userId : 0
 			this.userIdentity = userInfo.userIdentity ? userInfo.userIdentity : 0
 		},
@@ -198,20 +157,12 @@ export default {
 			if ( this.addParams.count <= this.handleMinNumber) {
 				this.addParams.count = this.handleMinNumber
 			} else {
-				if (this.skuProduct.step == 2) {
-					this.addParams.count -= this.handleMinNumber
-				} else {
-					this.addParams.count--
-				}
+				this.addParams.count--
 			}
 		},
 		skuChangNumberAdd() {// 加数
 			if(this.addParams.count === this.handleStock){ return }
-			if (this.skuProduct.step === 2) {
-				this.addParams.count += this.handleMinNumber;
-			} else {
-				this.addParams.count++;
-			}
+			this.addParams.count++;
 		},
 		skuChangNumberChange() {// 修改
 			if (this.addParams.count < this.handleMinNumber || this.addParams.count % this.handleMinNumber != 0) {

components/uni-grade/uni-grade.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="grade" :style="{marginTop:margin+'rpx'}">
+		<text class="grade-text">￥</text>
 		<image :src="staticUrl + 'icon-grade'+grade+'@2x.png'" mode=""></image>
 	</view>
 </template>
@@ -32,13 +33,21 @@
 
 <style lang="scss">
 	.grade{
-		width: 118rpx;
+		width: 200rpx;
 		height: 36rpx;
 		float: left;
+		.grade-text{
+			display: inline-block;
+			float: left;
+			line-height: 36rpx;
+			font-size: 24rpx;
+			color: #666;
+		}
 		image{
 			width: 118rpx;
 			height: 36rpx;
-			display: block;
+			display: inline-block;
+			float: left;
 		}
 	}
 </style>

pages/goods/components/cm-prams-popup.vue

@@ -11,12 +11,12 @@
 							product.brandName == null ? '其他' : product.brandName
 						}}</view>
 					</view>
-					<view class="content-tr">
+					<!-- <view class="content-tr">
 						<view class="content-td">分类</view>
 						<view class="content-th">{{
 							product.typeName == null ? '暂无' : product.typeName
 						}}</view>
-					</view>
+					</view> -->
 					<view class="content-tr">
 						<view class="content-td">包装规格</view>
 						<view class="content-th">{{ skuStext }}</view>
@@ -65,7 +65,7 @@
 			}
 		},
 		created() {
-			let newArray = this.product.skus
+			let newArray = this.product.organizeSkus
 			this.skuStext = newArray.map(item =>{ return item.unit }).join(',')
 		},
 		methods:{

pages/goods/components/cm-price.vue

@@ -3,7 +3,6 @@
 	<view class="wrap-main">
 		<template v-if="!hasLogin">
 			<view class="p-login grade tui-skeleton-fillet">
-				<text class="p-no">￥</text>
 				<uni-grader :grade="Number(product.priceGrade)"></uni-grader>
 				<view class="floor-item-btn"> <view class="btn" @click.stop="loginClick">登录查看价格</view> </view>
 			</view>

pages/goods/components/cm-unit-popup.vue

@@ -20,7 +20,8 @@
 								:key="index"
 								:class="skuIndex === index ? 'active' : ''"
 							>
-								{{ sku.unit }} <text class="tips" v-if="sku.stock === 0">缺货</text>
+								{{ sku.unit }} 
+								<!-- <text class="tips" v-if="sku.stock === 0">缺货</text> -->
 							</view>
 						</view>
 					</view>

pages/goods/components/cm-unit-price.vue

@@ -6,7 +6,6 @@
 			<template v-if="!hasLogin">
 				<!-- 游客 -->
 				<view class="sku-price-text">
-					<text class="sku-price-l">￥</text>
 					<uni-grader :grade="Number(skuProduct.priceGrade)"></uni-grader>
 				</view>
 			</template>

pages/goods/product.vue

@@ -91,6 +91,7 @@
 					</view>
 					<view class="product-item-none" v-if="goodsData.disabled">
 						<image class="none-image" :src="staticUrl + 'icon_product_none@2x.png'" mode=""></image>
+						<view class="none-text">商品已下架~</view>
 					</view>
 					<!-- 选择规格 -->
 					<view class="product-parameter" @click="showPopup(3)">
@@ -338,7 +339,7 @@ export default {
 					this.productImage.push(item.image)
 				})
 				//处理下架商品和售罄商品
-				if (this.product.validFlag == 3) {
+				if (this.product.validFlag == 2) {
 					this.goodsData.disabledText = '下架'
 					this.goodsData.disabled = true
 				}
@@ -773,15 +774,14 @@ page {
 			}
 		}
 		.floor-item-btn {
-			float: right;
+			float: left;
 			height: 40rpx;
 			margin-top: 8rpx;
-			margin-left: 10rpx;
 			.btn {
 				line-height: 40rpx;
 				padding: 0 20rpx;
 				height: 40rpx;
-				background: $btn-confirm;
+				background: #F85050;
 				color: #ffffff;
 				font-size: $font-size-20;
 				border-radius: 4rpx;
@@ -863,6 +863,12 @@ page {
 		width: 386rpx;
 		height: 286rpx;
 	}
+	.none-text {
+		text-align: center;
+		font-size: $font-size-28;
+		color: #fea785;
+		line-height: 40rpx;
+	}
 }
 .product-supporting {
 	width: 100%;

pages/login/login.vue

@@ -46,7 +46,7 @@
 					<input
 						type="text"
 						v-model="accountParams.mobileOrEmail"
-						maxlength="30"
+						maxlength="11"
 						class="input"
 						placeholder="请输入已注册的手机号"
 						@input="handleMobileOrEmail"
@@ -55,7 +55,7 @@
 				<view class="login-input">
 					<text class="iconfont icon-mima"></text>
 					<input
-						type="text"
+						type="password"
 						v-model="accountParams.password"
 						maxlength="18"
 						class="input"

pages/login/register.vue

@@ -313,7 +313,8 @@ export default {
 				platformType: 2
 			},
 			handleAddress:'请选择机构所在地区',
-			isCheckedCode:false
+			isCheckedCode:false,
+			isSubLoading:false
 		}
 	},
 	onLoad(option) {},
@@ -377,6 +378,7 @@ export default {
 		},
 		handleConfirm(){
 			// 提交审核
+			if(this.isSubLoading) { return }
 			if (this.params.name == '') {
 				this.$util.msg('请输入机构名称', 2000)
 				return
@@ -414,6 +416,7 @@ export default {
 					self.wxLogin(res.userInfo)
 					self.params.nickName = res.userInfo.nickName
 					self.params.avatarUrl = res.userInfo.avatarUrl
+					
 					self.userAccountRegister(self.params)
 				},
 				fail() {
@@ -424,10 +427,14 @@ export default {
 		async userAccountRegister(params) {
 			// 注册
 			try{
+				this.isSubLoading = true
 				await this.UserService.userAccountRegister(params)
+				wxLogin.wxLoginAuthorize()
+				this.isSubLoading = false
 				this.modal1 = true
 			}catch(error){
 				this.$util.msg(error.msg, 2000)
+				this.isSubLoading = false
 			}
 		},
 		storeUpdataeStatus(data) {
@@ -560,7 +567,6 @@ export default {
 			this.modal = false
 		},
 		handleClick1(){
-			wxLogin.wxLoginAuthorize()
 			setTimeout(()=>{
 				this.$api.switchTabTo('/pages/tabBar/user/user')
 			},1000)

pages/search/search.vue

@@ -390,7 +390,6 @@
                                 </template>
                             </view>
                             <view v-else class="list-login-now">
-                                <text class="p-no">￥</text>
                                 <uni-grader :grade="Number(pros.priceGrade)"></uni-grader>
                             </view>
                         </view>

pages/tabBar/home/index.vue

@@ -18,6 +18,8 @@
 			<!-- 楼层模块 -->
 			<floors :list="floorList" v-if="skeletonShow"></floors>
 		</view>
+		<!-- 侧边 -->
+		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
 	</view>
 </template>
 
@@ -39,11 +41,6 @@ export default {
 	onLoad() {},
 	onPageScroll(e) {
 		//实时获取到滚动的值
-		if (e.scrollTop > 50) {
-			this.inputActive = 'fixed'
-		} else {
-			this.inputActive = 'float'
-		}
 		if (e.scrollTop > 400) {
 			this.isScrollTop = true
 		} else {
@@ -52,14 +49,14 @@ export default {
 	},
 	onPullDownRefresh() {
 		//下拉刷新
-		this.getHomeInformation()
+		this.mallOrganizeHome()
 		uni.stopPullDownRefresh()
 	},
 	onShareAppMessage(res) {
 		//分享转发
 		if (res.from === 'button') {
 			// 来自页面内转发按钮
-		}
+		} 
 		return {
 			title: '联合丽格集采商城',
 			path: 'pages/tabBar/home/index',

pages/tabBar/user/user.vue

@@ -19,7 +19,7 @@
 					</view>
 					<view class="header-text">
 						<view class="user-item"
-							><text class="user-item-none">{{ underInfo.name }}</text></view
+							><text class="user-item-none">{{ underInfo.name | nameFilters }}</text></view
 						>
 					</view>
 				</view>
@@ -34,7 +34,7 @@
 					</view>
 					<view class="header-text">
 						<view class="user-item"
-							><text class="u-h1">{{ underInfo.name }}</text></view
+							><text class="u-h1">{{ underInfo.name | nameFilters }}</text></view
 						>
 						<view class="user-item">
 							<view class="user-item-tips none">
@@ -197,23 +197,8 @@ export default {
 			CustomBar: this.CustomBar, // 顶部导航栏高度
 			StatusBar: this.StatusBar,
 			userId: 0,
-			isModify: false,
 			isCmcustom: false,
 			name: '',
-			userType: '',
-			shopPhoto: '',
-			userVip: {}, // 超级会员信息
-			userBeans: 0,
-			userMoney: '0.00',
-			couponNum: 0,
-			bankNum: 0,
-			contactNumber: '',
-			openid: '',
-			aboutHtml: '',
-			telPhone: '',
-			isSvip: false,
-			isSvipType: 2,
-			userIdentity: '', // 机构等级
 			confirmedCount: 0, // 待确认
 			paymentCount: 0, // 待付款角标
 			waitShipmentsCount: 0, // 待收货角标
@@ -245,9 +230,18 @@ export default {
 			isUnderLogin: false
 		}
 	},
+	filters: {
+		nameFilters(value) {
+			if(value && value.length>15){
+				return value.substring(0,15)+"..." 
+			}else{
+				return value
+			}
+		}
+	},
 	onLoad(option) {},
 	computed: {
-		...mapState(['hasLogin', 'userInfo', 'isWxAuthorize'])
+		...mapState(['hasLogin', 'userInfo', 'isWxAuthorize']),
 	},
 	methods: {
 		...mapMutations(['updateNoticeNum']),
@@ -415,7 +409,7 @@ page {
 			}
 			.user-item-none{
 				font-size: $font-size-32;
-				line-height: 50rpx;
+				line-height: 120rpx;
 				color: #ffffff;
 				text-align: left;
 				display: inline-block;

pages/user/order/components/details/goodsList.vue

@@ -58,10 +58,6 @@
 						<view class="price-view-le">商品总额：</view>
 						<view class="price-view-ri">￥{{ item.totalAmount | NumFormat }}</view>
 					</view>
-					<view class="pros-price-view" v-if="item.isHandelShow">
-						<view class="price-view-le">优惠：</view>
-						<view class="price-view-ri">￥{{ item.eachDiscount | NumFormat }}</view>
-					</view>
 					<view class="pros-price-view" v-if="item.isHandelShow">
 						<view class="price-view-le">应付金额：</view>
 						<view class="price-view-ri">￥{{ item.realPay | NumFormat }}</view>

pages/user/order/components/details/orderInformation.vue

@@ -10,96 +10,48 @@
 				</view>
 			</view>
 			<view class="information-view same">
-				<view class="view-num">
-					订单总额：<label class="label">￥{{ orderData.payTotalFee | NumFormat }}</label>
+				<view class="view-num bold">
+					订单标识：<label class="label">{{ orderData.orderMark ? orderData.orderMark : '' }}</label>
 				</view>
 			</view>
 			<view class="information-view">
-				<view class="view-num bold">
-					订单标识：<label class="label">{{ orderData.orderMark ? orderData.orderMark : '' }}</label>
+				<view class="view-num time">
+					下单时间：<label class="label">{{ orderData.orderTime ? orderData.orderTime : '' }}</label>
 				</view>
 			</view>
 			<view class="information-view same">
 				<view class="view-num">
-					待付金额：<text class="red">￥{{ orderData.pendingPayments | NumFormat }}</text>
+					订单总额：<label class="label">￥{{ orderData.payTotalFee | NumFormat }}</label>
 				</view>
-				<view class="view-man"></view>
 			</view>
 			<template v-if="openShowflag">
 				<view class="information-view">
-					<view class="view-num time">
-						下单时间：<label class="label">{{ orderData.orderTime ? orderData.orderTime : '' }}</label>
-					</view>
-					<!-- <view class="view-type">{{ orderData.status | TextFormat }}</view> -->
-				</view>
-				<!-- <view class="information-view same">
-					<view class="view-num">
-						余额抵扣：<label class="label">￥{{ orderData.balancePayFee | NumFormat }}</label>
-					</view>
-				</view> -->
-				<view class="information-view same">
-					<view class="view-num" v-if="orderData.postageFlag == 0">
-						运费：<label class="label">包邮</label>
-					</view>
-					<view class="view-num" v-if="orderData.postageFlag == -1">
-						运费：<label class="label">到付</label>
-					</view>
-					<view class="view-num" v-if="orderData.postageFlag == 1">
-						运费：<label class="label">￥{{ orderData.postage | NumFormat }}</label>
-					</view>
-				</view>
-				<!-- <view class="information-view same" v-if="orderData.svipFullReduction > 0">
-					<view class="view-man">
-						超级会员优惠：<label class="label">￥{{ orderData.svipFullReduction | NumFormat }}</label>
-					</view>
-				</view>
-				<view class="information-view" v-if="orderData.userBeans > 0">
-					<view class="view-man">
-						采美豆抵用运费：<label class="label">{{ orderData.userBeans }}</label>
-					</view>
-				</view>
-				<view class="information-view same" v-if="orderData.discountFee && orderData.discountFee > 0">
 					<view class="view-num">
-						经理折扣：<label class="label">￥{{ orderData.discountFee | NumFormat }}</label>
-					</view>
-				</view>
-				<view
-					class="information-view"
-					v-if="orderData.promotionFullReduction && orderData.promotionFullReduction > 0"
-				>
-					<view class="view-man">
-						促销满减：<label class="label">￥{{ orderData.promotionFullReduction | NumFormat }}</label>
+						待付金额：<text class="red">￥{{ orderData.pendingPayments | NumFormat }}</text>
 					</view>
+					<view class="view-man"></view>
 				</view>
 				<view class="information-view same">
-					<view class="view-man">
-						优惠券：<label class="label">￥{{ orderData.couponAmount | NumFormat }}</label>
-					</view>
-				</view>
-				<view class="information-view">
-					<view class="view-man">
-						赠品总数：<label class="label">{{
-							orderData.presentCount + orderData.promotionalGiftsCount
-						}}</label>
-					</view>
-				</view> -->
-				<view class="information-view">
 					<view class="view-man">
 						应付总额：<label class="red">￥{{ orderData.payableAmount | NumFormat }}</label>
 					</view>
 				</view>
-				<view class="information-view same">
+				<view class="information-view">
 					<view class="view-num">
 						已支付：<label class="red">￥{{ orderData.receiptAmount | NumFormat }}</label>
 					</view>
 					<view class="view-man"></view>
 				</view>
+				<view class="information-view none">
+					<view class="view-num">
+						运费：<label class="label">{{ orderData.postageInfo }}</label>
+					</view>
+				</view>
 			</template>
 		</view>
 		<view class="openinfo" v-if="infoflag">
 			<view class="btnInfo" @click="openShow">
-				查看更多
-				<text class="iconfont icon-xiangxiajiantou"></text>
+				查看更多 <text class="iconfont icon-xiangxiajiantou"></text>
 			</view>
 		</view>
 	</view>
@@ -213,6 +165,10 @@ export default {
 				width: 45%;
 				text-align: right;
 			}
+			&.none {
+				width: 100%;
+				text-align: left;
+			}
 			// &.title{
 			// 	height: 68rpx;
 			// 	line-height: 68rpx;
@@ -312,7 +268,7 @@ export default {
 	width: 100%;
 	height: 48rpx;
 	margin-bottom: 30rpx;
-	.btnInfo{
+	.btnInfo {
 		width: 168rpx;
 		height: 48rpx;
 		line-height: 46rpx;

pages/user/order/create-order.vue

@@ -257,6 +257,9 @@ export default {
 				this.designatedFlag = data.designatedFlag
 				this.hanldFreePostFlag = data.postageFlag
 				this.hanldFreight = data.postage
+				if(this.designatedFlag === 2){
+					this.confirmParam.payInfo.isColdChina = 0
+				}
 				this.attributePallPrice()
 			} catch (error) {
 				console.log('获取订单运费异常')
@@ -265,10 +268,11 @@ export default {
 		//获取地址信息
 		async getAddressData() {
 			try {
+				const userInfo = await this.$api.getStorage()
 				const res = await this.UserService.QueryAddressList({
 					pageNum: 1,
 					pageSize: 1,
-					userId: this.postageParam.userId
+					userId: userInfo.userId
 				})
 				const data = res.data
 				this.isAddress = true
@@ -353,7 +357,7 @@ export default {
 			if (this.isSubLoading) {
 				return
 			}
-			if (this.confirmParam.addressId == '') {
+			if (this.confirmParam.addressId === 0) {
 				this.$util.msg('请先添加收货地址～', 2000)
 				return
 			}