commit -m 订单

components/cm-module/productDetails/cm-unit-popup.vue

@@ -9,7 +9,7 @@
 						<view class="sku-price-viw">
 							<view
 								class="sku-price-text">
-								￥{{skuProduct.price | NumFormat}}
+								￥{{skuProductPrice | NumFormat}}
 							</view>
 						</view>
 					</view>
@@ -102,7 +102,6 @@ export default {
 	},
 	data() {
 		return {
-			vipFlag: 0, // 是否是超级会员 0否 1是
 			skuIndex: 0,
 			isStock: false, //
 			isQuantity: false, 
@@ -117,7 +116,8 @@ export default {
 				userId: 0,
 				source: 1
 			},
-			isBtnDisabled: false
+			isBtnDisabled: false,
+			skuProductPrice:''
 		}
 	},
 	filters: {
@@ -135,11 +135,11 @@ export default {
 	methods: {
 		async initData() {
 			const userInfo = await this.$api.getStorage()
-			this.vipFlag = userInfo.vipFlag ? userInfo.vipFlag : 0
 			this.addParams.userId = userInfo.userId ? userInfo.userId : 0
 			this.addParams.productId = this.skuProduct.productId
-			this.skuList = this.skuProduct.skus
+			this.skuList = this.skuProduct.organizeSkus
 			this.productCount = this.skuList[0].minBuyNumber
+			this.skuProductPrice =this.skuList[0].price
 			this.addParams.skuId = this.skuList[0].skuId
 			this.handleMinNumber = this.skuList[0].minBuyNumber
 			this.handleStock = this.skuList[0].stock
@@ -210,10 +210,6 @@ export default {
 			if (!this.$api.isNumber(_value)) {
 				this.productCount = this.handleMinNumber
 			} else if (_value < this.handleMinNumber) {
-				this.$util.msg(`该商品最小起订量为${this.handleMinNumber}`, 2000)
-				this.productCount = this.handleMinNumber
-			} else if (_value % this.handleMinNumber != 0) {
-				this.$util.msg('购买量必须为起订量的整数倍', 2000)
 				this.productCount = this.handleMinNumber
 			} else if (_value > this.handleStock) {
 				this.productCount = this.handleStock
@@ -258,6 +254,7 @@ export default {
 			this.addParams.skuId = sku.skuId
 			this.handleStock = sku.stock
 			this.isBtnDisabled = sku.stock === 0
+			this.skuProductPrice = sku.price
 			this.$emit('skuClick', sku)
 		},
 		hidePopup() {

pages/login/password.vue

@@ -81,6 +81,15 @@ export default {
 				smsCode:'',
 				password: '',
 				passwordConfirm: '',
+				status:1
+			},
+			codeParams:{
+				mobile:'',
+				isCheckCaptcha:1,
+				activateCodeType:1,
+				platformType:2,
+				imgCode:'',
+				token:'',
 			}
 		}
 	},
@@ -135,7 +144,7 @@ export default {
 		//调用
 		async ModifyMobilePassword(phoneParams) {
 			try {
-				const res = this.UserService.ModifyMobilePassword(phoneParams)
+				const res = await this.UserService.ModifyMobilePassword(phoneParams)
 				this.$util.msg(res.msg, 2000, true, 'success')
 				setTimeout(() => {
 					uni.navigateBack({
@@ -158,7 +167,8 @@ export default {
 				return
 			}
 			this.isMobileDisabled = true
-			this.getMobileCode(this.phoneParams)
+			this.codeParams.mobile = this.phoneParams.mobileOrEmail
+			this.getMobileCode(this.codeParams)
 		},
 		//获取短信
 		async getMobileCode(params) {

pages/user/collection/collection.vue

@@ -260,7 +260,7 @@ export default {
 				})
 		},
 		handleSkuClick(sku) {
-			this.handleData.price = sku.price
+			// this.handleData.price = sku.price
 		},
 		ProductCartNumber() {
 			// 获取用户购物车储量

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

@@ -10,7 +10,7 @@
 					</view>
 					<view class="address">
 						<view class="address-icon">
-							<text class="iconfont icon-shouhuodizhi"></text>
+							<text class="iconfont icon-shouhuodizhi1"></text>
 						</view>
 						<view class="address-text">
 							{{addressData.province ? addressData.province : ''}}
@@ -98,7 +98,7 @@
 			background: #fff;
 		}
 		
-		.icon-shouhuodizhi {
+		.icon-shouhuodizhi1 {
 			flex-shrink: 0;
 			display: flex;
 			align-items: center;

pages/user/order/order-list.vue

@@ -37,7 +37,7 @@
 				@animationfinish="onChange"
 				:style="{ height: winHeight + 'px' }"
 			>
-				<swiper-item v-for="(tabItem, index) in orderTabBar" :key="index">
+				<swiper-item v-for="(tabItem, index) in orderTabBar" :key="index" @touchmove.stop="">
 					<scroll-view scroll-y class="scoll-y tui-skeleton" @scrolltolower="scrolltolower">
 						<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="tui-skeleton clearfix">
 							<!-- 空白页 -->
@@ -257,7 +257,7 @@ export default {
 		if (e.type === 'detele') {
 			this.isDelete = true
 		}
-		const evStateMap = { 2:1, 3:2, 4:3, 5:4 }
+		const evStateMap = { 0:0,2:1, 3:2, 4:3, 5:4 }
 		this.currentTab = evStateMap[e.state]
 		console.log('currentTab',this.currentTab)
 		this.isOnloadFlag = true
@@ -485,7 +485,7 @@ export default {
 			}
 			return {
 				title: '您有新的分享订单，快来查看吧~',
-				path: `/pages/user/order/order-sharelogin?orderId=${this.handleOrderId}&userId=${this.userId}`,
+				path: `/pages/user/order/order-sharelogin?orderId=${this.handleOrderId}&userId=${this.listQuery.userId}`,
 				imageUrl: 'https://static.caimei365.com/app/mini-mcare/icon/icon_shareOrder@2x.png'
 			}
 		},

pages/user/pay/card-order.vue

@@ -353,7 +353,9 @@ export default {
 			}
 			switch (this.tabCurrentIndex) {
 				case 0: // 微信支付
-					this.MiniWxPayFor()
+					this.contentModalText = '暂不支持微信支付~'
+					this.modal = true
+					// this.MiniWxPayFor()
 					break
 				case 1: // 企业网银
 					this.payType = '1'

pages/user/setting/phone.vue

@@ -96,14 +96,6 @@ export default {
 				this.$util.msg('请输入正确的手机号码', 2000)
 				return
 			}
-			if (this.params.smsCode == '') {
-				this.$util.msg('请输入旧手机验证码', 2000)
-				return
-			}
-			if (!this.$reg.isMobileCode(this.params.smsCode)) {
-				this.$util.msg('旧手机验证码格式不正确', 2000)
-				return
-			}
 			if (this.params.newSmsCode == '') {
 				this.$util.msg('请输入新手机验证码', 2000)
 				return

services/user.service.js

@@ -177,7 +177,7 @@ export default class UserService {
 	 */
     ModifyMobilePassword(data = {}) {
         return this.AjaxService.post({
-            url: '/user/update/password',
+            url: '/user/updateOrganize/password',
             data,
             isLoading: true,