花材管理

ghsApp/src/admin/item/add.vue

@@ -92,7 +92,7 @@
 
         <tui-list-cell class="line-cell" :hover="false" v-if="form.ratioType == 0">
           <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" />
+          <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">
@@ -101,14 +101,13 @@
         </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.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">
-          <div class="tui-title">上架状态</div>
+          <div class="tui-title">花材状态</div>
           <div class="switch_bx">
-            <switch :checked="form.status == 2 ? false : true" @change="statusChange" style="transform: scale(0.8,0.8)" />
             <text v-if="form.status == 1">上架</text>
             <text v-else>下架</text>
           </div>
@@ -145,6 +144,11 @@
           <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" :hover="false">
+          <view class="tui-title">排序值</view>
+          <input v-model="form.inTurn" placeholder-class="phcolor" class="tui-input" name="inTurn" @focus="form.inTurn=''" placeholder="请填写金额" type="number" />
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">拆散单价</view>
           <input v-model="form.smallRatio" @focus="form.smallRatio=''" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写" maxlength="50" 
@@ -199,7 +203,9 @@ export default {
         skMore:6,
         addPrice:3,
         hjAddPrice:2,
+        hjDiscountPrice:0,
         discountPrice:0,
+        skDiscountPrice:0,
         cost:0,
         weight:1.5,
         cover:[],
@@ -207,7 +213,8 @@ export default {
         status:2,
         itemId:0,
         smallRatio:1,
-        ratioType:0
+        ratioType:0,
+        inTurn:100
       },
       itemClassSelectedData:{},
       itemClassData:[],
@@ -548,11 +555,6 @@ export default {
           rule: ["required"],
           msg: ["请选择小单位"]
         },
-        {
-          name: "ratio",
-          rule: ["required"],
-          msg: ["请填写单位比"]
-        },
         {
           name: "price",
           rule: ["required"],
@@ -606,7 +608,7 @@ export default {
         {
           name: "stockWarning",
           rule: ["required"],
-          msg: ["请填写库存预警值"]
+          msg: ["请填写库存预警"]
         }
       ];
       // 进行表单检查

ghsApp/src/admin/item/copy.vue

@@ -92,7 +92,7 @@
 
         <tui-list-cell class="line-cell" :hover="false" v-if="form.ratioType == 0">
           <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" />
+          <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">
@@ -101,14 +101,13 @@
         </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.stockWarning" @focus="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">
-          <view class="tui-title">上架状态</view>
+          <view class="tui-title">花材状态</view>
           <view class="switch_bx">
-            <switch :checked="form.status == 2 ? false : true" @change="statusChange" style="transform: scale(0.8,0.8)" />
             <text v-if="form.status == 1">上架</text>
             <text v-else>下架</text>
           </view>
@@ -558,11 +557,6 @@ export default {
           rule: ["required"],
           msg: ["请选择小单位"]
         },
-        {
-          name: "ratio",
-          rule: ["required"],
-          msg: ["请填写单位比"]
-        },
         {
           name: "price",
           rule: ["required"],
@@ -616,7 +610,7 @@ export default {
         {
           name: "stockWarning",
           rule: ["required"],
-          msg: ["请填写库存预警值"]
+          msg: ["请填写库存预警"]
         }
       ];
       // 进行表单检查

ghsApp/src/admin/item/detail.vue

@@ -97,7 +97,7 @@
         <tui-list-cell class="line-cell" :arrow="false" v-if="form.ratioType == 0">
           <view class="tui-title">单位比</view>
           <input v-model="form.ratio" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="width:450upx;color:#CCCCCC;"
-          class="tui-input" name="ratio" placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
+          class="tui-input" name="ratio" placeholder="1扎=20支，请填写20" maxlength="50" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :arrow="false">
@@ -107,12 +107,12 @@
         </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.stockWarning" style="width:300upx;" @focus="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">
-          <view class="tui-title">上架状态</view>
+          <view class="tui-title">花材状态</view>
           <view class="switch_bx">
             <text v-if="form.status == 1">上架</text>
             <text v-else>下架</text>
@@ -163,7 +163,7 @@
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">商城端隐藏</view>
+            <view class="tui-title">商城隐藏</view>
             <view class="switch_bx">
               <switch :checked="form.frontHide == 0 ? false : true" @change="frontHideChange" style="transform: scale(0.8,0.8)" />
               <text v-if="form.frontHide == 0">否</text>
@@ -677,11 +677,6 @@ export default {
           rule: ["required"],
           msg: ["请选择小单位"]
         },
-        {
-          name: "ratio",
-          rule: ["required"],
-          msg: ["请填写单位比"]
-        },
         {
           name: "price",
           rule: ["required"],
@@ -735,7 +730,7 @@ export default {
         {
           name: "stockWarning",
           rule: ["required"],
-          msg: ["请填写库存预警值"]
+          msg: ["请填写库存预警"]
         }
       ];
       // 进行表单检查

ghsApp/src/pagesClient/member/detail.vue

@@ -102,7 +102,7 @@
 
             <tui-list-cell class="line-cell" :hover="true" :arrow="true">
               <div class="tui-title">享受价格</div>
-              <view class="tui-input" @click="changeLevelPrice()" style="text-align:right;margin-right:80upx;">{{ form.level == 0 ? '零售价':form.level == 1 ? '批发价':form.level == 2 ? '大客价':'-' }}</view>
+              <view class="tui-input" @click="changeLevelPrice()" style="text-align:center;">{{ form.level == 0 ? '零售价':form.level == 1 ? '批发价':form.level == 2 ? '大客价':'-' }}</view>
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false">
@@ -566,6 +566,7 @@ export default {
 }
 .user-open_bx {
   margin-top: 20upx;
+  margin-bottom:20upx;
   padding: 0;
   & .switch_bx {
     flex: 1;