多颜色

ghsApp/src/admin/billing/affirm.vue

@@ -17,7 +17,10 @@
                   <!-- #endif -->
                   <view class="item-info">
                     <view class="info-line">
-                      <text class="item-name">{{ item.name||'' }}</text>
+                      <text class="item-name">
+                        {{ item.name||'' }}
+                        <text v-if="item.variety && item.variety ==1" class="show-color"></text>
+                      </text>
                       <text class="item-price">
                         <text class="unit">¥</text>
                         <text class="price">{{ parseFloat(item.userPrice)||0 }}</text>
@@ -398,10 +401,18 @@ export default {
       this.calc = this.calc == 'add' ? 'sub' : 'add'
     },
 		reduceItemFn(item) {
+			if(item && item.variety == 1 && this.selectJobType == 'bill'){
+				this.$msg('多颜色花材，请返回修改')
+				return false
+			}
       this.kdType = 'HIT';
 			this.replaceItemFn(item,0,'sub')
 		},
 		addItemFn (item) {
+			if(item && item.variety == 1 && this.selectJobType == 'bill'){
+				this.$msg('多颜色花材，请返回修改')
+				return false
+			}
       this.kdType = 'HIT';
 			this.replaceItemFn(item,0,'add')
 		},
@@ -576,6 +587,15 @@ export default {
                 color: #333333;
                 font-size: 28upx;
                 font-weight:bold;
+                .show-color{
+                  display:inline-block;
+                  width:25upx;
+                  height:25upx;
+                  background-color:rgb(9, 199, 9);
+                  border-radius:15upx;
+                  border:none;
+                  margin-left:16upx;
+                }
               }
               .item-price {
                 color: #333;

ghsApp/src/admin/billing/index.vue

@@ -38,6 +38,7 @@
 										:info="productItem"
 										@showAddModelFn="showAddModelFn"
 										@replaceItemFn="replaceItemFn"
+										@goToSpecialVariety="goToSpecialVariety"
 									></Commondity>
 								</view>
 							</template>
@@ -143,14 +144,37 @@ export default {
 			isSmallCount:false,
 			checkStock:true,
 			showClassRemind:false,
-			autoLoad: false
+			autoLoad: false,
+			xjData:{},
+			xjDataInfo:{}
 		};
 	},
 	computed: {
 		...mapGetters(["getLoginInfo"]),
 	},
 	onShow() {
+		if(this.xjData.hasUpdate == 1){
 
+			console.log('this.xjData',this.xjData)
+			console.log('this.xjDataInfo',this.xjDataInfo)
+
+			this.customData = this.xjDataInfo
+
+			if(this.xjData.cancel == 1){
+				this.customData.bigCount = 0
+				this.customData.smallCount = 0
+				this.replaceItemFn(this.customData,1)
+			}else{
+				this.customData.bigCount = this.xjData.stock
+				this.customData.smallCount = 0
+				this.customData.bigPrice = this.xjData.price
+				this.customData.price = this.xjData.price
+				this.customData.itemPrice = this.xjData.price
+				this.customData.userPrice = this.xjData.price
+				this.confirmAddItemModel(this.customData)
+			}
+		}
+		this.xjData = {}
 	},
 	onLoad () {
 
@@ -177,6 +201,17 @@ export default {
 
 	},
 	methods: {
+		//小菊多颜色选择页
+		goToSpecialVariety(info){
+			this.xjDataInfo = info
+			if(info.stock <= 0){
+				uni.showToast({title:"没有库存",icon:"none"})
+			}else{
+				let userPrice = info.userPrice ? parseFloat(info.userPrice) : 0
+				let price = info.price ? parseFloat(info.price) : 0
+				this.$util.pageTo({url: "/admin/item/xj?stock="+info.stock+"&price="+price+"&customId="+this.option.customId+"&userPrice="+userPrice+"&productId="+info.id})
+			}
+		},
 		changeClass(index){
 			this.$refs.selectFlowerNumRef.close()
 			this.swichClass(index)

ghsApp/src/admin/item/add.vue

@@ -141,28 +141,19 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">颜色管理</view>
+          <view class="tui-title">开单默认基数</view>
+          <input v-model="form.scanNum" @focus="form.scanNum=''" placeholder-class="phcolor" class="tui-input" name="scanNum" placeholder="0表示1扎，大于0表示增加多少支" maxlength="50" type="number" />
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">允许单支购买</view>
           <view class="switch_bx">
-            <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
-            <text v-if="form.variety == 1">开启</text>
-            <text v-else>关闭</text>
+            <switch :checked="form.smallShow == 0 ? false : true" @change="smallShowChange" style="transform: scale(0.8,0.8)" />
+            <text v-if="form.smallShow == 1">是</text>
+            <text v-else>否</text>
           </view>
         </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">开单默认基数</view>
-            <input v-model="form.scanNum" @focus="form.scanNum=''" placeholder-class="phcolor" class="tui-input" name="scanNum" placeholder="0表示1扎，大于0表示增加多少支" maxlength="50" type="number" />
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">允许单支购买</view>
-            <view class="switch_bx">
-              <switch :checked="form.smallShow == 0 ? false : true" @change="smallShowChange" style="transform: scale(0.8,0.8)" />
-              <text v-if="form.smallShow == 1">是</text>
-              <text v-else>否</text>
-            </view>
-          </tui-list-cell>
-
       </view>
 
       <view class="app-footer">
@@ -215,7 +206,6 @@ export default {
         status:2,
         delStatus:0,
         itemId:0,
-        variety:0,
         smallRatio:1,
         smallShow:0,
         scanNum:0,
@@ -250,9 +240,6 @@ export default {
     goStockDetail(item){
 				this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+item.id+'&name='+item.name})
 		},
-    varietyChange(e){
-      this.form.variety = e.detail.value ? 1 : 0;
-    },
     smallShowChange(e){
       this.form.smallShow = e.detail.value ? 1 : 0;
     },

ghsApp/src/admin/item/components/item.vue

@@ -19,8 +19,8 @@
 				<text style="font-size:22upx;border:1upx solid #3385ff;color:white;background-color:#3385ff;margin-right:5upx;padding-left:5upx;padding-right:5upx;" 
 				v-if="info.presell == 1">预售</text>
 				{{ info.name }}
+				<text v-if="info.variety && info.variety ==1" class="show-color"></text>
 			</view>
-			<text v-if="info.variety && info.variety ==1" class="show-color"></text>
 			<view class="kc">￥{{ info.price?parseFloat(info.price):0 }} 
 				<text style="margin-left:11upx;color:#555555;font-weight:normal;">￥{{ info.skPrice?parseFloat(info.skPrice):0 }}</text>
 				<text style="margin-left:12upx;color:#999;font-size:23upx;font-weight:normal;">￥{{ info.cost?parseFloat(info.cost):0 }}</text>
@@ -148,16 +148,13 @@ export default {
 			width:330upx;
 		}
 		.show-color{
-			position:absolute;
-			top:130upx;
-			right:22upx;
 			display:inline-block;
 			width:25upx;
 			height:25upx;
 			background-color:rgb(9, 199, 9);
 			border-radius:15upx;
 			border:none;
-			margin-left:8upx;
+			margin-left:15upx;
 		}
 		& .kc {
 			color: red;

ghsApp/src/admin/item/copy.vue

@@ -140,15 +140,6 @@
             <text style="margin-left:12upx;" v-if="Number(form.ratio)>0">X ¥{{parseFloat((Number(form.price)/Number(form.ratio)).toFixed(2))}} = ¥{{parseFloat((Number(form.smallRatio)*((Number(form.price)/Number(form.ratio)).toFixed(2))).toFixed(2))}}</text>
           </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">颜色管理</view>
-          <view class="switch_bx">
-            <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
-            <text v-if="form.variety == 1">开启</text>
-            <text v-else>关闭</text>
-          </view>
-        </tui-list-cell>
-
           <tui-list-cell class="line-cell" :hover="false">
             <view class="tui-title">开单默认基数</view>
             <input v-model="form.scanNum" @focus="form.scanNum=''" placeholder-class="phcolor" class="tui-input" name="scanNum" placeholder="0表示1扎，大于0表示增加多少支" maxlength="50" type="number" />
@@ -215,7 +206,6 @@ export default {
         status:2,
         delStatus:0,
         itemId:0,
-        variety:0,
         smallRatio:1,
         smallShow:0,
         scanNum:0,
@@ -250,9 +240,6 @@ export default {
     goStockDetail(item){
 				this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+item.id+'&name='+item.name})
 		},
-    varietyChange(e){
-      this.form.variety = e.detail.value ? 1 : 0;
-    },
     statusChange(e){
       this.form.status = e.detail.value ? 1 : 2;
     },

ghsApp/src/admin/item/detail.vue

@@ -143,15 +143,6 @@
             <text style="margin-left:12upx;" v-if="Number(form.ratio)>0">X ¥{{parseFloat((Number(form.price)/Number(form.ratio)).toFixed(2))}} = ¥{{parseFloat((Number(form.smallRatio)*((Number(form.price)/Number(form.ratio)).toFixed(2))).toFixed(2))}}</text>
           </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">颜色管理</view>
-            <view class="switch_bx">
-              <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
-              <text v-if="form.variety == 1">启用</text>
-              <text v-else>关闭</text>
-            </view>
-          </tui-list-cell>
-
           <tui-list-cell class="line-cell" :hover="false">
             <view class="tui-title">客户端隐藏</view>
             <view class="switch_bx">
@@ -244,7 +235,6 @@ export default {
         delStatus:0,
         itemId:0,
         scanNum:0,
-        variety:0,
         smallRatio:1,
         smallShow:0,
         frontHide:0,
@@ -347,9 +337,6 @@ export default {
     goStockDetail(item){
 				this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+item.id+'&name='+item.name})
 		},
-    varietyChange(e){
-      this.form.variety = e.detail.value ? 1 : 0;
-    },
     frontHideChange(e){
       this.form.frontHide = e.detail.value ? 1 : 0;
     },

ghsApp/src/admin/item/list.vue

@@ -86,8 +86,8 @@
 			<view style="display:flex;width:100vw;padding:20upx 20upx 40upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
 				<view style="width:100vw;"><button @click="costChange()">成本变动记录</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="priceChange()">价格变动记录</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="varietyManage()">多颜色管理</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="preSell()">预售管理</button></view>
+				<view style="width:100vw;margin-top:8upx;"><button @click="varietyManage()">多颜色</button></view>
+				<view style="width:100vw;margin-top:8upx;"><button @click="preSell()">预售</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="orderRecord()">下单记录</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="copyCreate()">复制新建</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="shareItem()">分享</button></view>

ghsApp/src/admin/item/xj.vue

@@ -2,7 +2,7 @@
 <view class="app-content">
 	<view class="billing_box_bg">
     	<view class="input-wrap">
-			<text style="margin-right:30upx;">库存：{{parseFloat(option.stock)}}扎</text>
+			<text style="margin-right:30upx;">库存：{{stock}}扎</text>
 			单价：<input @focus="option.price=''" style="border:1upx solid #CCC;width:200upx;" placeholder-style="color:#CCCCCC" v-model="option.price" type="digit" placeholder="请填写" />
 		</view>
 		<view class="scroll-middle_bx">
@@ -16,11 +16,10 @@
 								</view>
 								<view class="cmd-info_bx">
 									<view class="tit">{{ xjItem.name || "" }}</view>
-									<view class="kc"></view>
+									<view class="kc">剩 {{xjItem.stock ? xjItem.stock : 0}}</view>
 									<view class="num-open_bx">
 										<view class="open-bx warn">
-											数量：<input class="change-input" @focus="xjNum = ''" 
-											placeholder-style="color:#CCCCCC" v-model="numList[xjItem.id]" type="digit" placeholder="请填写" />
+											数量：<input class="change-input" placeholder-style="color:#CCCCCC" v-model="numList[xjItem.id]" type="digit" placeholder="请填写" />
 										</view>
 									</view>
 								</view>
@@ -52,10 +51,10 @@ export default {
 	mixins: [],
 	data() {
 		return {
-			xjNum:'',
 			xjList:[],
 			xjData:[],
 			numList:[],
+			stock:0
 		};
 	},
 	computed:{
@@ -63,6 +62,10 @@ export default {
 	},
 	onLoad() {
 
+		if(this.option.stock){
+			this.stock = this.option.stock ? parseFloat(this.option.stock) : 0
+		}
+
 		let history = uni.getStorageSync("xj"+this.option.customId)
 		if(!this.$util.isEmpty(history)){
 			history.forEach((item,index)=>{
@@ -140,9 +143,10 @@ export default {
 			uni.navigateBack({});
 		},
 		init(){
-			getSjXj({itemId:0}).then(res => {
+			let productId = this.option.productId ? this.option.productId : 0
+			getSjXj({itemId:productId}).then(res => {
 				this.xjList = res.data.list
-			});
+			})
 		}
 	}
 };
@@ -304,7 +308,7 @@ export default {
 		& .kc {
 			color: #999999;
 			font-size: 24upx;
-			padding: 10upx 0 24upx;
+			padding: 10upx 0 10upx;
 		}
 		& .num-open_bx {
 			display: flex;

ghsApp/src/admin/item/xjSelect.vue

@@ -1,42 +1,36 @@
 <template>
 	<view class="app-content">
-
-	<view>
-
-		<form @submit="saveAllImg">
-		<div class="module-com input-line-wrap">
-
-			<tui-list-cell class="line-cell" :hover="false">
-			<div class="tui-title">启用状态</div>
-			<view>
-				<switch style="transform:scale(0.7,0.7)" :checked="variety == 0 ? false : true" @change="varietyChangeFn" />
-				<text v-if="variety == 0">停用</text><text v-else>启用</text>
-			</view>
-			</tui-list-cell>
-
-		<div class="module-com input-line-wrap goods-wrap">
-			<div class="module-tit">
-			<span>选择图片</span>
-			<span class="app-color-3">（支持多次上传，每次最多可选9张）</span>
-			</div>
-			<div class="module-det">
-			<htz-image-upload :max="9" :compress="true" v-model="xjImgData" :headers="headers"
-			@uploadSuccess="imgUploadSuccess" :quality="60" @imgDelete="imgDeleteFn" :action="getLoginInfo.imgUploadApi">
-			</htz-image-upload>
-			</div>
-		</div>
-		<view style="text-align:center;">
-			<button class="admin-button-com big blue" style="width:95%;" formType="submit">全部提交</button>
-		</view>
-		</div>
-		</form>
+		<view>
+			<form @submit="saveAllImg">
+				<div class="module-com input-line-wrap">
+					<tui-list-cell class="line-cell" :hover="false">
+					<div class="tui-title">启用状态</div>
+					<view>
+						<switch style="transform:scale(0.7,0.7)" :checked="variety == 0 ? false : true" @change="varietyChangeFn" />
+						<text v-if="variety == 0">停用</text><text v-else>启用</text>
+					</view>
+					</tui-list-cell>
+					<block v-if="variety ==1">
+						<div class="module-com input-line-wrap goods-wrap">
+							<div class="module-tit">
+							<span>选择图片</span>
+							<span class="app-color-3">（支持多次上传，每次最多可选9张）</span>
+							</div>
+							<div class="module-det">
+							<htz-image-upload :max="9" :compress="true" v-model="xjImgData" :headers="headers"
+							@uploadSuccess="imgUploadSuccess" :quality="60" @imgDelete="imgDeleteFn" :action="getLoginInfo.imgUploadApi">
+							</htz-image-upload>
+							</div>
+						</div>
+						<view style="text-align:center;">
+							<button class="admin-button-com big blue" style="width:95%;" formType="submit">全部提交</button>
+						</view>
+					</block>
+				</div>
+			</form>
 		</view>
-
-		<view style="text-align:center;border-top:1upx dashed #cccccc;padding-bottom:10upx;"></view>
-
-		<view style="margin-bottom:18upx;font-size:28upx;text-align:center;font-weight:bold;color:red;">-1 表示库存充足，其它值表示剩余库存</view>
-
-		<view class="billing_box_bg">
+		<view v-if="variety ==1" style="text-align:center;border-top:1upx dashed #cccccc;padding-bottom:10upx;"></view>
+		<view class="billing_box_bg" v-if="variety ==1">
 			<view class="scroll-middle_bx">
 				<block>
 					<view class="item_list_bx"  style="width: 100%">
@@ -68,24 +62,21 @@
 				</block>
 			</view>
 		</view>
-
-		<view class="app-footer">
+		<view class="app-footer" v-if="variety ==1">
 			<button class="admin-button-com big default" @click="clearXj">清空全部花材</button>
 			<button class="admin-button-com big blue" style="margin-left:50upx;" @click="saveAllItemNum()">保存修改</button>
 		</view>
-
 		<modal-module :show="changeShow" @click="confirmChange" :maskClosable="true" title="修改名称" padding="30rpx 30rpx" >
-		<template v-slot:content>
-			<div class="app-modal-input-wrap">
-			<div class="inp-list-line">
-				<div class="line-input">
-				<input type="text" style="width:61%;text-align:center;" :focus="changeFocus" v-model="xjName" class="inp-input" />
+			<template v-slot:content>
+				<div class="app-modal-input-wrap">
+				<div class="inp-list-line">
+					<div class="line-input">
+					<input type="text" style="width:61%;text-align:center;" :focus="changeFocus" v-model="xjName" class="inp-input" />
+					</div>
 				</div>
-			</div>
-			</div>
-		</template>
+				</div>
+			</template>
 		</modal-module>
-
 	</view>
 </template>
 <script>

ghsApp/src/components/module/app-commodity.vue

@@ -8,13 +8,16 @@
 				<text style="font-size:22upx;border:1upx solid #3385ff;color:white;background-color:#3385ff;margin-right:5upx;padding-left:5upx;padding-right:5upx;" 
 				v-if="info.presell == 1">预售</text>
 				{{ info.name || "" }}
+				<text v-if="info.variety && info.variety ==1" class="show-color"></text>
 			</view>
 			<view class="kc" style="position:absolute;top:55upx;">		
 				<block v-if="info.ratioType == 0">{{info.ratio}}{{info.smallUnit}}/{{info.bigUnit}}</block>
 				<block v-else>若干{{info.smallUnit}}/{{info.bigUnit}}</block>
 			</view>
 			<view class="kc num-open_bx flex-end">
-				<view class="price" style="position:absolute;top:55upx;font-weight:bold;">￥{{ parseFloat(info.price) }}</view>
+				<view class="price" style="position:absolute;top:55upx;font-weight:bold;">
+					￥{{ parseFloat(info.price) }}
+				</view>
 				<view style="text-align: right;margin-right:20upx;" >
 					<view class="open-bx" >
 						<i class="iconfont iconjian" @click.stop="reduceItemFn()" v-if="bigCount > 0 || smallCount > 0"></i>
@@ -94,12 +97,27 @@ export default {
 	},
 	methods: {
 		addItemFn () {
+			if(this.info && this.info.variety == 1 && this.selectJobType == 'bill'){
+				//小菊多颜色选择页
+				this.$emit("goToSpecialVariety", this.info);
+				return false
+			}
 			this.$emit("replaceItemFn", this.info,0,'add')
 		},
 		reduceItemFn() {
+			if(this.info && this.info.variety == 1 && this.selectJobType == 'bill'){
+				//小菊多颜色选择页
+				this.$emit("goToSpecialVariety", this.info);
+				return false
+			}
 			this.$emit("replaceItemFn", this.info,0,'sub')
 		},
 		showAddModelFn() {
+			if(this.info && this.info.variety == 1 && this.selectJobType == 'bill'){
+				//小菊多颜色选择页
+				this.$emit("goToSpecialVariety", this.info);
+				return false
+			}
 			this.$emit("showAddModelFn", { ...this.info, bigCount: this.bigCount, smallCount: this.smallCount, userPrice: this.userPrice})
 		}
 	}
@@ -133,6 +151,15 @@ export default {
 			text-overflow: ellipsis;
 			width:380upx;
 		}
+		.show-color{
+			display:inline-block;
+			width:25upx;
+			height:25upx;
+			background-color:rgb(9, 199, 9);
+			border-radius:15upx;
+			border:none;
+			margin-left:16upx;
+		}
 		& .kc {
 			position: relative;
 			color: #999999;

ghsApp/src/mixins/product.js

@@ -504,6 +504,16 @@ export default {
 		},
 		//显示可以修改花材的弹框
 		showAddModelFn(info) {
+
+			if(info && info.variety == 1 && this.selectJobType == 'bill'){
+				let curPage = getCurrentPages();
+				let route = curPage[curPage.length - 1].route;
+				if(route == 'admin/billing/affirm'){
+					this.$msg('多颜色花材，请返回修改')
+					return false
+				}
+			}
+
 			if(info.bigNum <= 0 && info.smallNum <= 0){
 				if(this.checkStock){
 					this.$util.noStockRemind()

ghsApp/src/pages.json

@@ -382,7 +382,7 @@
 				{"path": "add","style": {"navigationBarTitleText": "添加花材"}},
 				{"path": "copy","style": {"navigationBarTitleText": "复制花材"}},
 				{"path": "xj","style": {"navigationBarTitleText": "请选择颜色"}},
-				{"path": "xjSelect","style": {"navigationBarTitleText": "多颜色管理"}},
+				{"path": "xjSelect","style": {"navigationBarTitleText": "多颜色"}},
 				{"path": "presell","style": {"navigationBarTitleText": "预售管理"}},
 				{"path": "rechargeHb","style": {"navigationBarTitleText": "充值活动"}}
 			]

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -59,7 +59,7 @@
 									@goToSpecialVariety="goToSpecialVariety"
 								></Commondity>
 								<view v-if="productItem.variety && productItem.variety == 1" class="has-color" @click="goToSpecialVariety(productItem)">
-									<view class="has-color-button">点我选颜色</view>
+									<view class="has-color-button">选颜色</view>
 								</view>
 								<view v-if="productItem.presell && productItem.presell == 1" style="position:absolute;top:150upx;font-size:26upx;color:#3385ff;white-space: nowrap;text-overflow: hidden;">
 									到货日期：
@@ -901,6 +901,7 @@ export default {
 	}
 	.item_list_bx {
 		padding: 20upx 16upx 20upx 16upx;
+		position:relative;
 		.box{
 			height: 185upx
 		}
@@ -917,15 +918,16 @@ export default {
 			align-items:center;
 			height:110upx;
 			width:100%;
-			position:relative;
 			.has-color-button{
-				border:2upx solid #5a99f7;
-				border-radius:15upx;
+				border:2upx solid rgb(7, 151, 7);
+				border-radius:23upx;
 				padding:13upx 16upx;
 				font-size:30upx;
-				color:#3385ff;
+				color:rgb(7, 151, 7);
 				position:absolute;
-				top:5upx;
+				top:228upx;
+				width:200upx;
+				text-align:center;
 			}
 		}
 	}

hdApp/src/pagesPurchase/xj.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="billing_box_bg">
     	<view class="input-wrap">
-			<text>剩余：{{parseFloat(xjStock)}}扎</text><text style="margin-left:50upx;">单价：¥{{parseFloat(xjPrice)}}</text>
+			<text>总库存：{{parseFloat(xjStock)}}扎</text><text style="margin-left:50upx;">单价：¥{{parseFloat(xjPrice)}}</text>
 		</view>
 		<view style="margin-top:20upx;">
 			<block>
@@ -188,7 +188,8 @@ export default {
 	margin-bottom:120upx;
 	flex-direction: column;
 	.input-wrap {
-		font-size:30upx;
+		font-size:32upx;
+		font-weight:bold;
 		padding: 22upx 20upx 0upx 30upx;
 	}
 	.tab-view {