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

pages.json

@@ -507,7 +507,7 @@
 				{
 					"path": "member/member-product",
 					"style": {
-						"navigationBarTitleText": "优惠商品",
+						"navigationBarTitleText": "专享价商品",
 						"enablePullDownRefresh": true
 					}
 				}

pages/user/member/member.vue

@@ -49,7 +49,9 @@
 			<view class="cm-member-privilege clearfix">
 				<view class="privilege-item" v-for="(priv, index) in privilegeList" :key="index">
 					<image class="image" :src="priv.icon" mode=""></image>
-					<view class="text-2">{{ priv.privText }}</view> <view class="text-3">{{ priv.privName }}</view>
+					<view class="text-2">{{ priv.privText }}</view> 
+					<view class="text-3">{{ priv.privName }}</view>
+					<view class="text-3">{{ priv.privName1 ? priv.privName1 : '&ensp;&ensp;&ensp;' }}</view>
 				</view>
 			</view>
 		</view>
@@ -103,7 +105,7 @@
 		</view>
 		<view class="cm-member-main none" :style="{ paddingBottom: popupShow ? '260rpx' : '0rpx' }">
 			<view class="title">
-				优惠商品
+				专享价商品
 				<view class="more" @click="hanldPayUrl('/pages/user/member/member-product')"
 					>更多<text class="iconfont icon-xiayibu"></text
 				></view>
@@ -240,50 +242,54 @@ export default {
 			payList: [],
 			privilegeList: [
 				{
-					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer1@2x.png',
-					privText: '优惠商品',
-					privName: '超级会员专享'
-				},
-				{
-					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer2@2x.png',
-					privText: '专属优惠券',
-					privName: '每三个月可领'
+					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer7@2x.png',
+					privText: '延长优惠期限',
+					privName: '到期后延长30天',
+					privName1:null
 				},
 				{
-					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer9@2x.png',
-					privText: '免运费',
-					privName: '下单全包邮'
+					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer8@2x.png',
+					privText: '分期付',
+					privName: '生美仪器分期付',
+					privName1:'(年卡专享)'
 				},
 				{
-					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer3@2x.png',
-					privText: '采美豆翻倍',
-					privName: '下单返采美豆'
+					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer5@2x.png',
+					privText: '专属客户经理',
+					privName: '采购顾问',
+					privName1:'售后服务'
 				},
 				{
-					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer4@2x.png',
-					privText: '专属客服',
-					privName: '一对一'
+					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer1@2x.png',
+					privText: '专享价商品',
+					privName: '超级会员专享',
+					privName1:null
 				},
 				{
-					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer5@2x.png',
-					privText: '专属销售顾问',
-					privName: '一对一'
+					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer2@2x.png',
+					privText: '专属优惠券',
+					privName: '每三个月可领',
+					privName1:null
 				},
 				{
 					icon: 'https://static.caimei365.com/app/img/icon/icon-member-prer6@2x.png',
 					privText: '新品试用',
-					privName: '新品可优先试用'
+					privName: '新品可优先试用',
+					privName1:null
 				},
 				{
-					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-prer9@2x.png',
+					privText: '免运费',
+					privName: '下单全包邮',
+					privName1:null
 				},
 				{
-					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: '采美豆翻倍',
+					privName: '下单返采美豆',
+					privName1:null
 				}
+				
 			],
 			listQuery: {
 				userId: 0,