app 改价

ghsApp/src/admin/changePrice/components/Item.vue

@@ -12,8 +12,11 @@
 					<view class="open-bx" >
 						还剩 <text style="margin-left:8upx;color:#333333;">{{ parseFloat(info.stock) }}</text>
 						<text style="margin-left:30upx;color:#999999" v-if="info.status ==2">已下架</text>
+						<view class="price-area">
 						<input class="change-input" @click.stop @blur="savePrice"
-						@focus="modifyPrice = ''" placeholder-style="color:#CCCCCC" v-model="modifyPrice" type="digit" placeholder="填写价格" />
+						@focus="modifyPrice = ''" placeholder-style="color:#CCCCCC" v-model="modifyPrice" type="digit" placeholder="填价格" />
+						<view v-if="Number(modifyPrice)>0" class="change-text">成本{{parseFloat((Number(modifyPrice)-Number(info.addPrice)).toFixed(2))}} 加价{{parseFloat(info.addPrice)}}</view>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -165,19 +168,26 @@ export default {
 				*.warn {
 					color: $redColor;
 				}
-				.change-input {
-					width: 160upx;
-					height: 60upx;
-					line-height: 60upx;
-					text-align: center;
-					background: #ffffff;
-					border: 1upx solid #b4b4b4;
-					border-radius: 4upx;
-					font-size: 25upx;
+				.price-area{
+					width:190upx;
 					position: absolute;
 					top:50upx;
-					right:20upx;
-					color:#777777;
+					right:0upx;
+					.change-input {
+						width: 150upx;
+						height: 60upx;
+						line-height: 60upx;
+						text-align: center;
+						background: #ffffff;
+						border: 1upx solid #b4b4b4;
+						border-radius: 4upx;
+						font-size: 25upx;
+						color:#777777;
+						display:inline-block;
+					}
+					.change-text{
+						font-size:22upx;
+					}
 				}
 			}
 		}

ghsApp/src/admin/ptItem/components/Item.vue

@@ -3,9 +3,12 @@
 		<view class="img_bx" style="background:#eeeeee">
 			<image :src="info.cover" v-if="isImg"></image>
 		</view>
-		<view class="cmd-info_bx" :class="type == STOCK_TYPE.WARN?'':'active'">
+		<view class="cmd-info_bx">
 			<view class="tit">{{ info.name || "" }}</view>
-			<view class="kc">{{info.className}}<text v-if="info.select == 2" style="color:#1f1cc0;float:right;margin-right:80upx;">已导入</text></view>
+			<view class="kc">{{info.className}}
+				<text v-if="info.select == 2" style="color:#1f1cc0;float:right;margin-right:80upx;">已导入</text>
+				<text v-else style="color:green;float:right;margin-right:80upx;">选择</text>
+			</view>
 			<view class="num-open_bx">
 				<view class="open-bx warn">
 					单位：<text>{{ info.bigUnit }}</text>
@@ -16,7 +19,6 @@
 </template>
 
 <script>
-import { STOCK_TYPE } from "@/utils/declare";
 import AppImg from "@/components/app-img";
 export default {
 	name: "item",
@@ -24,10 +26,7 @@ export default {
 		AppImg
 	},
 	props: {
-		type: {
-			type: String,
-			default: STOCK_TYPE.WARN
-		},
+
 		isPrice: {
 			type: Boolean,
 			default: true

ghsApp/src/pages.json

@@ -23,7 +23,7 @@
 		{
 			"root": "admin/ptItem",
 			"pages": [
-				{"path": "itemList","style": {"navigationBarTitleText": "平台花材列表"}}
+				{"path": "itemList","style": {"navigationBarTitleText": "平台花材列表","onReachBottonDistance":20}}
 			]
 		},
 		{

ghsApp/src/pagesStore/me/incomeExpenses.vue

@@ -25,7 +25,6 @@
 		<block v-else>
 			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 		</block>
-    <!-- <kd-entrance></kd-entrance> -->
 	</view>
 </template>