Merge remote-tracking branch 'origin/developer' into developerB

components/cm-module/creatOrder/freight.vue

@@ -3,7 +3,7 @@
 		 <!-- 运费信息 -->
 		<view class="invoice-freight">
 			<view class="freight-main">
-				<view class="freight-left">运费<text class="tips" v-if="freightData.postageFlag == 1">运费可选择到付哟~</text></view>
+				<view class="freight-left">运费<text class="tips" v-if="freightData.postageFlag == 1 && vipFlag!=1">运费可选择到付哟~</text></view>
 				<view class="freight-right" >
 					<view class="freight-text">{{freightText}}</view>
 					<view class="select" v-if="freightData.postageFlag == 1"  @click.stop="selectFreight">
@@ -32,7 +32,7 @@
 
 <script>
 	export default{
-		name:"freight",
+		name:'freight',
 		props:{
 			freightData:{
 				type:Object
@@ -51,7 +51,7 @@
 				userBeans:0,
 				deductionBeans:0,
 				freightBeansMoney:0,
-				
+				vipFlag:0
 			}
 		},
 		created(){
@@ -61,8 +61,10 @@
 
 		},
 		methods:{
-			initData(res) {
-				this.infoData = res;
+			async initData(res) {
+				const userInfo = await this.$api.getStorage()
+				this.vipFlag = userInfo.vipFlag ? userInfo.vipFlag : 0
+				this.infoData = res
 				switch(res.postageFlag){
 					case 0:
 						this.freightText = '包邮'
@@ -108,7 +110,8 @@
 				}
 			},
 			selectFreight (){//切换运费
-				let self = this,value;
+				if(this.vipFlag==1){ return }
+				let self = this
 				uni.showActionSheet({
 				    itemList: self.optionList,
 				    success: function (res) {
@@ -150,19 +153,19 @@
 								postageFlag :self.postageFlag,
 								freightBeansMoney: self.freightBeansMoney
 							}
-						self.$emit('confirmFreight',obj);
+						self.$emit('confirmFreight',obj)
 				    },
 				    fail: function (res) {
-				        console.log(res.errMsg);
+				        console.log(res.errMsg)
 				    }
-				});
+				})
 			},
 			checkedBalabce(){//勾选使用采美豆抵扣
 				this.ischecked = !this.ischecked
-				this.$emit('confirmFreightBeans',this.ischecked);
+				this.$emit('confirmFreightBeans',this.ischecked)
 			},
 			orderPriceToFixed (value){
-				let price ='';
+				let price =''
 				if(value == '到付'){
 					price = value
 				}else{
@@ -175,7 +178,7 @@
 				this.selectClass = ''
 			},
 			showTip(){
-				this.$emit('showFreightAlert');
+				this.$emit('showFreightAlert')
 			},
 		}
 	}

components/cm-module/listTemplate/immediatelyList.vue

@@ -279,6 +279,7 @@ export default {
 			priceLoading: true,
 			isShowEmpty: false,
 			isShowEmptyText: '搜索相关商品',
+			userId:0,
 			clubUserId: '',
 			identity: 0,
 			isFocus: false,
@@ -324,6 +325,7 @@ export default {
 		async initGetStotage() {// 初始化
 			const userInfo = await this.$api.getStorage()
 			const clubInfo = await this.$api.getComStorage('orderUserInfo')
+			this.userId = userInfo.userId ? userInfo.userId : 0
 			this.identity = userInfo.userIdentity ? userInfo.userIdentity : 0
 			this.clubUserId = clubInfo.userId ? clubInfo.userId : 0
 			this.getProductAgainInfo()
@@ -410,7 +412,7 @@ export default {
 			productIds = productIdArr.join(',')
 			this.ProductService.querySearchProductPrice({
 				flag:this.identity, //查询促销标记 1协销 2机构 3供应商
-				userId: this.clubUserId,
+				userId: this.userId,
 				productIds: productIds,
 				source: 2
 			})

pages/user/member/member.vue

@@ -247,6 +247,11 @@ export default {
 					privText: '专属优惠券',
 					privName: '超级会员专享'
 				},
+				{
+					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer8@2x.png',
+					privText: '免运费',
+					privName: '下单全包邮'
+				},
 				{
 					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer3@2x.png',
 					privText: '采美豆翻倍',
@@ -271,11 +276,6 @@ export default {
 					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer7@2x.png',
 					privText: '售后服务',
 					privName: '会员加速'
-				},
-				{
-					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer8@2x.png',
-					privText: '敬请期待',
-					privName: '更多特权'
 				}
 			],
 			listQuery: {