commit -m 会员接口联调

components/cm-module/listTemplate/buyagainList.vue

@@ -32,16 +32,9 @@
 									</view>
 									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 								</template>
-								<template v-else>
-									<view class="svip-tags" v-if="item.ladderPriceFlag == 2">
-										<view class="tags none">SVIP</view>
-									</view>
-									<view class="svip-tags" v-if="item.ladderPriceFlag == 1">
-										<view class="tags">SVIP</view> <view class="price">8折</view>
-									</view>
-									<view class="svip-tags" v-if="item.ladderPriceFlag == 0">
-										<view class="tags">SVIP</view>
-										<view class="price">￥{{ item.price | NumFormat }}</view>
+								<template v-if="item.svipProductFlag == 1">
+									<view class="svip-tags">
+										<view class="tags">SVIP</view> <view class="price">{{ item.svipPriceTag }}</view>
 									</view>
 								</template>
 							</view>

components/cm-module/listTemplate/immediatelyList.vue

@@ -86,22 +86,15 @@
 							<view class="list-details-price">
 								<view class="floor-item-act">
 									<view class="coupon-tags" v-if="pros.couponsLogo">优惠券</view>
-									<template v-if="pros.actStatus == 1">
+									<template v-if="pros.actStatus==1">
 										<view class="floor-tags" v-if="PromotionsFormat(pros.promotions)">
-											{{ pros.promotions.name }}<text>:￥{{ pros.price | NumFormat }}</text>
+											{{pros.promotions.name}}<text>:￥{{ pros.price | NumFormat }}</text>
 										</view>
-										<view class="floor-tags" v-else>{{ pros.promotions.name }}</view>
+										<view class="floor-tags" v-else>{{pros.promotions.name}}</view>	
 									</template>
-									<template v-else>
-										<view class="svip-tags" v-if="pros.ladderPriceFlag == 2">
-											<view class="tags none">SVIP</view>
-										</view>
-										<view class="svip-tags" v-if="pros.ladderPriceFlag == 1">
-											<view class="tags">SVIP</view> <view class="price">8折</view>
-										</view>
-										<view class="svip-tags" v-if="pros.ladderPriceFlag == 0">
-											<view class="tags">SVIP</view>
-											<view class="price">￥{{ pros.price | NumFormat }}</view>
+									<template v-if="pros.svipProductFlag == 1">
+										<view class="svip-tags">
+											<view class="tags">SVIP</view> <view class="price">{{ pros.svipPriceTag }}</view>
 										</view>
 									</template>
 								</view>

components/cm-module/listTemplate/productList.vue

@@ -31,21 +31,13 @@
 								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 								<template v-if="item.actStatus==1">
 									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-										{{item.promotions.name}}
-										<text v-if="item.priceFlag != 1">:￥{{ item.price | NumFormat }}</text>
+										{{item.promotions.name}}<text>:￥{{ item.price | NumFormat }}</text>
 									</view>
 									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 								</template>
-								<template v-else>
-									<view class="svip-tags" v-if="item.ladderPriceFlag == 2">
-										<view class="tags none">SVIP</view>
-									</view>
-									<view class="svip-tags" v-if="item.ladderPriceFlag == 1">
-										<view class="tags">SVIP</view> <view class="price">8折</view>
-									</view>
-									<view class="svip-tags" v-if="item.ladderPriceFlag == 0">
-										<view class="tags">SVIP</view>
-										<view class="price">￥{{ item.price | NumFormat }}</view>
+								<template v-if="item.svipProductFlag == 1">
+									<view class="svip-tags">
+										<view class="tags">SVIP</view> <view class="price">{{ item.svipPriceTag }}</view>
 									</view>
 								</template>
 							</view>

components/cm-module/productDetails/cm-price.vue

@@ -66,16 +66,9 @@
 								product.promotions.name
 							}}</view>
 						</template>
-						<template v-else>
-							<view class="svip-tags" v-if="product.ladderPriceFlag == 2">
-								<view class="tags none">SVIP</view>
-							</view>
-							<view class="svip-tags" v-if="product.ladderPriceFlag == 1">
-								<view class="tags">SVIP</view> <view class="price">8折</view>
-							</view>
-							<view class="svip-tags" v-if="product.ladderPriceFlag == 0">
+						<template v-if="product.svipProductFlag == 1">
+							<view class="svip-tags">
 								<view class="tags">SVIP</view>
-								<view class="price">￥{{ product.price | NumFormat }}</view>
 							</view>
 						</template>
 					</view>
@@ -116,16 +109,9 @@
 								product.promotions.name
 							}}</view>
 						</template>
-						<template v-else>
-							<view class="svip-tags" v-if="product.ladderPriceFlag == 2">
-								<view class="tags none">SVIP</view>
-							</view>
-							<view class="svip-tags" v-if="product.ladderPriceFlag == 1">
-								<view class="tags">SVIP</view> <view class="price">8折</view>
-							</view>
-							<view class="svip-tags" v-if="product.ladderPriceFlag == 0">
-								<view class="tags">SVIP</view>
-								<view class="price">￥{{ product.price | NumFormat }}</view>
+						<template v-if="product.svipProductFlag == 1">
+							<view class="svip-tags">
+								<view class="tags">SVIP</view> <view class="price">{{ product.svipPriceTag }}</view>
 							</view>
 						</template>
 					</view>
@@ -168,16 +154,9 @@
 									product.promotions.name
 								}}</view>
 							</template>
-							<template v-else>
-								<view class="svip-tags" v-if="product.ladderPriceFlag == 2">
-									<view class="tags none">SVIP</view>
-								</view>
-								<view class="svip-tags" v-if="product.ladderPriceFlag == 1">
-									<view class="tags">SVIP</view> <view class="price">8折</view>
-								</view>
-								<view class="svip-tags" v-if="product.ladderPriceFlag == 0">
-									<view class="tags">SVIP</view>
-									<view class="price">￥{{ product.price | NumFormat }}</view>
+							<template v-if="product.svipProductFlag == 1">
+								<view class="svip-tags">
+									<view class="tags">SVIP</view> <view class="price">{{ product.svipPriceTag }}</view>
 								</view>
 							</template>
 						</view>
@@ -234,16 +213,9 @@
 									product.promotions.name
 								}}</view>
 							</template>
-							<template v-else>
-								<view class="svip-tags" v-if="product.ladderPriceFlag == 2">
-									<view class="tags none">SVIP</view>
-								</view>
-								<view class="svip-tags" v-if="product.ladderPriceFlag == 1">
-									<view class="tags">SVIP</view> <view class="price">8折</view>
-								</view>
-								<view class="svip-tags" v-if="product.ladderPriceFlag == 0">
-									<view class="tags">SVIP</view>
-									<view class="price">￥{{ product.price | NumFormat }}</view>
+							<template v-if="product.svipProductFlag == 1">
+								<view class="svip-tags">
+									<view class="tags">SVIP</view> <view class="price">{{ product.svipPriceTag }}</view>
 								</view>
 							</template>
 						</view>

services/ajax.env.js

@@ -2,9 +2,9 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.67:8008'	 //智捷联调地址
-    // URL_CONFIG = 'http://192.168.2.68:8008'	 	 //涛涛联调地址
+    URL_CONFIG = 'http://192.168.2.68:8008'	 	 //涛涛联调地址
     // URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
+    // URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
     // URL_CONFIG = 'https://spi.caimei365.com'
 }else{ 
     // 生产环境

services/config.env.js

@@ -2,9 +2,9 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.67:18002'	 //智捷联调地址
-    // URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
+    URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
     // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
-    URL_CONFIG = 'https://core-b.caimei365.com'
+    // URL_CONFIG = 'https://core-b.caimei365.com'
     // URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境