Kaynağa Gözat

用户中心、订单列表修改

kevin_zhangl 3 yıl önce
ebeveyn
işleme
995939137f

+ 1 - 33
src/views/profile/components/UserCard.vue

@@ -6,7 +6,7 @@
 
     <div class="user-profile">
       <div class="box-center">
-        <pan-thumb :image="user.avatar" :height="'100px'" :width="'100px'" :hoverable="false">
+        <pan-thumb :image="tool.getArImage(user.avatar, '/files/')" :height="'100px'" :width="'100px'" :hoverable="false">
           <div>Hello</div>
         </pan-thumb>
       </div>
@@ -68,22 +68,6 @@
 						</el-row>
 					</div>
 
-					<div class="progress-item" style="margin-top: 15px;">
-						<el-row>
-							<el-col :span="12">
-								<div class="grid-content bg-purple">
-									<i class="el-icon-s-data"></i>
-									<span>Remain BV</span>
-								</div>
-							</el-col>
-							<el-col :span="12">
-								<div class="grid-content bg-purple-light">
-									<span>VIP</span>
-								</div>
-							</el-col>
-						</el-row>
-					</div>
-
 					<div class="progress-item" style="margin-top: 15px;">
 						<el-row>
 							<el-col :span="12">
@@ -131,22 +115,6 @@
 							</el-col>
 						</el-row>
 					</div>
-
-					<div class="progress-item" style="margin-top: 15px;">
-						<el-row>
-							<el-col :span="12">
-								<div class="grid-content bg-purple">
-									<i class="el-icon-time"></i>
-									<span>Active Deadline Date</span>
-								</div>
-							</el-col>
-							<el-col :span="12">
-								<div class="grid-content bg-purple-light">
-									<span>VIP</span>
-								</div>
-							</el-col>
-						</el-row>
-					</div>
 				</div>
 			</div>
     </div>

+ 0 - 10
src/views/shop/car-fund-products.vue

@@ -32,11 +32,6 @@
 					<span>{{ row.SELL_PRICE }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column :label="$t('shop.productBV')" align="center" prop="PRICE_PV">
-				<template slot-scope="{row}">
-					<span>{{ row.PRICE_PV }}</span>
-				</template>
-			</el-table-column>
 			<el-table-column :label="$t('shop.taxRate')" align="center" prop="TAX_RATE">
 				<template slot-scope="{row}">
 					<span>{{ row.TAX_RATE / 100  }}</span>
@@ -67,7 +62,6 @@
 			</div>
 			<div class="flex data" style="float: right; display: inline-block; line-height: 35px; font-size: 14px; margin-top: 20px; border: 1px solid #dcdfe6; border-radius: 4px; padding: 0 15px;">
 				<div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productPrice') }}:{{ $t('currency.sign') }} {{ sellPriceSum }}</div>
-				<div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productBV') }}:{{ $t('currency.sign') }} {{ pricePvSum }}</div>
 				<div style="display: inline-block;">{{ $t('shop.taxAmount') }}:{{ $t('currency.sign') }} {{ taxSum }}</div>
 			</div>
 		</div>
@@ -115,7 +109,6 @@ export default {
 			tool: tool,
 			multipleSelection: [],
 			sellPriceSum: 0.00,
-			pricePvSum: 0.00,
 			taxSum: 0.00,
 			storeNums: [],
 			display: false,
@@ -182,12 +175,10 @@ export default {
 				let accumulatorSellPrice = 0, accumulatorPricePv = 0, accumulatorTax = 0
 				this.multipleSelection.forEach(item => {
 					item.forEach(accumulator => { accumulatorSellPrice += accumulator.SELL_PRICE * accumulator.chose_num * accumulator.DISCOUNT / 100; })
-					item.forEach(accumulator => { accumulatorPricePv += Number(accumulator.PRICE_PV) * Number(accumulator.chose_num) * (Number(accumulator.DISCOUNT) / 100); })
 					item.forEach(accumulator => { accumulatorTax += tool.calculateTax(Number(accumulator.SELL_PRICE), Number(accumulator.TAX_RATE), Number(accumulator.chose_num)); })
 				})
 
 				this.sellPriceSum = tool.formatPrice(accumulatorSellPrice)
-				this.pricePvSum = tool.formatPrice(accumulatorPricePv)
 				this.taxSum = tool.formatPrice(accumulatorTax)
 
 				this.display = true
@@ -221,7 +212,6 @@ export default {
 	watch: {
 		// 监听多选按钮,判断结算按钮是否可用
 		multipleSelection: function (modern) {
-			console.log(modern, modern.length)
 			this.$data.display = modern.length > 0
 		},
 	},

+ 0 - 1
src/views/shop/standard-products.vue

@@ -221,7 +221,6 @@
 		watch: {
 			// 监听多选按钮,判断结算按钮是否可用
 			multipleSelection: function (modern) {
-				console.log(modern, modern.length)
 				this.$data.display = modern.length > 0
 			},
 		},

+ 1 - 11
src/views/shop/villa-fund-products.vue

@@ -32,11 +32,6 @@
 					<span>{{ row.SELL_PRICE }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column :label="$t('shop.productBV')" align="center" prop="PRICE_PV">
-				<template slot-scope="{row}">
-					<span>{{ row.PRICE_PV }}</span>
-				</template>
-			</el-table-column>
 			<el-table-column :label="$t('shop.taxRate')" align="center" prop="TAX_RATE">
 				<template slot-scope="{row}">
 					<span>{{ row.TAX_RATE / 100  }}</span>
@@ -67,7 +62,6 @@
 			</div>
 			<div class="flex data" style="float: right; display: inline-block; line-height: 35px; font-size: 14px; margin-top: 20px; border: 1px solid #dcdfe6; border-radius: 4px; padding: 0 15px;">
 				<div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productPrice') }}:{{ $t('currency.sign') }} {{ sellPriceSum }}</div>
-				<div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productBV') }}:{{ $t('currency.sign') }} {{ pricePvSum }}</div>
 				<div style="display: inline-block;">{{ $t('shop.taxAmount') }}:{{ $t('currency.sign') }} {{ taxSum }}</div>
 			</div>
 		</div>
@@ -115,7 +109,6 @@ export default {
 			tool: tool,
 			multipleSelection: [],
 			sellPriceSum: 0.00,
-			pricePvSum: 0.00,
 			taxSum: 0.00,
 			storeNums: [],
 			display: false,
@@ -164,7 +157,7 @@ export default {
 			let pageList = this.multipleSelection[this.currentPage]
 			let selectStatus = false
 			for (let i in pageList) {
-				if( pageList[i].ID === row.ID ) {
+				if (pageList[i].ID === row.ID) {
 					pageList[i].chose_num = val
 					selectStatus = true
 					break
@@ -182,12 +175,10 @@ export default {
 				let accumulatorSellPrice = 0, accumulatorPricePv = 0, accumulatorTax = 0
 				this.multipleSelection.forEach(item => {
 					item.forEach(accumulator => { accumulatorSellPrice += accumulator.SELL_PRICE * accumulator.chose_num * accumulator.DISCOUNT / 100; })
-					item.forEach(accumulator => { accumulatorPricePv += Number(accumulator.PRICE_PV) * Number(accumulator.chose_num) * (Number(accumulator.DISCOUNT) / 100); })
 					item.forEach(accumulator => { accumulatorTax += tool.calculateTax(Number(accumulator.SELL_PRICE), Number(accumulator.TAX_RATE), Number(accumulator.chose_num)); })
 				})
 
 				this.sellPriceSum = tool.formatPrice(accumulatorSellPrice)
-				this.pricePvSum = tool.formatPrice(accumulatorPricePv)
 				this.taxSum = tool.formatPrice(accumulatorTax)
 
 				this.display = true
@@ -221,7 +212,6 @@ export default {
 	watch: {
 		// 监听多选按钮,判断结算按钮是否可用
 		multipleSelection: function (modern) {
-			console.log(modern, modern.length)
 			this.$data.display = modern.length > 0
 		},
 	},