Merge branch 'master' of git.huaml.com:zhh/front-end

ghsApp/src/admin/item/add.vue

@@ -47,7 +47,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.addPrice" placeholder-class="phcolor" class="tui-input" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
 
@@ -388,7 +388,7 @@ 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){
@@ -462,7 +462,7 @@ export default {
         {
           name: "addPrice",
           rule: ["required"],
-          msg: ["请填写花店价比进价贵多少"]
+          msg: ["请填写花店价比成本贵多少"]
         },
         {
           name: "discountPrice",

ghsApp/src/admin/item/copy.vue

@@ -47,7 +47,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.addPrice" placeholder-class="phcolor" class="tui-input" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
 
@@ -383,7 +383,7 @@ 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){
@@ -457,7 +457,7 @@ export default {
         {
           name: "addPrice",
           rule: ["required"],
-          msg: ["请填写普店比进价贵多少"]
+          msg: ["请填写普店比成本贵多少"]
         },
         {
           name: "discountPrice",

ghsApp/src/admin/item/detail.vue

@@ -48,7 +48,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.addPrice" placeholder-class="phcolor" class="tui-input" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
 
@@ -400,7 +400,7 @@ 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){
@@ -474,7 +474,7 @@ export default {
         {
           name: "addPrice",
           rule: ["required"],
-          msg: ["请填写花店价比进价贵多少"]
+          msg: ["请填写花店价比成本贵多少"]
         },
         {
           name: "discountPrice",

ghsApp/src/admin/itemClass/addPrice.vue

@@ -4,7 +4,7 @@
 			<t-table :headerBackgroundColor="'#F0F2F6'">
 				<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">
@@ -71,7 +71,7 @@ export default {
 
             this.batchStyle = styleInfo
 			let self = this
-			let levelList = ['请选择列：','散客价比花店贵', '花店价比进价贵']
+			let levelList = ['请选择列：','散客价比花店贵', '花店价比成本贵']
 			uni.showActionSheet({
 				itemList: levelList,
 				success: function (respond) {
@@ -125,7 +125,7 @@ export default {
                    return false
                }
                if(that.$util.isMoney(value.addPrice) == false){
-                   that.$msg('【'+value.name+'】的 花店价比进价贵 填写错误')
+                   that.$msg('【'+value.name+'】的 花店价比成本贵 填写错误')
                    return false
                }