shish 3 лет назад
Родитель
Сommit
aff1af8f55

+ 2 - 2
ghs/src/views/item/import.vue

@@ -52,9 +52,9 @@
             <div style="width: 70px;text-align: center">选择</div>
             <div style="width: 70px;text-align: center">图片</div>
             <div style="width: 120px;text-align: center">名称</div>
-            <div style="width: 100px;text-align: center">成本</div>
+            <div style="width: 100px;text-align: center">成本</div>
             <div style="width: 100px;text-align: center">花店价</div>
-            <div style="width: 100px;text-align: center">散客价</div>
+            <div style="width: 100px;text-align: center">个人价</div>
           </div>
           <ul class="infinite-list" v-infinite-scroll="rightcell" style="height: calc(100% - 80px);overflow:auto" :infinite-scroll-delay="100" :infinite-scroll-distance="300" >
             <li v-for="(item, index) in rightItemList" class="flex-center infinite-list-item" :key="index">

+ 1 - 1
ghsApp/src/admin/changePrice/components/Item.vue

@@ -23,7 +23,7 @@
 							<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>
 						<button v-if="Number(info.discountPrice)>0 && info.presell == 0" @click.stop="cancelDiscountFn(info)" class="admin-button-com mini-btn blue" 
 							style="position:absolute;bottom:-9upx;font-size:24upx;left:10upx;">恢复原价</button>

+ 1 - 1
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) {

+ 1 - 1
ghsApp/src/admin/changePrice/removeList.vue

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

+ 3 - 3
ghsApp/src/admin/item/add.vue

@@ -129,7 +129,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.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
 
@@ -436,7 +436,7 @@ export default {
 					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: "addPrice",

+ 3 - 3
ghsApp/src/admin/item/copy.vue

@@ -129,7 +129,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.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
 
@@ -432,7 +432,7 @@ export default {
 					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;
 				}
       }
@@ -512,7 +512,7 @@ export default {
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写散客价比花店贵多少"]
+          msg: ["请填写个人价比花店贵多少"]
         },
         {
           name: "weight",

+ 3 - 3
ghsApp/src/admin/item/detail.vue

@@ -136,7 +136,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.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
           </tui-list-cell>
 
@@ -550,7 +550,7 @@ export default {
 					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;
 				}
       }
@@ -630,7 +630,7 @@ export default {
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写散客价比花店贵多少"]
+          msg: ["请填写个人价比花店贵多少"]
         },
         {
           name: "weight",

+ 3 - 3
ghsApp/src/admin/itemClass/addPrice.vue

@@ -5,7 +5,7 @@
 				<t-tr header>
                     <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,7 +121,7 @@ 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){

+ 1 - 1
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)">

+ 1 - 1
ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -24,7 +24,7 @@
 										<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.autoSkPrice" placeholder="个人价" @focus="skPriceFocus(i,res)" @input="modifySkPrice(res)" />
 									</view>
 								</view>
 							</view>