lilei il y a 1 an
Parent
commit
d72416d2d2
2 fichiers modifiés avec 14 ajouts et 20 suppressions
  1. 13 19
      pages/sales/productPricing.vue
  2. 1 1
      pages/userCenter/index.vue

+ 13 - 19
pages/sales/productPricing.vue

@@ -38,7 +38,7 @@
 					<view class="price-all flex" v-if="selPriceShow">
 						<view class="price-item1" v-if="priceList[0].checked">
 							<text>{{(item.offerCost||item.offerCost==0)?toThousands(item.offerCost,2):'--'}} </text>
-							<view>成本价</view>
+							<view>参考成本价</view>
 						</view>
 						<view class="price-item1" v-if="priceList[1].checked">
 							<text>{{(item.cityPrice || item.cityPrice==0)?toThousands(item.cityPrice,2):'--'}} </text>
@@ -48,7 +48,7 @@
 							<text>{{(item.specialPrice||item.specialPrice==0)?toThousands(item.specialPrice,2):'--'}} </text>
 							<view>特约价</view>
 						</view>
-						<view class="price-item2" v-if="priceList[3].checked">
+						<view class="price-item1" v-if="priceList[3].checked">
 							<text>{{(item.terminalPrice||item.terminalPrice==0)?toThousands(item.terminalPrice,2):'--'}}/{{item.dealerProductPrice&&(item.dealerProductPrice.terminalPrice||item.dealerProductPrice.terminalPrice==0)?toThousands(item.dealerProductPrice.terminalPrice,2):'--'}}  </text>
 							<view>终端价/自定义终端价</view>
 						</view>
@@ -79,7 +79,7 @@
 				listData:[],
 				totalNum:0,
 				priceList:[
-					{ name: '成本价', checked: false, val: 'offerCost' },
+					{ name: '参考成本价', checked: false, val: 'offerCost' },
 					{ name: '市级价', checked: false, val: 'cityPrice' },
 					{ name: '特约价', checked: false, val: 'specialPrice' },
 					{ name: '终端价/自定义终端价', checked: false, val: 'terminalPrice' },
@@ -114,18 +114,19 @@
 				return a.length > 0
 			},
 			tabList(){
+				let ret = this.priceList
 				if(!this.$hasPermissions('M_showCostPrice_mobile')){
-					return this.priceList.slice(1,4)
+					ret = this.priceList.slice(1,4)
 				}
 				// 特约价
 				if(this.dealerData){
-					if(this.dealerData.dealerType1 == 'special'){
-						return this.priceList.filter((item, index) => index !== 1)
+					if(this.dealerData.dealerLevel == 'SPECIAL'){
+						return ret.filter((item, index) => index !== 1)
 					}else{
-						return this.priceList.filter((item, index) => index !== 2)
+						return ret.filter((item, index) => index !== 2)
 					}
 				}
-				return this.priceList
+				return ret
 			}
 		},
 		onLoad(option) {
@@ -260,21 +261,14 @@
 						}
 						.price-all{
 							border-top: 1px solid #e4e7ed;
-							padding: 20upx 20upx 0;
+							padding: 20upx 20upx 0 20upx;
+							flex:1;
 							.price-item1{
-								width: 18%;
-								border-right:  1px solid #e4e7ed;
-								text-align: center;
-								>view{
-									color:#999;
-								}
-							}
-							.price-item2{
-								width: 46%;
-								border-right:  none;
+								width: 33%;
 								text-align: center;
 								>view{
 									color:#999;
+									font-size:0.8em;
 								}
 							}
 						}

+ 1 - 1
pages/userCenter/index.vue

@@ -12,7 +12,7 @@
 				<text class="user-name">{{userData.orgName}}</text>
 				<view class="flex align-item">
 					<text class="user-phone">{{userData.username}}</text>
-					<text class="user-closeAccount" @click="closeAccount">注销账户</text>
+					<text class="user-closeAccount" v-if="isIos" @click="closeAccount">注销账户</text>
 				</view>
 			</view>
 			<view class="user-org" @click="show = true" v-if="orglist&&orglist.length">