变更为批发价和零售价

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

@@ -25,10 +25,10 @@
 					<view class="open-bx" >
 						<text style="color:#333333;">￥{{ parseFloat(info.skPrice) }}</text>
 						<view class="hd-price-area">
-							<input class="change-input" @click.stop @blur="savePrice" placeholder-style="color:#CCCCCC" v-model="modifyPrice" type="digit" placeholder="花店价" />
+							<input class="change-input" @click.stop @blur="savePrice" placeholder-style="color:#CCCCCC" v-model="modifyPrice" type="digit" placeholder="批发价" />
 						</view>
 						<view class="sk-price-area">
-							<input class="change-input" @click.stop @blur="saveSkPrice" placeholder-style="color:#CCCCCC" v-model="skModifyPrice" type="digit" placeholder="散客价" />
+							<input class="change-input" @click.stop @blur="saveSkPrice" placeholder-style="color:#CCCCCC" v-model="skModifyPrice" type="digit" placeholder="零售价" />
 						</view>
 					</view>
 				</view>

ghsApp/src/admin/changePrice/list.vue

@@ -139,7 +139,7 @@ export default {
 		},
 		downloadTable(){
 			let level = 0
-			let levelList = ['散客价', '花店价']
+			let levelList = ['零售价', '批发价']
 			uni.showActionSheet({
 				itemList: levelList,
 				success: function (respond) {

ghsApp/src/admin/changePrice/removeList.vue

@@ -169,7 +169,7 @@ export default {
 		},
 		downloadTable(){
 			let level = 0
-			let levelList = ['散客价', '花店价']
+			let levelList = ['零售价', '批发价']
 			uni.showActionSheet({
 				itemList: levelList,
 				success: function (respond) {

ghsApp/src/admin/item/add.vue

@@ -20,7 +20,7 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">花店价</div>
+          <div class="tui-title">批发价</div>
           <input v-model="form.price" placeholder-class="phcolor" class="tui-input" name="price" @focus="form.price=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
 
@@ -124,12 +124,12 @@
 
       <view class="module-com input-line-wrap">
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">花店价比成本贵</div>
+          <div class="tui-title">批发价比成本贵</div>
           <input v-model="form.addPrice" placeholder-class="phcolor" class="tui-input" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">散客价比花店贵</div>
+          <div class="tui-title">零售价比花店贵</div>
           <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
 
@@ -421,11 +421,11 @@ export default {
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.addPrice) == false){
-					uni.showToast({title:"请填写花店价比成本贵多少",icon:"none"})
+					uni.showToast({title:"请填写批发价比成本贵多少",icon:"none"})
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.skMore) == false){
-					uni.showToast({title:"请填写散客价比花店贵多少",icon:"none"})
+					uni.showToast({title:"请填写零售价比花店贵多少",icon:"none"})
 					return;
 				}
       }
@@ -490,12 +490,12 @@ export default {
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写散客价比花店贵多少"]
+          msg: ["请填写零售价比花店贵多少"]
         },
         {
           name: "addPrice",
           rule: ["required"],
-          msg: ["请填写花店价比成本贵多少"]
+          msg: ["请填写批发价比成本贵多少"]
         },
         {
           name: "discountPrice",

ghsApp/src/admin/item/copy.vue

@@ -20,7 +20,7 @@
         </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.price" placeholder-class="phcolor" class="tui-input" name="price" @focus="form.price=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
 
@@ -124,12 +124,12 @@
 
       <view class="module-com input-line-wrap">
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">花店价比成本贵</view>
+          <view class="tui-title">批发价比成本贵</view>
           <input v-model="form.addPrice" placeholder-class="phcolor" class="tui-input" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </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.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
 
@@ -417,11 +417,11 @@ export default {
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.addPrice) == false){
-					uni.showToast({title:"请填写花店价比成本贵多少",icon:"none"})
+					uni.showToast({title:"请填写批发价比成本贵多少",icon:"none"})
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.skMore) == false){
-					uni.showToast({title:"请填写散客价比花店贵多少",icon:"none"})
+					uni.showToast({title:"请填写零售价比花店贵多少",icon:"none"})
 					return;
 				}
       }
@@ -501,7 +501,7 @@ export default {
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写散客价比花店贵多少"]
+          msg: ["请填写零售价比花店贵多少"]
         },
         {
           name: "weight",

ghsApp/src/admin/item/detail.vue

@@ -20,7 +20,7 @@
         </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.price" style="width:260upx;" placeholder-class="phcolor" class="tui-input" name="price" @focus="form.price=''" placeholder="请填写" type="digit" />
           <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goPriceDetail(productData)">价格变动记录</button>
         </tui-list-cell>
@@ -127,12 +127,12 @@
       <view class="module-com input-line-wrap">
 
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">花店价比成本贵</view>
+            <view class="tui-title">批发价比成本贵</view>
             <input v-model="form.addPrice" placeholder-class="phcolor" class="tui-input" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
           </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.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
           </tui-list-cell>
 
@@ -530,15 +530,15 @@ export default {
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.price) == false){
-					uni.showToast({title:"请填写花店价",icon:"none"})
+					uni.showToast({title:"请填写批发价",icon:"none"})
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.addPrice) == false){
-					uni.showToast({title:"请填写花店价比成本贵多少",icon:"none"})
+					uni.showToast({title:"请填写批发价比成本贵多少",icon:"none"})
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.skMore) == false){
-					uni.showToast({title:"请填写散客价比花店贵多少",icon:"none"})
+					uni.showToast({title:"请填写零售价比花店贵多少",icon:"none"})
 					return;
 				}
       }
@@ -603,7 +603,7 @@ export default {
         {
           name: "addPrice",
           rule: ["required"],
-          msg: ["请填写花店价比成本贵多少"]
+          msg: ["请填写批发价比成本贵多少"]
         },
         {
           name: "discountPrice",
@@ -618,7 +618,7 @@ export default {
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写散客价比花店贵多少"]
+          msg: ["请填写零售价比花店贵多少"]
         },
         {
           name: "weight",

ghsApp/src/admin/itemClass/addPrice.vue

@@ -4,8 +4,8 @@
 			<t-table :headerBackgroundColor="'#F0F2F6'">
 				<t-tr header>
                     <t-th>名称</t-th>
-					<t-th>花店价比成本贵</t-th>
-					<t-th>散客价比花店贵</t-th>
+					<t-th>批发价比成本贵</t-th>
+					<t-th>零售价比花店贵</t-th>
 				</t-tr>
 				<view v-for="(item, index) in list.data" :key="index">
 					<t-tr>
@@ -71,7 +71,7 @@ export default {
 
             this.batchStyle = styleInfo
 			let self = this
-			let levelList = ['请选择列：','散客价比花店贵', '花店价比成本贵']
+			let levelList = ['请选择列：','零售价比花店贵', '批发价比成本贵']
 			uni.showActionSheet({
 				itemList: levelList,
 				success: function (respond) {
@@ -121,11 +121,11 @@ export default {
            this.list.data.forEach(function(value,index,array){
 
                if(that.$util.isMoney(value.skMore) == false){
-                   that.$msg('【'+value.name+'】的 散客价比花店贵 填写错误')
+                   that.$msg('【'+value.name+'】的 零售价比花店贵 填写错误')
                    return false
                }
                if(that.$util.isMoney(value.addPrice) == false){
-                   that.$msg('【'+value.name+'】的 花店价比成本贵 填写错误')
+                   that.$msg('【'+value.name+'】的 批发价比成本贵 填写错误')
                    return false
                }
 

ghsApp/src/admin/stat/stock.vue

@@ -13,7 +13,7 @@
 			<scroll-view scroll-y scroll-with-animation class="main-view">
 				<view class="space-view ex-table">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
-						<t-tr header><t-th><view style="width:270upx;text-align:left;">花材</view></t-th><t-th>库存</t-th><t-th>花店价</t-th><t-th>散客价</t-th></t-tr>
+						<t-tr header><t-th><view style="width:270upx;text-align:left;">花材</view></t-th><t-th>库存</t-th><t-th>批发价</t-th><t-th>零售价</t-th></t-tr>
 						<block v-if="!$util.isEmpty(classItemData)">
 							<block v-for="(classItem,classIndex) in classItemData" :key="classIndex">
 								<block v-if="classItem.child && !$util.isEmpty(classItem.child)">

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -20,8 +20,8 @@
 		<text class="name" @click="pageTo({url:'/admin/item/detail?id='+ res.productId})">{{res.name}}</text>
 		<text class="cg-cost">¥{{res.bigPrice?parseFloat(res.bigPrice):0}}</text>
 		<text class="cost-price">¥{{res.cost?parseFloat(res.cost):0}}</text>
-		<input type="digit" v-model="res.suggestPrice" @focus="clearPrice(i)" @input="linkChange(i)" placeholder="花店价" />
-		<input type="digit" v-model="res.suggestSkPrice" @focus="clearSkPrice(i)" placeholder="散客价" />
+		<input type="digit" v-model="res.suggestPrice" @focus="clearPrice(i)" @input="linkChange(i)" placeholder="批发价" />
+		<input type="digit" v-model="res.suggestSkPrice" @focus="clearSkPrice(i)" placeholder="零售价" />
 	</view>
 </view>
 </view>
@@ -113,12 +113,12 @@ export default {
 			this.flowersList.forEach(function(item){
 				if(that.$util.isMoney(item.suggestPrice) == false){
 					let name = item.name
-					errorHint = '请填写 '+name+' 花店价'
+					errorHint = '请填写 '+name+' 批发价'
 					hasError = true
 				}
 				if(that.$util.isMoney(item.suggestSkPrice) == false){
 					let name = item.name
-					errorHint = '请填写 '+name+' 散客价'
+					errorHint = '请填写 '+name+' 零售价'
 					hasError = true
 				}
 			})

hdApp/src/pagesPurchase/addCgResult.vue

@@ -23,8 +23,8 @@
 										<text class="name">{{res.name}}</text>
 										<text class="cg-cost">¥{{itemPriceList[res.id].cgPrice?parseFloat(itemPriceList[res.id].cgPrice):0}}</text>
 										<text class="cost-price">¥{{itemPriceList[res.id].cost?parseFloat(itemPriceList[res.id].cost):0}}</text>
-										<input type="digit" v-model="res.autoPrice" placeholder="花店价" @focus="priceFocus(i,res)" @input="modifyPrice(i,res)" />
-										<input type="digit" v-model="res.autoSkPrice" placeholder="个人价" @focus="skPriceFocus(i,res)" @input="modifySkPrice(res)" />
+										<input type="digit" v-model="res.autoPrice" placeholder="批发价" @focus="priceFocus(i,res)" @input="modifyPrice(i,res)" />
+										<input type="digit" v-model="res.autoSkPrice" placeholder="零售价" @focus="skPriceFocus(i,res)" @input="modifySkPrice(res)" />
 									</view>
 								</view>
 							</view>