修改

pages/goods/good-hot.vue

@@ -124,43 +124,21 @@
 											}}
                                         </text>
                                     </template>
-                                    <template v-if="userIdentity == 4 && vipFlag != 1">
-                                        <view class="price-larger" v-if="pros.priceFlag == 1">
-                                            <text class="txt">￥未公开价格</text>
-                                        </view>
-                                        <view class="price-larger" v-if="pros.priceFlag == 2">
-                                            <text class="txt">￥价格仅会员可见</text>
-                                        </view>
-                                        <view class="price-larger" v-else-if="pros.priceFlag == 3">
-                                            <text class="txt">￥仅医美机构可见</text>
-                                        </view>
-                                        <text v-else class="price-larger" :class="
-												PromotionsFormat(pros.promotions) || pros.svipProductFlag == 1
-													? 'none'
-													: ''
-											">
-                                            ￥{{
-												(PromotionsFormat(pros.promotions) || pros.svipProductFlag == 1
-													? pros.originalPrice
-													: pros.price) | NumFormat
-											}}
-                                        </text>
-                                    </template>
                                     <template v-if="userIdentity == 3">
                                         <template v-if="pros.shopId === shopId">
                                             <view class="price-larger" v-if="pros.priceFlag == 1">
                                                 <text class="txt">￥未公开价格</text>
                                             </view>
                                             <text v-else class="price-larger" :class="
-													PromotionsFormat(pros.promotions) || pros.svipProductFlag == 1
-														? 'none'
-														: ''
-												">
+                                    				PromotionsFormat(pros.promotions) || pros.svipProductFlag == 1
+                                    					? 'none'
+                                    					: ''
+                                    			">
                                                 ￥{{
-													(PromotionsFormat(pros.promotions) || pros.svipProductFlag == 1
-														? pros.originalPrice
-														: pros.price) | NumFormat
-												}}
+                                    				(PromotionsFormat(pros.promotions) || pros.svipProductFlag == 1
+                                    					? pros.originalPrice
+                                    					: pros.price) | NumFormat
+                                    			}}
                                             </text>
                                         </template>
                                         <template v-else>
@@ -170,23 +148,45 @@
                                             </view>
                                         </template>
                                     </template>
-                                    <template v-if="userIdentity == 2 || (userIdentity == 4 && vipFlag == 1)">
-                                        <view class="price-larger" v-if="pros.priceFlag == 1">
+                                    <template v-if="userIdentity === 2 || (userIdentity === 4 && vipFlag === 1)">
+                                        <view class="price-larger" v-if="pros.priceFlag === 1">
                                             <text class="txt">￥未公开价格</text>
                                         </view>
-                                        <view class="price-larger" v-if="pros.priceFlag == 3 && firstClubType != 1">
+                                        <view class="price-larger" v-else-if="pros.priceFlag === 3 && clubType !== 1">
                                             <text class="txt">￥仅医美机构可见</text>
                                         </view>
                                         <text v-else class="price-larger" :class="
-												PromotionsFormat(pros.promotions) || pros.svipProductFlag == 1
-													? 'none'
-													: ''
-											">
+                                    			PromotionsFormat(pros.promotions) || pros.svipProductFlag === 1
+                                    				? 'none'
+                                    				: ''
+                                    		">
                                             ￥{{
-												(PromotionsFormat(pros.promotions) || pros.svipProductFlag == 1
-													? pros.originalPrice
-													: pros.price) | NumFormat
-											}}
+                                    			(PromotionsFormat(pros.promotions) || pros.svipProductFlag === 1
+                                    				? pros.originalPrice
+                                    				: pros.price) | NumFormat
+                                    		}}
+                                        </text>
+                                    </template>
+                                    <template v-if="userIdentity == 4">
+                                        <view class="price-larger" v-if="pros.priceFlag === 1">
+                                            <text class="txt">￥未公开价格</text>
+                                        </view>
+                                        <view class="price-larger" v-else-if="pros.priceFlag === 2">
+                                            <text class="txt">￥价格仅会员可见</text>
+                                        </view>
+                                        <view class="price-larger" v-else-if="pros.priceFlag === 3">
+                                            <text class="txt">￥仅医美机构可见</text>
+                                        </view>
+                                        <text v-else class="price-larger" :class="
+                                    			PromotionsFormat(pros.promotions) || pros.svipProductFlag === 1
+                                    				? 'none'
+                                    				: ''
+                                    		">
+                                            ￥{{
+                                    			(PromotionsFormat(pros.promotions) || pros.svipProductFlag === 1
+                                    				? pros.originalPrice
+                                    				: pros.price) | NumFormat
+                                    		}}
                                         </text>
                                     </template>
                                 </view>
@@ -256,7 +256,7 @@
             }
         },
         computed: {
-            ...mapState(['hasLogin', 'userInfo', 'identity'])
+            ...mapState(['hasLogin', 'userInfo', 'identity','clubType'])
         },
         methods: {
             async initGetStotage() {

pages/login/bindwechat.vue

@@ -10,7 +10,7 @@
 						   v-model="bindLinkName"  
 						   maxlength="30" 
 						   class="input" 
-						   placeholder="请输入姓名"
+						   placeholder="请输入运营人员姓名"
 					/>
 				</view>
 			</view>
@@ -20,7 +20,7 @@
 						   v-model="bindLinkPhone"  
 						   maxlength="11" 
 						   class="input" 
-						   placeholder="请输入手机号"
+						   placeholder="请输入运营人员手机号"
 					/>
 				</view>
 			</view>

pages/seller/components/user.vue

@@ -11,7 +11,7 @@
                 <view class="header-main" v-if="hasLogin">
                     <view class="header-user">
                         <image src="https://static.caimei365.com/app/img/icon/default-head-new.png" mode=""></image>
-                        <view class="user-tips">协销人员</view>
+                        <view class="user-tips">服务商</view>
                     </view>
                    <view class="user-h1">{{ name }}</view>
                 </view>
@@ -128,7 +128,7 @@
                 },
                 CustomBar: this.CustomBar, // 顶部导航栏高度
                 StatusBar: this.StatusBar,
-                bgImgUrl: 'https://static.caimei365.com/app/img/bg/new_seller_cumres@2x.png',
+                bgImgUrl: 'https://static.caimei365.com/app/img/bg/new_home_cumres@2x.png',
                 name: '',
                 headpic: '',
                 userId: '',

pages/seller/login/register-select.vue

@@ -11,7 +11,8 @@
 				<view class="item" @click.stop="this.$api.navigateTo('/pages/seller/login/register-member')">
 					<view class="icon">
 						<image src="https://static.caimei365.com/app/img/icon/icon-member.png" mode=""></image>
-					</view>
+					</view>
+                    <view class="text">资质机构</view>
 				</view>
 			</view>
 			<view class="main-item-text" v-if="insideFLag === 1" @click.stop="this.$api.navigateTo('/pages/seller/login/register-invite')"> 

services/config.env.js

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