价格管理

ghsApp/src/admin/home/apply.vue

@@ -36,7 +36,7 @@ export default {
                         {name: "花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list"},
                         {name: "花材分类",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/list"},
                         {name: "小菊颜色",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/xjSelect"},
-                        {name: "加价管理",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/add"},
+                        {name: "价格管理",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/add"},
                         {name: "停用花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list?delStatus=1"},
                     ]
                 },

ghsApp/src/admin/item/add.vue

@@ -21,22 +21,41 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">花店价</div>
-          <input v-model="form.price" style="width:140upx;" placeholder-class="phcolor" class="tui-input" name="price" @focus="form.price=''" placeholder="请填写" maxlength="50" type="digit" />
-          <text style="color:#666666;margin-right:20upx;">散客比花店贵：</text>
-          <input v-model="form.skMore" style="width:110upx;" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" type="digit" />
+          <input v-model="form.price" placeholder-class="phcolor" class="tui-input" name="price" @focus="form.price=''" 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.discountPrice" placeholder-class="phcolor" class="tui-input" name="discountPrice" @focus="form.discountPrice=''" placeholder="不做特价填0" maxlength="50" type="digit" />
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :hover="false">
+          <div class="tui-title">单位比</div>
+          <input v-model="form.ratio" placeholder-class="phcolor" class="tui-input" name="ratio" placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">单支售价涨幅</view>
+          <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写，最小填1" style="width:230upx;" @focus="form.smallRatio=''"
+          maxlength="50" type="number" /><text style="color:#CCCCCC;">¥<text>{{smallPrice}}</text></text>
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">库存</div>
           <input v-model="form.stock" style="width:340upx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
           <button v-if="productData.id > 0" class="admin-button-com blue small" @click="goStockDetail(productData.id)">库存明细</button>
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :hover="false">
+          <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>
+          <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :arrow="true">
           <div class="tui-title">分类</div>
           <picker mode="selector" :value="form.classId" :range="itemClassData" range-key="name" @change="changeItemClassFn" class="tui-input" >
@@ -64,70 +83,14 @@
           </picker>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">散客加价</div>
-          <input
-            v-model="form.skAddPrice"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="skAddPrice"
-            @focus="form.skAddPrice=''"
-            placeholder="请填写"
-            maxlength="50"
-            type="digit"
-          />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <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>
-          <input
-            v-model="form.ratio"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="ratio"
-            placeholder="如：1扎=20支，请填写20"
-            maxlength="50"
-            type="number"
-          />
-        </tui-list-cell>
-
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">每扎重量</div>
-          <input
-            v-model="form.weight"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="weight"
-            placeholder="单位：公斤"
-            maxlength="50"
-            type="digit"
-          />
+          <input v-model="form.weight" placeholder-class="phcolor" class="tui-input" name="weight" placeholder="单位为公斤，参考红玫1扎约1.2公斤" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">库存预警值</div>
-          <input
-            v-model="form.stockWarning"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="stockWarning"
-            placeholder="请填写"
-            maxlength="50"
-            type="number"
-          />
+          <input v-model="form.stockWarning" placeholder-class="phcolor" class="tui-input" name="stockWarning" placeholder="请填写" maxlength="50" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -203,9 +166,9 @@ export default {
         classId:'',
         price:'',
         skMore:'',
-        skAddPrice:'',
         addPrice:'',
         discountPrice:'',
+        smallRatio:'',
         weight:'',
         cover:[],
         stockWarning:'',
@@ -225,6 +188,15 @@ export default {
   },
 	computed:{
 		...mapGetters(["getLoginInfo","getDictionariesInfo"]),
+    smallPrice(){
+       let price = 0
+        if(Number(this.form.price) > 0 && Number(this.form.ratio)>0){
+          let div = Number(this.form.price)/Number(this.form.ratio)
+          price = div*Number(this.form.smallRatio)
+          price = parseFloat(price.toFixed(2))
+        }
+        return price
+    }
 	},
   onLoad(option) {
     if(option.id){
@@ -306,7 +278,6 @@ export default {
         this.form.delStatus = 0
         this.form.id = 0
         this.form.price = ''
-        this.form.skAddPrice =''
         this.form.skMore =''
         this.form.addPrice =''
         this.form.discountPrice = ''
@@ -408,20 +379,20 @@ export default {
 					uni.showToast({title:"请填写特价，没有特价请填0",icon:"none"})
 					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"})
+				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.smallRatio) == false){
+					uni.showToast({title:"请填写涨幅，最小请填1",icon:"none"})
 					return;
 				}
-				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.skAddPrice) == false){
-					uni.showToast({title:"请填写散客加价",icon:"none"})
+				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"})
 					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;
 				}
       }
@@ -483,26 +454,26 @@ export default {
           rule: ["required"],
           msg: ["请填写售价"]
         },
-        {
-          name: "skAddPrice",
-          rule: ["required"],
-          msg: ["请填写散客加价"]
-        },
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写散客比花店贵多少"]
+          msg: ["请填写散客价比花店贵多少"]
         },
         {
           name: "addPrice",
           rule: ["required"],
-          msg: ["请填写花店加价"]
+          msg: ["请填写花店价比进价贵多少"]
         },
         {
           name: "discountPrice",
           rule: ["required"],
           msg: ["不做特价请填0"]
         },
+        {
+          name: "smallRatio",
+          rule: ["required"],
+          msg: ["请填单支售价涨幅"]
+        },
         {
           name: "weight",
           rule: ["required"],

ghsApp/src/admin/item/copy.vue

@@ -1,6 +1,5 @@
 <template>
   <view class="app-content">
-    <!-- 花材基本信息 -->
     <form @submit="formSubmit">
       <view class="module-com input-line-wrap">
 
@@ -22,19 +21,22 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">花店价</view>
-          <input v-model="form.price" style="width:140upx;" placeholder-class="phcolor" class="tui-input" name="price" @focus="form.price=''" placeholder="请填写" maxlength="50" type="digit" />
-          <text style="color:#666666;margin-right:20upx;">散客比花店贵：</text>
-          <input v-model="form.skMore" style="width:110upx;" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" type="digit" />
+          <input v-model="form.price" placeholder-class="phcolor" class="tui-input" name="price" @focus="form.price=''" 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.discountPrice" placeholder-class="phcolor" class="tui-input" name="discountPrice" @focus="form.discountPrice=''" placeholder="不做特价填0" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">单支售价系数</view>
-          <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写" style="width:230upx;" @focus="form.smallRatio=''"
+          <view class="tui-title">单位比</view>
+          <input v-model="form.ratio" placeholder-class="phcolor" class="tui-input" name="ratio" @focus="form.ratio=''" placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">单支售价涨幅</view>
+          <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写，最小填1" style="width:230upx;" @focus="form.smallRatio=''"
           maxlength="50" type="number" /><text style="color:#CCCCCC;">¥<text>{{smallPrice}}</text></text>
         </tui-list-cell>
 
@@ -44,6 +46,16 @@
           <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goStockDetail(productData.id)">库存变动明细</button>
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :hover="false">
+          <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>
+          <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :arrow="true">
           <view class="tui-title">分类</view>
           <picker mode="selector" :value="form.classId" :range="itemClassData" range-key="name" @change="changeItemClassFn" class="tui-input" >
@@ -71,23 +83,9 @@
           </picker>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">散客加价</view>
-          <input v-model="form.skAddPrice" placeholder-class="phcolor" class="tui-input" name="skAddPrice" @focus="form.skAddPrice=''" placeholder="请填写" maxlength="50" type="digit" />
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <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>
-          <input v-model="form.ratio" placeholder-class="phcolor" class="tui-input" name="ratio" @focus="form.ratio=''" placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
-        </tui-list-cell>
-
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">每扎重量</view>
-          <input v-model="form.weight" placeholder-class="phcolor" class="tui-input" name="weight" @focus="form.weight=''" placeholder="单位：公斤" maxlength="50" type="digit" />
+          <input v-model="form.weight" placeholder-class="phcolor" class="tui-input" name="weight" @focus="form.weight=''" placeholder="单位为公斤，参考红玫1扎约1.2公斤" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -168,7 +166,6 @@ export default {
         smallUnitId:2,
         classId:'',
         price:'',
-        skAddPrice:'',
         skMore:'',
         addPrice:'',
         discountPrice:'',
@@ -193,7 +190,7 @@ export default {
 		...mapGetters(["getLoginInfo","getDictionariesInfo"]),
     smallPrice(){
        let price = 0
-        if(this.form.price){
+        if(Number(this.form.price) > 0 && Number(this.form.ratio)>0){
           let div = Number(this.form.price)/Number(this.form.ratio)
           price = div*Number(this.form.smallRatio)
           price = parseFloat(price.toFixed(2))
@@ -279,8 +276,7 @@ export default {
         this.form.delStatus = 0
         this.form.id = 0
         this.form.price = ''
-        this.form.skAddPrice =''
-        this.form.skMore=''
+        this.form.skMore =''
         this.form.addPrice =''
         this.form.discountPrice = ''
       })
@@ -386,16 +382,12 @@ export default {
 					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.skAddPrice) == false){
-					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;
 				}
       }
@@ -455,22 +447,17 @@ export default {
         {
           name: "smallRatio",
           rule: ["required"],
-          msg: ["请填写单支售价系数"]
+          msg: ["请填写单支售价涨幅"]
         },
         {
           name: "price",
           rule: ["required"],
           msg: ["请填写售价"]
         },
-        {
-          name: "skAddPrice",
-          rule: ["required"],
-          msg: ["请填写散客加价"]
-        },
         {
           name: "addPrice",
           rule: ["required"],
-          msg: ["请填写普店加价"]
+          msg: ["请填写普店比进价贵多少"]
         },
         {
           name: "discountPrice",
@@ -480,7 +467,7 @@ export default {
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写散客比花店贵多少"]
+          msg: ["请填写散客价比花店贵多少"]
         },
         {
           name: "weight",

ghsApp/src/admin/item/detail.vue

@@ -21,18 +21,22 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">花店价</view>
-          <input v-model="form.price" style="width:140upx;" placeholder-class="phcolor" class="tui-input" name="price" @focus="form.price=''" placeholder="请填写" type="digit" />
-          <text style="color:#666666;margin-right:20upx;">散客比花店贵：</text>
-          <input v-model="form.skMore" style="width:110upx;" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" type="digit" />
+          <input v-model="form.price" placeholder-class="phcolor" class="tui-input" name="price" @focus="form.price=''" placeholder="请填写" 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.discountPrice" placeholder-class="phcolor" class="tui-input" name="discountPrice" @focus="form.discountPrice=''" placeholder="不做特价填0" 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.ratio" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="color:#CCCCCC;"
+          class="tui-input" name="ratio" placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">单支售价涨幅</view>
           <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写" style="width:200upx;" @focus="form.smallRatio=''" maxlength="50" type="number" />
           <text style="color:#CCCCCC;">单支售价 ¥<text>{{smallPrice}}</text></text>
         </tui-list-cell>
@@ -43,6 +47,16 @@
           <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goStockDetail(productData.id)">库存变动明细</button>
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">花店价比进价贵</view>
+          <input v-model="form.addPrice" placeholder-class="phcolor" class="tui-input" style="width:130upx;" 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>
+          <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :arrow="true">
           <view class="tui-title">分类</view>
           <picker mode="selector" :value="form.classId" :range="itemClassData" range-key="name" @change="changeItemClassFn" class="tui-input" >
@@ -63,16 +77,10 @@
           <view v-if="form.smallUnitId" @click="$msg('不可修改')" style="color:#CCCCCC;width:450upx;height:45upx;">{{ smallUnitSelectedData.name }}</view>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">单位比</view>
-          <input v-model="form.ratio" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="color:#CCCCCC;"
-          class="tui-input" name="ratio" placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
-        </tui-list-cell>
-
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">每扎重量</view>
           <input v-model="form.weight" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="color:#CCCCCC;"
-          class="tui-input" name="weight" placeholder="单位：公斤" maxlength="50" type="digit" />
+          class="tui-input" name="weight" placeholder="单位为公斤，参考红玫1扎约1.2公斤" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -81,15 +89,6 @@
           <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="printLabel(productData)">打标签</button>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">花店加价</view>
-          <input v-model="form.addPrice" placeholder-class="phcolor" class="tui-input" style="width:130upx;" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
-          <text style="color:#CCCCCC;">
-            <text style="width:170upx;display:inline-block;">成本 ¥{{parseFloat(cost)}}</text>
-            <text style="width:170upx;display:inline-block;">售价 ¥{{sellPrice}}</text>
-          </text>
-        </tui-list-cell>
-
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">上架状态</view>
           <view class="switch_bx">
@@ -188,17 +187,12 @@ export default {
 		...mapGetters(["getLoginInfo","getDictionariesInfo"]),
     smallPrice(){
        let price = 0
-        if(this.form.price){
+        if(Number(this.form.price) > 0 && Number(this.form.ratio)>0){
           let div = Number(this.form.price)/Number(this.form.ratio)
           price = div*Number(this.form.smallRatio)
           price = parseFloat(price.toFixed(2))
         }
         return price
-    },
-    sellPrice(){
-      let price = Number(this.cost) + Number(this.form.addPrice)
-      price = parseFloat(price.toFixed(2))
-      return price
     }
 	},
   onLoad(option) {
@@ -406,11 +400,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;
 				}
       }
@@ -470,7 +464,7 @@ export default {
         {
           name: "smallRatio",
           rule: ["required"],
-          msg: ["请填写单支售价系数"]
+          msg: ["请填写单支售价涨幅"]
         },
         {
           name: "price",
@@ -480,7 +474,7 @@ export default {
         {
           name: "addPrice",
           rule: ["required"],
-          msg: ["请填写普店加价"]
+          msg: ["请填写花店价比进价贵多少"]
         },
         {
           name: "discountPrice",
@@ -490,7 +484,7 @@ export default {
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写散客比花店贵多少"]
+          msg: ["请填写散客价比花店贵多少"]
         },
         {
           name: "weight",

ghsApp/src/admin/itemClass/add.vue

@@ -8,8 +8,8 @@
 						<div class="app-size-28 app-color-0">{{ item.name || '' }}</div>
 						<div class="list-operate">
 							<text class="add-price"></text>
-							<text class="add-price" @click.stop="pageTo('/admin/itemClass/addPrice?classId='+item.id)">加价</text>
-							<text class="add-price" @click.stop="pageTo('/admin/itemClass/more?classId='+item.id)">排序</text>
+							<text class="add-price" @click.stop="pageTo('/admin/itemClass/addPrice?classId='+item.id)">价格设置</text>
+							<text class="add-price" @click.stop="pageTo('/admin/itemClass/more?classId='+item.id)">排序设置</text>
 						</div>
 					</div>
 				</div>

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/itemClass/list.vue

@@ -10,8 +10,6 @@
 							<div class="operate-det">
 								<span>序号：{{ item.inTurn }}</span>
 							</div>
-							<text class="add-price" @click.stop="pageTo('/admin/itemClass/addPrice?classId='+item.id)">加价</text>
-							<text class="add-price" @click.stop="pageTo('/admin/itemClass/more?classId='+item.id)">排序</text>
 							<div class="operate-icon" @click="editItem(item)">
 								<i class="iconfont" :class="[ index == operateIndex ? 'iconbianji' : 'iconbianji']" style="font-size:38upx;"></i>
 							</div>

ghsApp/src/pages.json

@@ -344,8 +344,8 @@
 			"root": "admin/itemClass",
 			"pages": [
 				{"path": "list","style": {"navigationBarTitleText": "花材分类"}},
-				{"path": "add","style": {"navigationBarTitleText": "加价管理"}},
-				{"path": "addPrice","style": {"navigationBarTitleText": "加价设置"}},
+				{"path": "add","style": {"navigationBarTitleText": "价格管理"}},
+				{"path": "addPrice","style": {"navigationBarTitleText": "价格设置"}},
 				{"path": "more","style": {"navigationBarTitleText": "更多"}}
 			]
 		},